[libnma/th/tmp: 1/2] po: update

[Thomas Haller <thaller src gnome org>]

commit af13c06f6440503ce4ec36bb8f82f24a1ea01bf8
Author: Thomas Haller <thaller redhat com>
Date:   Fri Mar 6 11:42:03 2020 +0100

    po: update

 po/af.po          | 588 +++++++++++++++++++++++++------------------------
 po/an.po          | 605 ++++++++++++++++++++++++++-------------------------
 po/ar.po          | 569 +++++++++++++++++++++++++-----------------------
 po/as.po          | 614 ++++++++++++++++++++++++++-------------------------
 po/ast.po         | 583 +++++++++++++++++++++++++------------------------
 po/be.po          | 581 +++++++++++++++++++++++++------------------------
 po/be latin po    | 541 ++++++++++++++++++++++++---------------------
 po/bg.po          | 617 ++++++++++++++++++++++++++--------------------------
 po/bn_IN.po       | 600 ++++++++++++++++++++++++++------------------------
 po/bs.po          | 613 ++++++++++++++++++++++++++-------------------------
 po/ca.po          | 603 +++++++++++++++++++++++++--------------------------
 po/ca valencia po | 615 ++++++++++++++++++++++++++--------------------------
 po/crh.po         | 615 +++++++++++++++++++++++++++-------------------------
 po/cs.po          | 583 +++++++++++++++++++++++++------------------------
 po/da.po          | 613 ++++++++++++++++++++++++++-------------------------
 po/de.po          | 604 +++++++++++++++++++++++++--------------------------
 po/dz.po          | 522 ++++++++++++++++++++++++--------------------
 po/el.po          | 621 ++++++++++++++++++++++++++--------------------------
 po/en_CA.po       | 509 ++++++++++++++++++++++++-------------------
 po/en_GB.po       | 610 +++++++++++++++++++++++++--------------------------
 po/eo.po          | 583 +++++++++++++++++++++++++------------------------
 po/es.po          | 603 +++++++++++++++++++++++++--------------------------
 po/et.po          | 595 +++++++++++++++++++++++++-------------------------
 po/eu.po          | 603 +++++++++++++++++++++++++--------------------------
 po/fa.po          | 607 ++++++++++++++++++++++++++-------------------------
 po/fi.po          | 598 ++++++++++++++++++++++++++------------------------
 po/fr.po          | 605 ++++++++++++++++++++++++++-------------------------
 po/gd.po          | 625 ++++++++++++++++++++++++++--------------------------
 po/gl.po          | 611 ++++++++++++++++++++++++++-------------------------
 po/gu.po          | 596 ++++++++++++++++++++++++++------------------------
 po/he.po          | 611 ++++++++++++++++++++++++++-------------------------
 po/hi.po          | 587 ++++++++++++++++++++++++-------------------------
 po/hr.po          | 589 +++++++++++++++++++++++++------------------------
 po/hu.po          | 601 +++++++++++++++++++++++++-------------------------
 po/id.po          | 596 +++++++++++++++++++++++++-------------------------
 po/is.po          | 607 ++++++++++++++++++++++++++-------------------------
 po/it.po          | 606 ++++++++++++++++++++++++++-------------------------
 po/ja.po          | 590 +++++++++++++++++++++++++------------------------
 po/kk.po          | 569 +++++++++++++++++++++++++-----------------------
 po/km.po          | 583 +++++++++++++++++++++++++------------------------
 po/kn.po          | 595 ++++++++++++++++++++++++++------------------------
 po/ko.po          | 580 ++++++++++++++++++++++++-------------------------
 po/ku.po          | 527 ++++++++++++++++++++++++--------------------
 po/lt.po          | 597 +++++++++++++++++++++++++-------------------------
 po/lv.po          | 606 +++++++++++++++++++++++++--------------------------
 po/mk.po          | 604 ++++++++++++++++++++++++++-------------------------
 po/ml.po          | 606 ++++++++++++++++++++++++++-------------------------
 po/mr.po          | 575 ++++++++++++++++++++++++------------------------
 po/ms.po          | 600 ++++++++++++++++++++++++++------------------------
 po/nb.po          | 611 ++++++++++++++++++++++++++-------------------------
 po/ne.po          | 522 ++++++++++++++++++++++++--------------------
 po/nl.po          | 607 ++++++++++++++++++++++++++-------------------------
 po/nn.po          | 581 +++++++++++++++++++++++++------------------------
 po/oc.po          | 619 ++++++++++++++++++++++++++--------------------------
 po/or.po          | 584 +++++++++++++++++++++++++------------------------
 po/pa.po          | 589 +++++++++++++++++++++++++------------------------
 po/pl.po          | 597 +++++++++++++++++++++++++-------------------------
 po/pt.po          | 622 ++++++++++++++++++++++++++--------------------------
 po/pt_BR.po       | 605 ++++++++++++++++++++++++++-------------------------
 po/ro.po          | 625 ++++++++++++++++++++++++++--------------------------
 po/ru.po          | 597 +++++++++++++++++++++++++-------------------------
 po/rw.po          | 502 +++++++++++++++++++++++-------------------
 po/sk.po          | 639 +++++++++++++++++++++++++++---------------------------
 po/sl.po          | 600 +++++++++++++++++++++++++-------------------------
 po/sq.po          | 498 ++++++++++++++++++++++++------------------
 po/sr.po          | 598 +++++++++++++++++++++++++-------------------------
 po/sr latin po    | 603 +++++++++++++++++++++++++--------------------------
 po/sv.po          | 603 +++++++++++++++++++++++++--------------------------
 po/ta.po          | 596 ++++++++++++++++++++++++++------------------------
 po/te.po          | 588 ++++++++++++++++++++++++-------------------------
 po/tg.po          | 613 ++++++++++++++++++++++++++-------------------------
 po/th.po          | 583 +++++++++++++++++++++++++------------------------
 po/tr.po          | 605 ++++++++++++++++++++++++++-------------------------
 po/ug.po          | 607 ++++++++++++++++++++++++++-------------------------
 po/uk.po          | 587 +++++++++++++++++++++++++------------------------
 po/ur.po          | 597 +++++++++++++++++++++++++-------------------------
 po/vi.po          | 586 +++++++++++++++++++++++++------------------------
 po/wa.po          | 502 +++++++++++++++++++++++-------------------
 po/zh_CN.po       | 569 ++++++++++++++++++++++++------------------------
 po/zh_HK.po       | 581 +++++++++++++++++++++++++------------------------
 po/zh_TW.po       | 579 ++++++++++++++++++++++++-------------------------
 81 files changed, 24318 insertions(+), 23538 deletions(-)
---
diff --git a/po/af.po b/po/af.po
index 3ed2e48f..049fa743 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2011-04-04 08:18+0200\n"
 "Last-Translator: F Wolff <friedel translate org za>\n"
 "Language-Team: translate-discuss-af lists sourceforge net\n"
@@ -19,6 +19,109 @@ msgstr ""
 "X-Generator: Virtaal 0.7.0-beta4\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Deaktiveer koppel-kennisgewings"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Stel dit na WAAR om kennisgewings wanneer aan 'n netwerk gekoppel word te "
+"deaktiveer."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Deaktiveer ontkoppel-kennisgewings"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Stel dit na WAAR om kennisgewings wanneer van 'n netwerk ontkoppel word te "
+"deaktiveer."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Deaktiveer koppel-kennisgewings"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Stel dit na WAAR om kennisgewings wanneer van 'n netwerk ontkoppel word te "
+"deaktiveer."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Onderdruk netwerkebeskikbaar-kennisgewings"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"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."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Stempel"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Word gebruik om te bepaal of instellings na 'n nuwe weergawe migreer moet "
+"word."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Deaktiveer Wi-Fi-skep"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"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."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "W_agwoord:"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Stel dit na WAAR om kennisgewings wanneer aan 'n netwerk gekoppel word te "
+"deaktiveer."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Stel dit na WAAR om kennisgewings wanneer aan 'n netwerk gekoppel word te "
+"deaktiveer."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -65,43 +168,74 @@ msgstr "Wagwoord:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(geen)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Onbekend"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "W_agwoord:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "W_agwoord:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Wys wagwoord"
 
@@ -113,36 +247,36 @@ msgstr "Verstek"
 msgid "My country is not listed"
 msgstr "My land is nie gelys nie"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Ongelys"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "My land is nie gelys nie"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Verskaffer"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Geïnstalleerde GSM-toestel"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Geïnstalleerde GSM-toestel"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Enige toetstel"
 
@@ -264,36 +398,25 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Bevestig selfoon-breëbandinstellings"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(geen)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
+#: src/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
+#: src/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#: src/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
-msgid "(Unknown)"
-msgstr "Onbekend"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
+msgid "_Unlock token"
+msgstr "Ontsl_uit"
 
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:116
+msgid "Name"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
 msgstr ""
 
 #: src/nma-pkcs11-cert-chooser.c:381
@@ -310,34 +433,13 @@ msgstr "W_agwoord:"
 msgid "Sho_w passwords"
 msgstr ""
 
-#: src/nma-pkcs11-cert-chooser-dialog.c:241
-msgid "Error logging in: "
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.c:263
-msgid "Error opening a session: "
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:20
-#, fuzzy
-msgid "_Unlock token"
-msgstr "Ontsl_uit"
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:116
-msgid "Name"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:126
-msgid "Issued By"
-msgstr ""
-
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -390,59 +492,59 @@ msgstr "W_agwoord:"
 msgid "_Password:"
 msgstr "W_agwoord:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Ontkoppel"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Geen"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 #, fuzzy
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamiese-WEP"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 msgid "WPA3 Personal"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "S_kep"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Verbind"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -450,41 +552,41 @@ msgstr ""
 "Wagwoorde of enkripsiesleutels word benodig vir toegang tot die draadlose "
 "netwerk '%s'."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Gebruikersmagtiging vereis vir draadlose netwerk '%s'..."
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Skep nuwe draadlose netwerk"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Nuwe draadlose netwerk"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Verbind aan verskuilde draadlose netwerk"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Verskuilde draadlose netwerk"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -493,435 +595,359 @@ msgstr ""
 "Gee die naam en sekuriteitbesonderhede van die verskuilde draadlose netwerk "
 "waaraan u wil verbind."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Draadloos-sekuriteit:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Netwerk-naam:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Verbi_nding:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Draadlosenetwerk-p_asstuk:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "Verbi_nding:"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER- of PEM-sertifikate (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "DSL-magtiging"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "DSL-magtiging"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "Gebr_uikernaam:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "W_agwoord:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Outomaties"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Weergawe 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Weergawe 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "_Wys wagwoord"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 #, fuzzy
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "DSL-magtiging"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "W_agwoord:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Bestuur u netwerkverbindings"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Aktiewe netwerkverbindings"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Bestuur en verander u netwerkverbinding-instellings"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Deaktiveer koppel-kennisgewings"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Verbi_nding:"
 
+#: src/utils/utils.c:535
 #, 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."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Deaktiveer ontkoppel-kennisgewings"
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER- of PEM-sertifikate (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Stel dit na WAAR om kennisgewings wanneer van 'n netwerk ontkoppel word "
-#~ "te deaktiveer."
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER-, PEM-, of PKCS#12- privaate sleutels (*.der, *.pem, *.p12)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Deaktiveer koppel-kennisgewings"
+msgid "Wi-Fi _security"
+msgstr "_Draadloos-sekuriteit:"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "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."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Onderdruk netwerkebeskikbaar-kennisgewings"
+msgid "_Network name"
+msgstr "_Netwerk-naam:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "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."
+msgid "C_onnection"
+msgstr "Verbi_nding:"
 
-#~ msgid "Stamp"
-#~ msgstr "Stempel"
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Draadlosenetwerk-p_asstuk:"
 
-#~ 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."
+#~ msgid "Manage your network connections"
+#~ msgstr "Bestuur u netwerkverbindings"
 
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Deaktiveer Wi-Fi-skep"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Aktiewe netwerkverbindings"
 
-#, fuzzy
-#~ msgid ""
-#~ "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."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Bestuur en verander u netwerkverbinding-instellings"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/an.po b/po/an.po
index f1fa4b69..5e7ad51d 100644
--- a/po/an.po
+++ b/po/an.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2012-09-29 13:19+0200\n"
 "Last-Translator: Daniel Martinez <entaltoaragon gmail com>\n"
 "Language-Team: Aragonés <softaragones googlegroups com>\n"
@@ -18,6 +18,99 @@ msgstr ""
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Desactivar as notificacions de connexión"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Establir isto a cierto ta desactivar as notificacions en connectar con un "
+"ret."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Desactivar as notificacions de desconnexión"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Establir isto a cierto ta desactivar as notificacions en desconnectar d'un "
+"ret."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Desactivar as notificacions de VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Establir isto a cierto ta desactivar as notificacions en connectar u "
+"desconnectar d'una VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Suprimir notificacions de retz disponibles"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"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:26
+msgid "Stamp"
+msgstr "Marca de tiempo"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "S'usa ta determinar si os achustes d'han de migrar a la nueva versión."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Desactivar a creyación de ret inalámbrico"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Establir isto a cierto ta desactivar a creyación de retz inalámbricas adhoc "
+"en usar a miniaplicación."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignorar certificau CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Establir isto a cierto ta desactivar as notificacions sobre certificaus CA "
+"en autenticación EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Establir isto a cierto ta desactivar as notificacions sobre certificaus CA "
+"en a fase 2 de l'autenticación EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -64,44 +157,75 @@ msgstr "Clau de paso:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(denguna)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Certificau C_A:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Desconoxida"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Ignorar certificau CA"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Trie un certificau CA:"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Clau pri_vada:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Clau de pase de clau _privada:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Trie un certificau CA:"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Certificau de l'_usuario"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "A_mostrar clau de paso"
 
@@ -113,37 +237,37 @@ msgstr "Predeterminau"
 msgid "My country is not listed"
 msgstr "O mio pais no ye en a lista"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 #, fuzzy
 msgid "Unlisted"
 msgstr "Sin listar"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "O mío plan no ye en a lista…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Proveedor"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalau"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalau"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Cualsiquier dispositivo"
 
@@ -285,52 +409,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmar os achustes d'a banda ampla mobil"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(denguna)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Certificau C_A:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Desconoxida"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Trie un certificau CA:"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Certificau de l'_usuario"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "A_mostrar claus de paso"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -353,13 +431,27 @@ msgstr "Nome"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Trie un certificau CA:"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Certificau de l'_usuario"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "A_mostrar claus de paso"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -412,555 +504,468 @@ msgstr "Clau de _paso:"
 msgid "_Password:"
 msgstr "Clau de _paso:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Desenchegar"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Denguna"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clau WEP 40/128-bit (Hexadecimal u ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase de paso WEP de 128 bits"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinamica (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA y WPA2 presonal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA y WPA2 enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA y WPA2 presonal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_reyar"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 #, fuzzy
 msgid "C_onnect"
 msgstr "C_onexion:"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "S'ameneste autenticación d'usuario ta la connexión de ret «%s»…"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Ret domestico"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Ret domestico"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Seguridat inalambrica:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Nome d'o rete:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "C_onexion:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Cualsiquier dispositivo"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Connexión %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certificaus DER u PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, fuzzy
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr "Certificaus DER u PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Ignorar certificau CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Trigar un fichero PAC…"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Fichers PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Totz os fichers"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenticau"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Totz dos"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Identidat anóni_ma:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "Fichero _PAC:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Autenticación i_nterna:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 #, fuzzy
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir a provisión PAC _automatica"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "Nome d'_usuario:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "Clau de _paso:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Version 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Version 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Ignorar certificau CA"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "Version _PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Frase de paso WEP de 128 bits"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "A_mostrar claus de paso"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ignorar certificau CA"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_dentidat:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Ignorar certificau CA"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "RAPIDO"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "TLS tunelau"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protechiu (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Desconoxida"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_Autenticación:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Clau de pase de clau _privada:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Tipo:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema ubierto"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Clau compartida"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Predeterminau)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Clau:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "A_mostrar clau"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "En_diz WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Chestione as suyas conexions de rete"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Conexions de rete activas"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Chestione y cambee os suyos achustes d'a connexión de ret"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Desactivar as notificacions de connexión"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Establir isto a cierto ta desactivar as notificacions en connectar con un "
-#~ "ret."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Desactivar as notificacions de desconnexión"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Establir isto a cierto ta desactivar as notificacions en desconnectar "
-#~ "d'un ret."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Desactivar as notificacions de VPN"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Establir isto a cierto ta desactivar as notificacions en connectar u "
-#~ "desconnectar d'una VPN."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Connexión %s"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Suprimir notificacions de retz disponibles"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certificaus DER u PEM (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "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."
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "Certificaus DER u PEM (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid "Stamp"
-#~ msgstr "Marca de tiempo"
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Seguridat inalambrica:"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "S'usa ta determinar si os achustes d'han de migrar a la nueva versión."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Nome d'o rete:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Desactivar a creyación de ret inalámbrico"
+msgid "C_onnection"
+msgstr "C_onexion:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Establir isto a cierto ta desactivar a creyación de retz inalámbricas "
-#~ "adhoc en usar a miniaplicación."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Cualsiquier dispositivo"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignorar certificau CA"
+#~ msgid "Manage your network connections"
+#~ msgstr "Chestione as suyas conexions de rete"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Establir isto a cierto ta desactivar as notificacions sobre certificaus "
-#~ "CA en autenticación EAP."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Conexions de rete activas"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Establir isto a cierto ta desactivar as notificacions sobre certificaus "
-#~ "CA en a fase 2 de l'autenticación EAP."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Chestione y cambee os suyos achustes d'a connexión de ret"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/ar.po b/po/ar.po
index ae6dfae3..d27663b5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.network-manager-applet-0-6.ar\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2011-09-17 16:16+0300\n"
 "Last-Translator: Abdalrahim G. Fakhouri <abdilra7eem yahoo com>\n"
 "Language-Team: Arabic <doc arabeyes org>\n"
@@ -25,6 +25,93 @@ msgstr ""
 "X-Poedit-Language: Arabic\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "عطل تنبيهات الاتصالات "
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند الاتصال بالشبكة."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "عطل تنبيهات قطع الاتصالات"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند قطع الاتصال بالشبكة."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "عطل تنبيهات الاتصالات "
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند قطع الاتصال بالشبكة."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "حظر تنبيهات توفر الشبكة"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند توفر الشبكة اللاسلكية."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "ختم"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "يستخدم لتحديد اذا ما الخيارات يجب ان ترحّل الى اصدار جديد."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "عطل انشاء الاتصال اللاسلكي "
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند توفر الشبكة اللاسلكية."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "ملف شهادة سُلْطة استيثاق"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند الاتصال بالشبكة."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند الاتصال بالشبكة."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -71,44 +158,77 @@ msgstr "كلمة السر:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(لا شيء)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "ملف شهادة _سُلْطة استيثاق:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "مجهول"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "اختر ملفًا"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "اختر ملفًا"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "ملف شهادة _سُلْطة استيثاق:"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "اختر شهادتك الشخصية..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "المفتاح ال_سري:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "كل_مة سر المفتاح السري:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "اختر شهادتك الشخصية..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "شهادة المست_خدم:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "أظهر _كلمة السر"
 
@@ -120,36 +240,36 @@ msgstr "المبدئي"
 msgid "My country is not listed"
 msgstr "بلدي ليست في القائمة"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "ليس في القائمة"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "ليس في القائمة..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "مقدم الخدمة"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "جهاز GSM مثبّت"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "جهاز CDMA مثبّت"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "أي جهاز"
 
@@ -279,54 +399,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "أكد إعدادات الاتصال عبر شبكة المحمول"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(لا شيء)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "ملف شهادة _سُلْطة استيثاق:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "مجهول"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-#, fuzzy
-msgid "Select"
-msgstr "اختر ملفًا"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-#, fuzzy
-msgid "Select from file…"
-msgstr "اختر ملفًا"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "اختر شهادتك الشخصية..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "شهادة المست_خدم:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "أظهر _كلمات السر"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -349,13 +421,27 @@ msgstr "الاسم"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "اختر شهادتك الشخصية..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "شهادة المست_خدم:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "أظهر _كلمات السر"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -409,101 +495,101 @@ msgstr "_كلمة السر:"
 msgid "_Password:"
 msgstr "_كلمة السر:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "لا يوجد اتصال شبكي"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "بدون"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "مفتاح WEP 40/128-bit"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "عبارة سر WEP 128-bit"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "‏WPA و WPA2 شخصي"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "‏WPA و WPA2 للشركات"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "‏WPA و WPA2 شخصي"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "أن_شئ"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "ا_تّصل"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "كلمات السر أو مفاتيح التعمية مطلوبة للاتصال بالشبكة اللاسلكية '%s'."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "الاستيثاق من مطلوب للاتصال بالشبكة اللاسلكية"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "الاستيثاق من مطلوب للاتصال بالشبكة اللاسلكية"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "أنشئ شبكة لاسلكيّة جديدة"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "شبكة لاسلكيّة جديدة"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "أدخل اسم الشبكة اللاسلكية التي تريد إنشائها."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "اتصل بشبكة لاسلكية مخفية"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "شبكة لاسلكيّة مخفية"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -511,431 +597,368 @@ msgid ""
 msgstr ""
 "أدخل اسم والإعدادات الأمنية للشبكة اللاسلكية المخفية التي تريد الاتصال بها."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "أمن ال_لاسلكي:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "اسم ال_شبكة:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "الات_صال:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "المحول ال_لاسلكي:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "إ_تّصالات VPN"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr ""
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "ملف شهادة _سُلْطة استيثاق:"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "_هوية مجهولة:"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "الاستيثاق"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "_هوية مجهولة:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "الاستيثاق ال_داخلي:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "اسم المس_تخدم:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_كلمة السر:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "تلقائي"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "إصدارة 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "إصدارة 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "ملف شهادة _سُلْطة استيثاق:"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "إصدارة _PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "عبارة سر WEP 128-bit"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "أظهر عبارة السر"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "ملف شهادة _سُلْطة استيثاق:"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "ا_لهوية:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "ملف شهادة _سُلْطة استيثاق:"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "‏TLS عبر نفق"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "‏EAP ‏(PEAP) محمي"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "مجهول"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "الا_ستيثاق:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "كل_مة سر المفتاح السري:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "ال_نوع:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "فتح النظام"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "المفتاح المشروك"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (المبدئي)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "الم_فتاح:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "أظهر ال_مفتاح"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "_فهرس WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "إدارة اتصالات الشبكة"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "خطأ إعداد VPN"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "أدِر وغيّر إعدادات الاتصالات الشبكية"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "عطل تنبيهات الاتصالات "
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "إ_تّصالات VPN"
 
-#, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند الاتصال بالشبكة."
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr ""
 
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "عطل تنبيهات قطع الاتصالات"
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند قطع الاتصال بالشبكة."
+msgid "Wi-Fi _security"
+msgstr "أمن ال_لاسلكي:"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "عطل تنبيهات الاتصالات "
+msgid "_Network name"
+msgstr "اسم ال_شبكة:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند قطع الاتصال بالشبكة."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "حظر تنبيهات توفر الشبكة"
+msgid "C_onnection"
+msgstr "الات_صال:"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند توفر الشبكة اللاسلكية."
-
-#~ msgid "Stamp"
-#~ msgstr "ختم"
+msgid "Wi-Fi _adapter"
+msgstr "المحول ال_لاسلكي:"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "يستخدم لتحديد اذا ما الخيارات يجب ان ترحّل الى اصدار جديد."
+#~ msgid "Manage your network connections"
+#~ msgstr "إدارة اتصالات الشبكة"
 
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "عطل انشاء الاتصال اللاسلكي "
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "خطأ إعداد VPN"
 
-#, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "ملف شهادة سُلْطة استيثاق"
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "أدِر وغيّر إعدادات الاتصالات الشبكية"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/as.po b/po/as.po
index 91d05e06..fb45e578 100644
--- a/po/as.po
+++ b/po/as.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2014-08-20 18:20+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami redhat com>\n"
 "Language-Team: Assamese <kde-i18n-doc kde org>\n"
@@ -20,6 +20,98 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.5\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "সংযুক্ত অধিসূচনাসমূহ অসামৰ্থবান কৰক"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"এটা নেটৱৰ্কলে সংযোগ কৰোতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে সংহতি কৰক।"
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "বিচ্ছিন্ন হোৱাৰ অধিসূচনা অসামৰ্থবান কৰা হ'ব"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"এটা নেটৱৰ্কৰ পৰা বিচ্ছিন্ন হওতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে সংহতি "
+"কৰক।"
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "VPN অধিসূচনাসমূহ অসামৰ্থবান কৰক"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"এটা VPN লে সংযোগ কৰোতে অথবা তাৰ পৰা বিচ্ছিন্ন হওতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে "
+"ইয়াক সত্যলে সংহতি কৰক।"
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "উপলব্ধ নেটৱৰ্কৰ অধিসূচনা প্ৰদৰ্শন লুকুৱা হ'ব"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"যেতিয়া Wi-Fi নেটৱৰ্কসমূহ উপলব্ধ থাকে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে "
+"সংহতি কৰক।"
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "স্টেম্প"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"নতুন সংস্কৰণত সংহতিসমূহ প্ৰব্ৰজন কৰা হ'ব নে নহয় নিৰ্ধাৰণ কৰিবলৈ ইয়াক ব্যৱহাৰ কৰা হয়।"
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Wi-Fi সৃষ্টি অসামৰ্থবান কৰক"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"এপ্লেট ব্যৱহাৰ কৰি থাকোতে adhoc নেটৱৰ্কসমূহৰ সৃষ্টি অসামৰ্থবান কৰিবলে সত্যলে সংহতি "
+"কৰক।"
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "এপ্লেটক অধিসূচনা স্থানত দেখুৱাওক"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "এপ্লেটক অধিসূচনা স্থানত প্ৰদৰ্শন অসামৰ্থবান কৰিবলে FALSE লৈ সংহত।"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA প্ৰমাণপত্ৰ উপেক্ষা কৰক"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"EAP প্ৰমাণীকৰণত CA প্ৰমাণপত্ৰসমূহৰ বিষয়ে সতৰ্কবাৰ্তা অসামৰ্থবান কৰিবলে ইয়াক সত্যলে "
+"সংহতি কৰক।"
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"EAP প্ৰমাণীকৰণৰ স্তৰ ২ ত CA প্ৰমাণপত্ৰসমূহৰ বিষয়ে সতৰ্কবাৰ্তাসমূহ অসামৰ্থবান কৰিবলে "
+"ইয়াক সত্যলে সংহতি কৰক।"
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -66,44 +158,77 @@ msgstr "পাছৱৰ্ড:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(শূণ্য)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA প্ৰমাণপত্ৰ (_A):"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "অজ্ঞাত"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "এটা পঞ্জিকা নিৰ্বাচন কৰক"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "এটা পঞ্জিকা নিৰ্বাচন কৰক"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "ব্যক্তিগত কি' (_k):"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "ব্যক্তিগত কি' পাছৱৰ্ড (_P):"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "ব্যৱহাৰকাৰী প্ৰমাণপত্ৰ (_U):"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "পাছৱৰ্ড দেখুৱাওক (_w)"
 
@@ -115,36 +240,36 @@ msgstr "অবিকল্পিত"
 msgid "My country is not listed"
 msgstr "মোৰ দেশ তালিকাত নাই"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "তালিকা বহিৰ্ভূত"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "মোৰ পৰিকল্পনা তালিকাভুক্ত নহয়..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "সেৱা উপলব্ধকৰ্তা"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "ইনস্টল কৰা GSM ডিভাইচ"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "ইনস্টল কৰা CDMA ডিভাইচ"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "যিকোনো ডিভাইচ"
 
@@ -278,54 +403,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "ম'বাইল ব্ৰডবেণ্ডৰ সংহতিসমূহ নিশ্চিত কৰক"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(শূণ্য)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "CA প্ৰমাণপত্ৰ (_A):"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "অজ্ঞাত"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-#, fuzzy
-msgid "Select"
-msgstr "এটা পঞ্জিকা নিৰ্বাচন কৰক"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-#, fuzzy
-msgid "Select from file…"
-msgstr "এটা পঞ্জিকা নিৰ্বাচন কৰক"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "ব্যৱহাৰকাৰী প্ৰমাণপত্ৰ (_U):"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "পাছৱৰ্ডসমূহ দেখুৱাওক (_w)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -348,13 +425,27 @@ msgstr "নাম"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "ব্যৱহাৰকাৰী প্ৰমাণপত্ৰ (_U):"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "পাছৱৰ্ডসমূহ দেখুৱাওক (_w)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -407,553 +498,460 @@ msgstr "দ্বিতীয় পাছৱৰ্ড (_S):"
 msgid "_Password:"
 msgstr "পাছৱৰ্ড (_P):"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "বিচ্ছিন্ন কৰক"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "কোনো নহয়"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit কি (Hex অথবা ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP ১২৮-বিট পৰিচয়পংক্তি"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ডাইনামিক WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA আৰু WPA2 ব্যক্তিগত"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA আৰু WPA2 এন্টাৰপ্ৰাইজ"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA আৰু WPA2 ব্যক্তিগত"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "সৃষ্টি কৰক (_r)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "সংযোগ কৰা (_o)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "'%s' Wi-Fi নেটৱৰ্ক ব্যৱহাৰ কৰাৰ বাবে পাছৱৰ্ড বা এনক্ৰিপশন কি'ৰ প্ৰয়োজন।"
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi নেটৱৰ্ক প্ৰমাণীকৰণ প্ৰয়োজন"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi নেটৱৰ্কৰ দ্বাৰা প্ৰমাণীকৰণৰ প্ৰয়োজন"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "নতুন Wi-Fi নেটৱৰ্ক সৃষ্টি কৰক"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "নতুন Wi-Fi নেটৱৰ্ক"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "সৃষ্টি কৰাৰ বাবে চিহ্নিত Wi-Fi নেটৱৰ্কৰ এটা নাম নিৰ্ধাৰণ কৰক।"
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "লুকুৱা Wi-Fi নেটৱৰ্কৰ সৈতে সংযোগ কৰক"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "লুকুৱা Wi-Fi নেটৱৰ্ক"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "সংযোগ কৰাৰ বাবে চিহ্নিত লুকুৱা Wi-Fi নেটৱৰ্কৰ নাম আৰু সুৰক্ষা তথ্য লিখক।"
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Wi-Fi সুৰক্ষা (_s):"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "নেটৱৰ্কৰ নাম (_N):"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "সংযোগ (_o):"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Wi-Fi এডাপ্টাৰ (_a):"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s সংযোগ"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER বা PEM প্ৰমাণপত্ৰসমূহ (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "এটা PAC ফাইল বাছক..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ফাইলসমূহ (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "সকলো ফাইল"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "বেনামী"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "প্ৰমাণীত"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "দুয়ো"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "বেনামী পৰিচয় (_m):"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC ফাইল (_f):"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "অভ্যন্তৰীক প্ৰমাণীকৰণ (_I):"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "স্বচালিত PAC যোগানৰ অনুমতি দিয়ক (_v)"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "ব্যৱহাৰকাৰীৰ নাম (_U):"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "পাছৱৰ্ড (_P):"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "স্বচালিত"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "সংস্কৰণ 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "সংস্কৰণ 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP সংস্কৰণ (_v):"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP ১২৮-বিট পৰিচয়পংক্তি"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "পাছৱৰ্ডসমূহ দেখুৱাওক (_o)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "পৰিচয় (_d):"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "টানেল কৰা TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "সুৰক্ষিত EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "প্ৰমাণীকৰণ (_t):"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "ব্যক্তিগত কি' পাছৱৰ্ড (_P):"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "ধৰণ (_T):"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "খোলা চিস্টেম"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "অংশীদাৰী কৰা কি'"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (অবিকল্পিত)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "কি' (_K):"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "কি' দেখুৱাওক (_w)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP সূচী (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "আপোনাৰ নেটৱৰ্ক সংযোগসমূহ ব্যৱস্থাপনা কৰক"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "সক্ৰিয় নেটৱৰ্ক সংযোগসমূহ"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "আপোনাৰ নেটৱৰ্ক সংযোগক ব্যৱস্থাপনা আৰু সলনি কৰক"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "সংযুক্ত অধিসূচনাসমূহ অসামৰ্থবান কৰক"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "এটা নেটৱৰ্কলে সংযোগ কৰোতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে সংহতি কৰক।"
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "বিচ্ছিন্ন হোৱাৰ অধিসূচনা অসামৰ্থবান কৰা হ'ব"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "এটা নেটৱৰ্কৰ পৰা বিচ্ছিন্ন হওতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে সংহতি "
-#~ "কৰক।"
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "VPN অধিসূচনাসমূহ অসামৰ্থবান কৰক"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "এটা VPN লে সংযোগ কৰোতে অথবা তাৰ পৰা বিচ্ছিন্ন হওতে অধিসূচনাসমূহ অসামৰ্থবান "
-#~ "কৰিবলে ইয়াক সত্যলে সংহতি কৰক।"
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "উপলব্ধ নেটৱৰ্কৰ অধিসূচনা প্ৰদৰ্শন লুকুৱা হ'ব"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "যেতিয়া Wi-Fi নেটৱৰ্কসমূহ উপলব্ধ থাকে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে "
-#~ "সংহতি কৰক।"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s সংযোগ"
 
-#~ msgid "Stamp"
-#~ msgstr "স্টেম্প"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER বা PEM প্ৰমাণপত্ৰসমূহ (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "নতুন সংস্কৰণত সংহতিসমূহ প্ৰব্ৰজন কৰা হ'ব নে নহয় নিৰ্ধাৰণ কৰিবলৈ ইয়াক ব্যৱহাৰ কৰা "
-#~ "হয়।"
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, অথবা PKCS#12 ব্যক্তিগত কিসমূহ (*.der, *.pem, *.p12, *.key)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wi-Fi সৃষ্টি অসামৰ্থবান কৰক"
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi সুৰক্ষা (_s):"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "এপ্লেট ব্যৱহাৰ কৰি থাকোতে adhoc নেটৱৰ্কসমূহৰ সৃষ্টি অসামৰ্থবান কৰিবলে সত্যলে "
-#~ "সংহতি কৰক।"
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "নেটৱৰ্কৰ নাম (_N):"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "এপ্লেটক অধিসূচনা স্থানত দেখুৱাওক"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "সংযোগ (_o):"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr "এপ্লেটক অধিসূচনা স্থানত প্ৰদৰ্শন অসামৰ্থবান কৰিবলে FALSE লৈ সংহত।"
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi এডাপ্টাৰ (_a):"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA প্ৰমাণপত্ৰ উপেক্ষা কৰক"
+#~ msgid "Manage your network connections"
+#~ msgstr "আপোনাৰ নেটৱৰ্ক সংযোগসমূহ ব্যৱস্থাপনা কৰক"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "EAP প্ৰমাণীকৰণত CA প্ৰমাণপত্ৰসমূহৰ বিষয়ে সতৰ্কবাৰ্তা অসামৰ্থবান কৰিবলে ইয়াক "
-#~ "সত্যলে সংহতি কৰক।"
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "সক্ৰিয় নেটৱৰ্ক সংযোগসমূহ"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "EAP প্ৰমাণীকৰণৰ স্তৰ ২ ত CA প্ৰমাণপত্ৰসমূহৰ বিষয়ে সতৰ্কবাৰ্তাসমূহ অসামৰ্থবান "
-#~ "কৰিবলে ইয়াক সত্যলে সংহতি কৰক।"
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "আপোনাৰ নেটৱৰ্ক সংযোগক ব্যৱস্থাপনা আৰু সলনি কৰক"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/ast.po b/po/ast.po
index b8238cda..93ff2fbc 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2011-09-07 17:48+0200\n"
 "Last-Translator: Xandru Armesto <xandru softastur org>\n"
 "Language-Team: Softastur <alministradores softastur org>\n"
@@ -19,6 +19,98 @@ msgstr ""
 "X-Poedit-Language: Asturian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Desactivar los avisos de conexón"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "Conseñar como braero pa desactivar los avisos al coneutase a una rede."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Desactivar los avisos de desconexón"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Conseñar como braero pa desactivar los avisos al desconeutase d'una rede."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Desactivar los avisos de conexón"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Conseñar como braero pa desactivar los avisos al desconeutase d'una rede."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Torgar avisos de redes afayadices"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"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."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Cuñu"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "Usao p'afitar si hai que migrar los axustes a una versión nueva."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Desactivar crear Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Conseñar braero pa desactivar la creación de redes adhoc al usar l'applet."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Escueyi el certificáu CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "Conseñar como braero pa desactivar los avisos al coneutase a una rede."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "Conseñar como braero pa desactivar los avisos al coneutase a una rede."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -65,44 +157,75 @@ msgstr "Contraseña:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(dengún)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Certificáu C_A:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Desconocida"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Certificáu C_A:"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Escueyi'l to certificáu personal..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "C_lave privada:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Contraseña de clave pri_vada:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Escueyi'l to certificáu personal..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Certificáu del _usuariu:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "A_mosar la contraseña"
 
@@ -114,36 +237,36 @@ msgstr "Predetermináu"
 msgid "My country is not listed"
 msgstr "El mio país nun ta na llista"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Non llistáu"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "El mio plan nun ta na llista…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Fornidor"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Preséu GSM instaláu"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Preséu CDMA instaláu"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Cualisquier preséu"
 
@@ -279,52 +402,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmar los axustes de la banda ancha móvil"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(dengún)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Certificáu C_A:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Desconocida"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Escueyi'l to certificáu personal..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Certificáu del _usuariu:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "A_mosar les contraseñes"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -347,13 +424,27 @@ msgstr "Nome"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Escueyi'l to certificáu personal..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Certificáu del _usuariu:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "A_mosar les contraseñes"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -406,59 +497,59 @@ msgstr "_Contraseña:"
 msgid "_Password:"
 msgstr "_Contraseña:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Desconeutar"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Denguna"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clave WEP 40/128-bit (Hexadecimal o ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Fras de pasu WEP de 128 bits"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinámica (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA y WPA2 personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA y WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA y WPA2 personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_rear"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Coneutar"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -466,42 +557,42 @@ msgstr ""
 "Necesítense les contraseñes o les claves d'encriptación pa l'accesu a la "
 "rede inalámbrica « %s »."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Requierse autentificación pa la rede inalámbrica"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Necesítase autentificación pa la rede inalámbrica"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Crear Nueva Rede Wifi"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Nueva rede inalámbrica"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Coneutar a redes invisibles inalámbriques"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Rede invisible inalámbrica"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -510,445 +601,371 @@ msgstr ""
 "Escueyi'l nome y los detalles de seguridá de la rede invisibles inalámbrica "
 "a la que te quies coneutar."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Seguridá inalámbrica:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "Nome de _rede:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Co_nexón:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "_Adaptador Wifi:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "Conexón DSL %d"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certificaos DER o PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Certificáu C_A:"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "Identidá anóni_ma:"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "Identificación"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Identidá anóni_ma:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Autenticación i_nterna:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "Nome d'_usuariu:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Contraseña:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automáticu"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versión 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versión 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Certificáu C_A:"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "Versión _PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Fras de pasu WEP de 128 bits"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "A_mosar les contraseñes"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Certificáu C_A:"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_dentidá:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Certificáu C_A:"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 #, fuzzy
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_Autenticación:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Contraseña de clave pri_vada:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Triba:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema abiertu"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Contraseña compartida"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Predetermináu)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Clave:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "A_mosar la clave"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "Índ_iz WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Remana les conexones de rede"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Conexones de rede actives"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Xestiona y camuda los axustes de conexón de rede"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Desactivar los avisos de conexón"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Conexón DSL %d"
 
+#: src/utils/utils.c:535
 #, 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."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Desactivar los avisos de desconexón"
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certificaos DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, 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."
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "Certificaos DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Desactivar los avisos de conexón"
+msgid "Wi-Fi _security"
+msgstr "_Seguridá inalámbrica:"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "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."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Torgar avisos de redes afayadices"
+msgid "_Network name"
+msgstr "Nome de _rede:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "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."
-
-#~ msgid "Stamp"
-#~ msgstr "Cuñu"
-
-#~ 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."
+msgid "C_onnection"
+msgstr "Co_nexón:"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Desactivar crear Wi-Fi"
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptador Wifi:"
 
-#, fuzzy
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Conseñar braero pa desactivar la creación de redes adhoc al usar l'applet."
+#~ msgid "Manage your network connections"
+#~ msgstr "Remana les conexones de rede"
 
 #, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Escueyi el certificáu CA"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Conexones de rede actives"
+
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Xestiona y camuda los axustes de conexón de rede"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/be.po b/po/be.po
index 9f783cc5..9a8a6826 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2012-08-19 00:28+0300\n"
 "Last-Translator: Ihar Hrachyshka <ihar hrachyshka gmail com>\n"
 "Language-Team: Belarusian <be-i18n-gnome googlegroups com>\n"
@@ -17,6 +17,86 @@ 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"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Выключыць апавяшчэнні аб злучэнні"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "Выключыць апавяшчэнні пры злучэнні з сеткай."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Выключыць апавяшчэнні аб адлучэнні"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "Выключыць апавяшчэнні пры адлучэнні ад сеткі."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Выключыць апавяшчэнні аб VPN-злучэнні"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "Выключыць апавяшчэнні пры злучэнні і адлучэнні ад VPN-сеткі."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Блакіраваць апавяшчэнні аб наяўнасці сетак"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "Выключыць апавяшчэнні аб наяўнасці сетак Wi-Fi."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Адбітак"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Выкарыстоўваецца для вызначэння патрэбы ў міграцыі настроек на новую версію."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Выключыць магчымасць стварэння Wi-Fi-сеткі"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr "Выключыць для аплета магчымасць стварэння adhoc-сеткі."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ігнараваць сертыфікат CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "Выключыць папярэджанні аб сертыфікатах CA для EAP-ідэнтыфікацыі."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Выключыць папярэджанні аб сертыфікатах CA у другой фазе EAP-ідэнтыфікацыі."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -63,44 +143,75 @@ msgstr "Пароль:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(няма)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "_Сертыфікат CA:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Невядома"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Ігнараваць сертыфікат CA"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Вызначэнне сертыфіката CA"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Прыватны _ключ:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_Пароль прыватнага ключа:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Вызначэнне сертыфіката CA"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_Сертыфікат карыстальніка:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Паказаць пароль"
 
@@ -112,36 +223,36 @@ msgstr "Прадвызначана"
 msgid "My country is not listed"
 msgstr "Маёй краіны няма ў спісе"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Не ў спісе"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Мой тарыфны план адсутнічае ў спісе..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Аператар"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Усталяванае GSM-прыстасаванне"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Усталяванае CDMA-прыстасаванне"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Любое прыстасаванне"
 
@@ -277,52 +388,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Пацвярджэнне настроек шырокапалоснай мабільнай сувязі"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(няма)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "_Сертыфікат CA:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Невядома"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Вызначэнне сертыфіката CA"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Сертыфікат карыстальніка:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Паказаць паролі"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -345,13 +410,27 @@ msgstr "Назва"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Вызначэнне сертыфіката CA"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Сертыфікат карыстальніка:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Паказаць паролі"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -404,93 +483,93 @@ msgstr "П_ароль:"
 msgid "_Password:"
 msgstr "П_ароль:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Адлучыцца"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Няма"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP, 40/128-бітны ключ (Hex ці ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP, 128-бітны пароль"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Дынамічны WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Стварыць"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "Да_лучыцца"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Для доступу да сеткі Wi-Fi \"%s\" патрэбны пароль або ключ шыфравання."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Патрэбна ідэнтыфікацыя для сеткі Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Патрэбна ідэнтыфікацыя для сеткі Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Стварэнне новай сеткі Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Новая сетка Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Упішыце назву новай сеткі Wi-Fi."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Злучэнне са схаванай сеткай Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Схаваная сетка Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -498,444 +577,370 @@ msgstr ""
 "Упішыце назву і вызначыце настройкі бяспекі для схаванай сеткі Wi-Fi, з якой "
 "трэба злучыцца."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Бяспека Wi-Fi:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Назва сеткі:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "_Злучэнне:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "_Адаптар Wi-Fi:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Злучэнне %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER- ці PEM-сертыфікаты (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Ігнараваць сертыфікат CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Выберыце PAC-файл..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-файлы (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Усе файлы"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Ананімна"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Ідэнтыфікавана"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Абодва"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "_Ананімная ідэнтычнасць:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC-ф_айл:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_Унутраная ідэнтыфікацыя:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Дазволіць _аўтаматычнае забеспячэнне PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Карыстальнік:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "П_ароль:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Аўтаматычна"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Версія 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Версія 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Ігнараваць сертыфікат CA"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "_Версія PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP, 128-бітны пароль"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "_Паказаць паролі"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ігнараваць сертыфікат CA"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "Ід_энтычнасць:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Ігнараваць сертыфікат CA"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Тунэльны TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Абаронены EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Невядома"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Ід_энтыфікацыя:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "_Пароль прыватнага ключа:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Тып:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Адкрытая сістэма"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Супольны ключ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (прадвызначана)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Ключ:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "_Паказаць ключ"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP-і_ндэкс:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Кіраванне сеткавымі злучэннямі"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Дзейныя сеткавыя злучэнні"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Настройкі сеткавага злучэння"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Выключыць апавяшчэнні аб злучэнні"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "Выключыць апавяшчэнні пры злучэнні з сеткай."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Выключыць апавяшчэнні аб адлучэнні"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr "Выключыць апавяшчэнні пры адлучэнні ад сеткі."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Выключыць апавяшчэнні аб VPN-злучэнні"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr "Выключыць апавяшчэнні пры злучэнні і адлучэнні ад VPN-сеткі."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Злучэнне %s"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Блакіраваць апавяшчэнні аб наяўнасці сетак"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER- ці PEM-сертыфікаты (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "Выключыць апавяшчэнні аб наяўнасці сетак Wi-Fi."
+#: src/utils/utils.c:547
+#, fuzzy
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER-, PEM- ці PKCS#12-прыватныя ключы (*.der, *.pem, *.p12)"
 
-#~ msgid "Stamp"
-#~ msgstr "Адбітак"
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Бяспека Wi-Fi:"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Выкарыстоўваецца для вызначэння патрэбы ў міграцыі настроек на новую "
-#~ "версію."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Назва сеткі:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Выключыць магчымасць стварэння Wi-Fi-сеткі"
+msgid "C_onnection"
+msgstr "_Злучэнне:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr "Выключыць для аплета магчымасць стварэння adhoc-сеткі."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Адаптар Wi-Fi:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ігнараваць сертыфікат CA"
+#~ msgid "Manage your network connections"
+#~ msgstr "Кіраванне сеткавымі злучэннямі"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr "Выключыць папярэджанні аб сертыфікатах CA для EAP-ідэнтыфікацыі."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Дзейныя сеткавыя злучэнні"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Выключыць папярэджанні аб сертыфікатах CA у другой фазе EAP-ідэнтыфікацыі."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Настройкі сеткавага злучэння"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/be latin po b/po/be latin po
index 8b28c8d2..55e5a48e 100644
--- a/po/be latin po
+++ b/po/be latin po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2009-02-14 12:38+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar hrachyshka gmail com>\n"
 "Language-Team: Belarusian Latin <i18n mova org>\n"
@@ -18,6 +18,86 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+#, fuzzy
+msgid "Disable disconnected notifications"
+msgstr "adłučana"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+#, fuzzy
+msgid "Suppress networks available notifications"
+msgstr "Jość biazdrotavyja sietki"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Abiary sertyfikat CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -65,44 +145,78 @@ msgstr "Parol:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(niama)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Sertyfikat CA:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Nieviadoma"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Abiary fajł"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+#, fuzzy
+msgid "Cancel"
+msgstr "gtk-cancel"
+
+#: src/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Abiary fajł"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Sertyfikat CA:"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Abiary svoj persanalny sertyfikat..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Pryvatny kluč:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Parol pryvatnaha kluča:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Abiary svoj persanalny sertyfikat..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Sertyfikat karystalnika:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 #, fuzzy
 msgid "Sho_w password"
 msgstr "Pakažy parol"
@@ -116,36 +230,36 @@ msgstr "zmoŭčana"
 msgid "My country is not listed"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 #, fuzzy
 msgid "CDMA"
 msgstr "CDMA (%s)"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Zainstalavanaja pryłada GSM"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Pryłada CDMA zainstalavanaja"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr ""
 
@@ -268,40 +382,26 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Aŭtamatyčnaje spałučeńnie „Mobile Broadband” (GSM)"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(niama)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
+#: src/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Sertyfikat CA:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#: src/nma-pkcs11-cert-chooser-dialog.c:263
 #, fuzzy
-msgid "(Unknown)"
-msgstr "Nieviadoma"
+msgid "Error opening a session: "
+msgstr "Redahavańnie spałučeńnia biaz nazvy"
 
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-#, fuzzy
-msgid "Select"
-msgstr "Abiary fajł"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr ""
 
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-#, fuzzy
-msgid "Cancel"
-msgstr "gtk-cancel"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:116
+msgid "Name"
+msgstr "Nazva"
 
-#: src/nma-cert-chooser-button.c:460
-#, fuzzy
-msgid "Select from file…"
-msgstr "Abiary fajł"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
 
 #: src/nma-pkcs11-cert-chooser.c:381
 #, fuzzy, c-format
@@ -318,34 +418,13 @@ msgstr "Sertyfikat karystalnika:"
 msgid "Sho_w passwords"
 msgstr "Pakažy paroli"
 
-#: src/nma-pkcs11-cert-chooser-dialog.c:241
-msgid "Error logging in: "
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.c:263
-#, fuzzy
-msgid "Error opening a session: "
-msgstr "Redahavańnie spałučeńnia biaz nazvy"
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:20
-msgid "_Unlock token"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:116
-msgid "Name"
-msgstr "Nazva"
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:126
-msgid "Issued By"
-msgstr ""
-
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -397,61 +476,61 @@ msgstr "_Parol:"
 msgid "_Password:"
 msgstr "_Parol:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Aŭtamatyčna spałučaj"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Niama"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitavy kluč"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Parolnaja fraza"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamičny WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Stvary"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Spałučy"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -459,42 +538,42 @@ msgstr ""
 "Kab atrymać dostup da biazdrotavaj sietki \"%s\", vymahajucca paroli ci "
 "klučy šyfravańnia."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Vymahajecca aŭtaryzacyja dla biazdrotavaj sietki"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Vymahajecca aŭtaryzacyja dla biazdrotavaj sietki"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Stvary novuju biazdrotavuju sietku"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Novaja biazdrotavaja sietka"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Spałučy sa schavanaj biazdrotavaj sietkaju"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Schavanaja biazdrotavaja sietka"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -503,352 +582,300 @@ msgstr ""
 "Akreśli nazvu j nałady biaśpieki dla schavanaj biazdrotavaj sietki, ź jakoj "
 "chočaš spałučycca."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Biazdrotavaja biaśpieka"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Nazva sietki:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Spałučeńnie:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Biazdrotavy _adapter:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "Spałučeńnie:"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Sertyfikaty DER ci PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Abiary sertyfikat CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "Ananimnaja tojesnaść:"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "Aŭtaryzacyja:"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Ananimnaja tojesnaść:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Unutranaja aŭtaryzacyja:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "Karystalnik:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Parol:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 #, fuzzy
 msgid "Automatic"
 msgstr "aŭtamatyčna"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 #, fuzzy
 msgid "Version 0"
 msgstr ""
 "Versija 0\n"
 "Versija 1"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 #, fuzzy
 msgid "Version 1"
 msgstr ""
 "Versija 0\n"
 "Versija 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "Versija PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit Parolnaja fraza"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Pakažy parolnuju frazu"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Sertyfikat karystalnika:"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "Tojesnaść:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Abiary sertyfikat CA"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunelavany TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Abaronieny EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Nieviadoma"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Aŭtaryzacyja:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Parol pryvatnaha kluča:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "Typ:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Adkrytaja systema"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 #, fuzzy
 msgid "Shared Key"
 msgstr "Papiarednie supolny kluč WPA"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 #, fuzzy
 msgid "1 (Default)"
 msgstr ""
@@ -857,32 +884,72 @@ msgstr ""
 "3\n"
 "4"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "Kluč:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 #, fuzzy
 msgid "Sho_w key"
 msgstr "Pakažy kluč"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "Indeks WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Spałučeńnie:"
+
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Sertyfikaty DER ci PEM (*.der, *.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+#, 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/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Biazdrotavaja biaśpieka"
+
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Nazva sietki:"
+
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Spałučeńnie:"
+
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Biazdrotavy _adapter:"
+
 #, fuzzy
 #~ msgid "Manage your network connections"
 #~ msgstr "Kiruj sietkavymi spałučeńniami"
@@ -894,14 +961,6 @@ msgstr ""
 #~ msgid "Manage and change your network connection settings"
 #~ msgstr "Kiruj i źmianiaj nałady sietkavych spałučeńniaŭ"
 
-#, fuzzy
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Jość biazdrotavyja sietki"
-
-#, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Abiary sertyfikat CA"
-
 #, fuzzy
 #~ msgid "NetworkManager"
 #~ msgstr "Sietkavy kiraŭnik"
@@ -930,10 +989,6 @@ msgstr ""
 #~ msgid "Connection failure"
 #~ msgstr "Niaŭdałaje spałučeńnie VPN"
 
-#, fuzzy
-#~ msgid "Device disconnect failed"
-#~ msgstr "adłučana"
-
 #, fuzzy
 #~ msgid "Disconnect failure"
 #~ msgstr "Adłučany"
diff --git a/po/bg.po b/po/bg.po
index 0a92498b..874d46bc 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: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\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,6 +21,101 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Изключване на уведомяването за установяването на връзки"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Задайте да е истина, за да изключите уведомяванията при установяване на "
+"връзка към мрежа."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Изключване на уведомяването за прекъсване на връзки"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Задайте да е истина, за да изключите уведомяванията при прекъсването на "
+"връзка към мрежа."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Изключване на уведомяванията за ВЧМ"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Задайте да е истина, за да изключите уведомяванията при прекъсването на "
+"връзка към ВЧМ."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Без уведомявания за наличие на безжични мрежи"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Задайте да е истина, за да изключите уведомяванията при наличие на безжични "
+"мрежи."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Мигриране"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "Ключът указва дали настройките да се мигрират към нова версия."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Забраняване на създаването на безжична мрежа"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Задайте да е истина, за да се забрани създаването на инцидентни мрежи (ад "
+"хок) чрез този аплет."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Показване на оплета в областта за уведомяване"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Задайте да лъжа, за да изключите показването на аплета в областта за "
+"уведомяване"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Избор на сертификат от сертифициращ орган"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Задайте да е истина, за да се изключат предупрежденията за сертификатите на "
+"сертифициращите органи при ползване на EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Задайте да е истина, за да се изключат предупрежденията за сертификатите на "
+"сертифициращите органи във втората фаза на идентификацията при ползване на "
+"EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -67,44 +162,75 @@ msgstr "Парола:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(нищо)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "С_ертификат на CA:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Неопределена"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "_Не е необходим сертификат от сертифициращ орган"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Избор на ваш, личен сертификат…"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Частен _ключ:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Парола за _частен ключ:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Избор на ваш, личен сертификат…"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_Потребителски сертификат:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Показ_ване на паролата"
 
@@ -116,36 +242,36 @@ msgstr "Стандартна"
 msgid "My country is not listed"
 msgstr "Моята държава не е в списъка"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Не е в списъка"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Планът не е в списъка…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Доставчик"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Инсталирано устройство за GSM"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Инсталирано устройство за CDMA"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Което и да е устройство"
 
@@ -279,52 +405,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Потвърждение на настройки на мобилна връзка"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(нищо)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "С_ертификат на CA:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Неопределена"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Избор на ваш, личен сертификат…"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Потребителски сертификат:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Пока_зване на паролите"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -347,13 +427,27 @@ msgstr "Име"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Избор на ваш, личен сертификат…"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Потребителски сертификат:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Пока_зване на паролите"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -406,59 +500,59 @@ msgstr "_Втора парола:"
 msgid "_Password:"
 msgstr "_Парола:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr " Прекъсване"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Без"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "40/128 битов ключ за WEP (шестнадесетичен или ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "128 битова парола за WEP"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Динамичен WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "Частна WPA & WPA2 "
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "Корпоративна WPA & WPA2"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Частна WPA & WPA2 "
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Създаване"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Свързване"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -466,35 +560,35 @@ msgstr ""
 "За достъп до безжичната мрежа „%s“ са необходими пароли или криптирани "
 "ключове."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Изисква се идентификация за безжична мрежа"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Изисква се идентификация за безжична мрежа"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Създаване на нова безжична мрежа"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Нова безжична мрежа"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Въведете име на безжичната мрежа, която искате да създадете."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Свързване към скрита безжична мрежа"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Скрита безжична мрежа"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -502,464 +596,369 @@ msgstr ""
 "Въведете име и данни за сигурност на скритата безжична мрежа, към която "
 "искате да се свържете."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Защита на безжична мрежа:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Име на мрежа:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Вр_ъзка:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Безжична _карта:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Връзка към %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Сертификати, DER или PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "_Не е необходим сертификат от сертифициращ орган"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Избор на файл за PAC…"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Файлове за PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Всички файлове"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Анонимен"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Идентификация"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "И двете"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Анони_мна идентичност:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "_Файл за PAC:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "В_ътрешна идентификация"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Автоматично снабдяване с PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Потребител:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Парола:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Версия 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Версия 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "_Не е необходим сертификат от сертифициращ орган"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "Версия на _PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "128 битова парола за WEP"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Пока_зване на паролите"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "_Не е необходим сертификат от сертифициращ орган"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "И_дентичност:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "_Не е необходим сертификат от сертифициращ орган"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Тунелен TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Защитен EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Неопределена"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_Идентификация:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Парола за _частен ключ:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Вид:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Открита система"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Споделен ключ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (стандартно)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Ключ:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Пок_азване на ключа"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "Индек_с в WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Управление на мрежовите връзки"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Активни мрежови връзки"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Управление и промяна на настройките на вашата мрежа"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Изключване на уведомяването за установяването на връзки"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Задайте да е истина, за да изключите уведомяванията при установяване на "
-#~ "връзка към мрежа."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Изключване на уведомяването за прекъсване на връзки"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Задайте да е истина, за да изключите уведомяванията при прекъсването на "
-#~ "връзка към мрежа."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Изключване на уведомяванията за ВЧМ"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Задайте да е истина, за да изключите уведомяванията при прекъсването на "
-#~ "връзка към ВЧМ."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Без уведомявания за наличие на безжични мрежи"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Задайте да е истина, за да изключите уведомяванията при наличие на "
-#~ "безжични мрежи."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Връзка към %s"
 
-#~ msgid "Stamp"
-#~ msgstr "Мигриране"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Сертификати, DER или PEM (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "Ключът указва дали настройките да се мигрират към нова версия."
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+"Частни ключове, формат DER, PEM или PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Забраняване на създаването на безжична мрежа"
+msgid "Wi-Fi _security"
+msgstr "_Защита на безжична мрежа:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Задайте да е истина, за да се забрани създаването на инцидентни мрежи (ад "
-#~ "хок) чрез този аплет."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Име на мрежа:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Показване на оплета в областта за уведомяване"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Вр_ъзка:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Задайте да лъжа, за да изключите показването на аплета в областта за "
-#~ "уведомяване"
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Безжична _карта:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Избор на сертификат от сертифициращ орган"
+#~ msgid "Manage your network connections"
+#~ msgstr "Управление на мрежовите връзки"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Задайте да е истина, за да се изключат предупрежденията за сертификатите "
-#~ "на сертифициращите органи при ползване на EAP."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Активни мрежови връзки"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Задайте да е истина, за да се изключат предупрежденията за сертификатите "
-#~ "на сертифициращите органи във втората фаза на идентификацията при "
-#~ "ползване на EAP."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Управление и промяна на настройките на вашата мрежа"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 39c3513a..992bbc07 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2014-12-02 01:55-0500\n"
 "Last-Translator: \n"
 "Language-Team: Bengali (India) <anubad lists ankur org in>\n"
@@ -22,6 +22,109 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 3.5.1\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "সংযুক্ত হওয়ার বিজ্ঞপ্তি নিষ্ক্রিয় করা হবে"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"নেটওয়ার্কের সাথে সংযুক্ত করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই "
+"মান TRUE হিসাবে নির্ধারণ করুন।"
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "বিচ্ছিন্ন হওয়ার বিজ্ঞপ্তি নিষ্ক্রিয় করা হবে"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"নেটওয়ার্কের সাথে সংযোগ বিচ্ছিন্ন করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার "
+"জন্য এই মান TRUE হিসাবে নির্ধারণ করুন।"
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "সংযুক্ত হওয়ার বিজ্ঞপ্তি নিষ্ক্রিয় করা হবে"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"নেটওয়ার্কের সাথে সংযোগ বিচ্ছিন্ন করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার "
+"জন্য এই মান TRUE হিসাবে নির্ধারণ করুন।"
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "উপলব্ধ নেটওয়ার্কের বিজ্ঞপ্তি প্রদর্শন আড়াল করা হবে"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"বেতার নেটওয়ার্ক উপলব্ধ থাকলে বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই মান "
+"TRUE হিসাবে নির্ধারণ করুন।"
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "স্ট্যাম্প"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"নতুন সংস্করণের মধ্যে বৈশিষ্ট্য মাইগ্রেট করা হবে কি না নির্ধারণ করতে এটি ব্যবহার করা "
+"হয়।"
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "ওয়াই-ফাই নির্মাণ নিষ্ক্রিয় করুন"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"এই অ্যাপ্লেট সহযোগে অ্যাড-হক নেটওয়ার্ক নির্মাণের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই মান "
+"TRUE হিসাবে নির্ধারণ করুন।"
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "CA সার্টিফিকেট: (_A)"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"নেটওয়ার্কের সাথে সংযুক্ত করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই "
+"মান TRUE হিসাবে নির্ধারণ করুন।"
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"নেটওয়ার্কের সাথে সংযুক্ত করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই "
+"মান TRUE হিসাবে নির্ধারণ করুন।"
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -69,44 +172,75 @@ msgstr "পাসওয়ার্ড:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(শূণ্য)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA সার্টিফিকেট: (_A)"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "অজানা"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "ব্যক্তিগত-কি: (_k)"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "ব্যক্তিগত কি-র পাসওয়ার্ড: (_P)"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "ব্যবহারকারীর সার্টিফিকেট: (_U)"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
 
@@ -118,36 +252,36 @@ msgstr "ডিফল্ট"
 msgid "My country is not listed"
 msgstr "আমার দেশ তালিকার মধ্যে উপস্থিত নেই"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "তালিকা বহির্ভূত"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "ব্যবহৃত প্ল্যান তালিকায় অনুপস্থিত..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "পরিসেবা উপলব্ধকারী"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "ইনস্টল করা GSM ডিভাইস"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "ইনস্টল করা CDMA ডিভাইস"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "যে কোনো ডিভাইস"
 
@@ -282,52 +416,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "মোবাইল ব্রড-ব্যান্ডের বৈশিষ্ট্য নিশ্চিত করুন"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(শূণ্য)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "CA সার্টিফিকেট: (_A)"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "অজানা"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "ব্যবহারকারীর সার্টিফিকেট: (_U)"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -350,13 +438,27 @@ msgstr "নাম"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "ব্যবহারকারীর সার্টিফিকেট: (_U)"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -409,101 +511,101 @@ msgstr "পাসওয়ার্ড: (_P)"
 msgid "_Password:"
 msgstr "পাসওয়ার্ড: (_P)"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "সংযোগ বিচ্ছিন্ন করুন"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "শূণ্য"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP ৪০/১২৮-বিট কি (Hex অথবা ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP ১২৮-বিট পরিচয়পংক্তি"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ডাইনামিক WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ও WPA2 ব্যক্তিগত"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ও WPA2 এন্টারপ্রাইজ"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA ও WPA2 ব্যক্তিগত"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "নির্মান করুন (_r)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "সংযোগ করুন (_o)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "'%s' বেতার নেটওয়ার্ক ব্যবহার করার জন্য পাসওয়ার্ড অথবা এনক্রিপশন-কি প্রয়োজন।"
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "বেতার নেটওয়ার্ক অনুমোদন প্রয়োজন"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "বেতার নেটওয়ার্কের জন্য অনুমোদন প্রয়োজন"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "নতুন বেতার নেটওয়ার্ক তৈরি করুন"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "নতুন বেতার নেটওয়ার্ক"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "নির্মাণ করার উদ্দেশ্যে চিহ্নিত বেতার নেটওয়ার্কের নাম নির্ধারণ করুন।"
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "গোপন বেতার নেটওয়ার্কের সাথে সংযোগ স্থাপন করুন"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "গোপন বেতার নেটওয়ার্ক"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -512,353 +614,301 @@ msgstr ""
 "সংযোগ করার উদ্দেশ্যে চিহ্নিত গোপন বেতার নেটওয়ার্কের নাম ও নিরাপত্তা বিষয়ক তথ্য "
 "লিখুন।"
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "নিরাপত্তা: (_S)"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "নেটওয়ার্কের নাম: (_N)"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "সংযোগ: (_n)"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "বেতার অ্যাডাপ্টার: (_a)"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "DSL সংযোগ %d"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER অথবা PEM সার্টিফিকেট (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "একটি PAC ফাইল বাছুন..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ফাইল (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "সর্বধরনের ফাইল"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "নামবিহীন পরিচয়: (_m)"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "অনুমোদন ব্যবস্থা: (_A)"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "নামবিহীন পরিচয়: (_m)"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "_PAC ফাইল:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "অভ্যন্তরীণ অনুমোদন: (_n)"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 #, fuzzy
 msgid "Allow automatic PAC pro_visioning"
 msgstr "স্বয়ংক্রিয় PAC বিশেষাধীকারের অনুমতি দিন (_A)"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "ব্যবহারকারীর নাম: (_U)"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "পাসওয়ার্ড: (_P)"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "স্বয়ংক্রিয়"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP-র সংস্করণ: (_P)"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP ১২৮-বিট পরিচয়পংক্তি"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "পরিচয়: (_d)"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "টানেল করা TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "প্রটেক্টেড EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "অজানা"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "অনুমোদন ব্যবস্থা: (_A)"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "ব্যক্তিগত কি-র পাসওয়ার্ড: (_P)"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "ধরন: (_T)"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 #, fuzzy
 msgid "Open System"
 msgstr ""
 "উন্মুক্ত সিস্টেম\n"
 "যৌথরূপে ব্যবহৃত কি"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 #, fuzzy
 msgid "Shared Key"
 msgstr ""
 "উন্মুক্ত সিস্টেম\n"
 "যৌথরূপে ব্যবহৃত কি"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 #, fuzzy
 msgid "1 (Default)"
 msgstr ""
@@ -867,109 +917,81 @@ msgstr ""
 "৩\n"
 "৪"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "কি: (_K)"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "কি প্রদর্শন করা হবে (_w)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP ইন্ডেক্স: (_x)"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Manage your network connections"
-#~ msgstr "নেটওয়ার্ক সংযোগ নিয়ন্ত্রণ করুন"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "নেটওয়ার্ক সংযোগ"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "আপনার নেটওয়ার্ক সংযোগ বৈশিষ্ট্য সম্পাদন ও পরিবর্তন করুন"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "সংযুক্ত হওয়ার বিজ্ঞপ্তি নিষ্ক্রিয় করা হবে"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "DSL সংযোগ %d"
 
+#: src/utils/utils.c:535
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "নেটওয়ার্কের সাথে সংযুক্ত করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই "
-#~ "মান TRUE হিসাবে নির্ধারণ করুন।"
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "বিচ্ছিন্ন হওয়ার বিজ্ঞপ্তি নিষ্ক্রিয় করা হবে"
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER অথবা PEM সার্টিফিকেট (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "নেটওয়ার্কের সাথে সংযোগ বিচ্ছিন্ন করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় "
-#~ "করার জন্য এই মান TRUE হিসাবে নির্ধারণ করুন।"
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, অথবা PKCS#12 ব্যক্তিগত-কি (*.der, *.pem, *.p12)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "সংযুক্ত হওয়ার বিজ্ঞপ্তি নিষ্ক্রিয় করা হবে"
+msgid "Wi-Fi _security"
+msgstr "নিরাপত্তা: (_S)"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "নেটওয়ার্কের সাথে সংযোগ বিচ্ছিন্ন করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় "
-#~ "করার জন্য এই মান TRUE হিসাবে নির্ধারণ করুন।"
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "উপলব্ধ নেটওয়ার্কের বিজ্ঞপ্তি প্রদর্শন আড়াল করা হবে"
+msgid "_Network name"
+msgstr "নেটওয়ার্কের নাম: (_N)"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "বেতার নেটওয়ার্ক উপলব্ধ থাকলে বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই মান "
-#~ "TRUE হিসাবে নির্ধারণ করুন।"
-
-#~ msgid "Stamp"
-#~ msgstr "স্ট্যাম্প"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "নতুন সংস্করণের মধ্যে বৈশিষ্ট্য মাইগ্রেট করা হবে কি না নির্ধারণ করতে এটি ব্যবহার "
-#~ "করা হয়।"
+msgid "C_onnection"
+msgstr "সংযোগ: (_n)"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "ওয়াই-ফাই নির্মাণ নিষ্ক্রিয় করুন"
+msgid "Wi-Fi _adapter"
+msgstr "বেতার অ্যাডাপ্টার: (_a)"
 
 #, fuzzy
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "এই অ্যাপ্লেট সহযোগে অ্যাড-হক নেটওয়ার্ক নির্মাণের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই "
-#~ "মান TRUE হিসাবে নির্ধারণ করুন।"
+#~ msgid "Manage your network connections"
+#~ msgstr "নেটওয়ার্ক সংযোগ নিয়ন্ত্রণ করুন"
 
 #, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA সার্টিফিকেট: (_A)"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "নেটওয়ার্ক সংযোগ"
+
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "আপনার নেটওয়ার্ক সংযোগ বৈশিষ্ট্য সম্পাদন ও পরিবর্তন করুন"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/bs.po b/po/bs.po
index 7beacb36..7ca79f48 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2015-02-27 10:25+0100\n"
 "Last-Translator: Samir Ribic <samir ribic etf unsa ba>\n"
 "Language-Team: Bosnian <lokal linux org ba>\n"
@@ -15,6 +15,98 @@ msgstr ""
 "X-Launchpad-Export-Date: 2015-02-05 06:47+0000\n"
 "X-Generator: Launchpad (build 17331)\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Isključivanje obavještenja o povezivanju"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Uključite ovu opciju da isključite obavještenja kada se povezujete na mrežu."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Isključivanje obavještenja o prekidu veze"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Uključite ovu opciju da isključite obavještenja kada prekidate vezu sa "
+"mrežom."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Isključivanje VPN obavještenja"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Uključite ovu opciju da isključite obavještenja kada se povezujete na VPN "
+"ili kada prekidate vezu sa njim."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Isključi obavještavanja o dostupnim mrežama"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Uključite ovu opciju da isključite obavještenja o dostupnosti bežičnih mreža."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Pečat"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "Ovo određuje da li treba prevesti podešavanja na novo izdanje."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Onemogući kreiranje bežične mreže"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Uključite ovu opciju da isključite formiranje ad-hoc mreža iz ovog "
+"programčića."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Prikaži programčić u obvještajnom području"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Postavljeno na FALSE radi onemogućivanja programčića u obavještajnom "
+"području."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Zanemari CA certifikat"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Uključite ovu opciju da isključite upozorenja o CA certifikatima u EAP "
+"potvrđivanju identiteta."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Uključite ovu opciju da isključite upozorenja o CA certifikatima u drugoj "
+"fazi EAP potvrđivanja identiteta."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -61,44 +153,75 @@ msgstr "Lozinka:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ništa)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA _potvrda:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Nepoznato"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Nema _tražene CA potvrde"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Izaberite vaš lični sertifikat..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Privatni _ključ:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "L_ozinka privatnog ključa:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Izaberite vaš lični sertifikat..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Ko_risnikov sertifikat:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Prikaži _lozinku"
 
@@ -110,36 +233,36 @@ msgstr "Podrazumijevana"
 msgid "My country is not listed"
 msgstr "Moja država nije na spisku"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Nije na listi"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Moj plan nije na spisku..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Provajder"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Instaliran GSM uređaj"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Instaliran CDMS uređaj"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Bilo koji uređaj"
 
@@ -276,52 +399,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Potvrdite podešavanja mobilne širokopojasne veze"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(ništa)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "CA _potvrda:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Nepoznato"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Izaberite vaš lični sertifikat..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Ko_risnikov sertifikat:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Prika_ži lozinke"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -344,13 +421,27 @@ msgstr "Naziv"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Izaberite vaš lični sertifikat..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Ko_risnikov sertifikat:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Prika_ži lozinke"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -403,558 +494,464 @@ msgstr "_Sekundarna lozinka:"
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Prekini vezu"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nikakva"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitni ključ (Hex ili ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit lozinka"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamički WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "Lični WPA & WPA2"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "Poslovni WPA & WPA2"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Lični WPA & WPA2"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Napravi"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 #, fuzzy
 msgid "C_onnect"
 msgstr "Povezan"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Lozinke ili ključevi enkripcije su potrebni za pristup na Wi-Fi mrežu '%s'."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Potrebna Autentikacija Wi-Fi mreže"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentifikacija potrebna od Wi-Fi mreže"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Kreirajte Novu Wi-Fi Mrežu"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nova Wi-Fi mreža"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Konektujte se na Skrivenu Wi-Fi Mrežu"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Skrivena Wi-Fi mreža"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 "Unesite ime i sigurnosne detalje skrivene Wi-Fi mreže koju želite kreirati."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Wi-Fi _sigurnost:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Ime mreže:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "K_onekcija:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Wi-Fi _punjač:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s veza"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER ili PEM sertifikati (*.der, *.pijem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Nema _tražene CA potvrde"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Izaberi PAC datoteku..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC datoteke (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autentifikovan"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Oboje"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Anonimni _identitet:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC _datoteka:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_Unutrašnja prijava:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Dozvoli samostalno PAC _rezervisanje"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "Kori_sničko ime:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Lozinka:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatski"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Verzija 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Verzija 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Nema _tražene CA potvrde"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP _verzija:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit lozinka"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Prikaži l_ozinke"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Nema _tražene CA potvrde"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "_Identitet:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Nema _tražene CA potvrde"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "BRZO"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunelski TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Zaštićeni EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Po_tvrđivanje identiteta:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "L_ozinka privatnog ključa:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Tip:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Otvoreni sistem"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Dijeljeni ključ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Podrazumijevano)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Ključ:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "P_rikaži ključ"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP i_ndeks:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Upravljajte svojim mrežnim vezama"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Aktivne mrežne veze"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Upravljajte i izmijenite podešavanja vaših mrežnih veza"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Isključivanje obavještenja o povezivanju"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Uključite ovu opciju da isključite obavještenja kada se povezujete na "
-#~ "mrežu."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Isključivanje obavještenja o prekidu veze"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Uključite ovu opciju da isključite obavještenja kada prekidate vezu sa "
-#~ "mrežom."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Isključivanje VPN obavještenja"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Uključite ovu opciju da isključite obavještenja kada se povezujete na VPN "
-#~ "ili kada prekidate vezu sa njim."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Isključi obavještavanja o dostupnim mrežama"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Uključite ovu opciju da isključite obavještenja o dostupnosti bežičnih "
-#~ "mreža."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s veza"
 
-#~ msgid "Stamp"
-#~ msgstr "Pečat"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER ili PEM sertifikati (*.der, *.pijem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "Ovo određuje da li treba prevesti podešavanja na novo izdanje."
+#: src/utils/utils.c:547
+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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Onemogući kreiranje bežične mreže"
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi _sigurnost:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Uključite ovu opciju da isključite formiranje ad-hoc mreža iz ovog "
-#~ "programčića."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Ime mreže:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Prikaži programčić u obvještajnom području"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "K_onekcija:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Postavljeno na FALSE radi onemogućivanja programčića u obavještajnom "
-#~ "području."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi _punjač:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Zanemari CA certifikat"
+#~ msgid "Manage your network connections"
+#~ msgstr "Upravljajte svojim mrežnim vezama"
 
-#~ 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 certifikatima u EAP "
-#~ "potvrđivanju identiteta."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Aktivne mrežne veze"
 
-#~ 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 certifikatima u drugoj "
-#~ "fazi EAP potvrđivanja identiteta."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Upravljajte i izmijenite podešavanja vaših mrežnih veza"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/ca.po b/po/ca.po
index d3af6fb0..b3c79e81 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2018-06-24 20:41+0100\n"
 "Last-Translator: Carles Ferrando Garcia <carles ferrando gmail com>\n"
 "Language-Team: Catalan <kde-i18n-ca kde org>\n"
@@ -25,6 +25,100 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 2.0\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Inhabilita les notificacions de connexió"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en connectar-"
+"se a una xarxa."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Inhabilita les notificacions de desconnexió"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en "
+"desconnectar-se d'una xarxa."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Inhabilita les notificacions de la VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en connectar-"
+"se o desconnectar-se d'una VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "No mostris les notificacions de xarxes disponibles"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions quan hi hagi "
+"disponibles xarxes sense fil."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Segell"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"S'utilitza per determinar si cal migrar els paràmetres a una versió nova."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Inhabilita la creació de connexions sense fil"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar la creació de xarxes ad hoc en "
+"utilitzar la miniaplicació."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Mostra la miniaplicació a l'àrea de notificació"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Establiu-lo a «FALSE» (fals) per no mostrar la miniaplicació a l'àrea de "
+"notificació."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignora el certificat de CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els certificats "
+"de CA en l'autenticació EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els certificats "
+"de CA en la segona fase de l'autenticació EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -77,43 +171,72 @@ msgstr "Contrasenya"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr "Escanegeu-lo amb el telèfon o <a href=\"nma:print\">imprimiu-lo</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(cap)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Clau a %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificat a %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Desconegut)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Selecciona"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Selecciona des d'un fitxer…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Cap certificat configurat"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Cap clau configurada"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Trieu una clau per al vostre certificat %s"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "Clau _privada %s"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "Contrasenya de la clau _privada %s"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Trieu el vostre certificat %s"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "_Certificat %s"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Most_ra la contrasenya"
 
@@ -125,35 +248,35 @@ msgstr "Per defecte"
 msgid "My country is not listed"
 msgstr "El meu país no és a la llista"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "No és a la llista"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "El meu pla no és a la llista…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Proveïdor"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Dispositiu GSM instal·lat"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Dispositiu CDMA instal·lat"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Qualsevol dispositiu"
 
@@ -285,50 +408,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmeu els paràmetres de la banda ampla mòbil"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(cap)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Clau a %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Certificat a %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Desconegut)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Selecciona"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Selecciona des d'un fitxer…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Trieu el certificat %s"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "_Contrasenya del certificat %s"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Mo_stra les contrasenyes"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Error en iniciar a la sessió: "
@@ -349,13 +428,27 @@ msgstr "Nom"
 msgid "Issued By"
 msgstr "Emès per"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Trieu el certificat %s"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Contrasenya del certificat %s"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Mo_stra les contrasenyes"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Entra el PIN %s"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
@@ -403,57 +496,57 @@ msgstr "Contrasenya _secundària:"
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Cliqueu per connectar"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Nou…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Cap"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clau WEP de 40/128 bits (Hex o ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Contrasenya WEP de 128 bits"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinàmic (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA i WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA i WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_rea"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "C_onnecta"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -461,35 +554,35 @@ msgstr ""
 "Cal una contrasenya o claus d'encriptació per accedir a la xarxa sense fil "
 "«%s»."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Cal autenticació per a la xarxa sense fil"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Cal autenticació per a la xarxa sense fil"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Crea una xarxa sense fil nova"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Xarxa sense fil nova"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connecta't a la xarxa sense fil oculta"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Xarxa sense fil oculta"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -497,297 +590,251 @@ msgstr ""
 "Introduïu el nom i els paràmetres de seguretat de la xarxa sense fil oculta "
 "a la qual us vulgueu connectar."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Seguretat de la _xarxa sense fil"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "Nom de _xarxa"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "Co_nnexió"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "_Adaptador sense fil"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "connexió de %s"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certificats PEM (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "error no definit a la seguretat 802.1X (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "no s'ha seleccionat cap certificat de CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "els fitxers de certificat CA no existeix"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "falta el fitxer EAP-FAST PAC"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Seleccioneu un fitxer PAC"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Fitxers PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Tots els fitxers"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anònim"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenticat"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Ambdós"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Identitat anòni_ma"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "Fitxer _PAC"
 
 # FIXME: (dpm)
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "Autenticació _interna"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Permet la provisió automàtica PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "falta el nom d'usuari EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "falta la contrasenya EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "Nom d'_usuari"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Contrasenya"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versió 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versió 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "No es _requereix cap certificat de CA"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "Versió del _PEAP"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Suffix del nom del certificat del servidor."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Domini"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "falta el nom d'usuari EAP"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "falta la clau EAP"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "manca la contrasenya de la clau privada del client EAP"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "_Contrasenya de la clau privada"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "M_ostra la contrasenya"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "falta la identitat EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "no s'ha seleccionat cap certificat d'usuari"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "el fitxer seleccionat del certificat de l'usuari no existeix"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "no s'ha seleccionat cap clau"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "el fitxer de la clau seleccionada no existeix"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "I_dentitat"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (sense EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "error desconegut quan s'estava validant la seguretat 802.1X"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "error no definit a la seguretat 802.1X (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "no s'ha seleccionat cap certificat de CA"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "els fitxers de certificat CA no existeix"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "TLS per túnel"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegit (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Desconeguda"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Configurat externament"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "_Autenticació"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "falta el nom d'usuari leap"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "falta la contrasenya leap"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "falta la clau EAP"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Tipus"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "falta la clau wep"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "clau wep no vàlida: una clau amb longitud %zu ha de contenir sols dígits "
 "hexadecimals"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -795,7 +842,7 @@ msgstr ""
 "clau wep no vàlida: una clau amb longitud %zu ha de contenir sols caràcters "
 "ascii"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -804,41 +851,41 @@ msgstr ""
 "clau web no vàlida: la longitud %zu és incorrecta. Una clau ha de tenir "
 "longitud 5/13 (ascii) o 10/26 (hex)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "clau web no vàlida: la frase de contrasenya no pot estar buida"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "clau web no vàlida: la frase de contrasenya ha de tenir una longitud "
 "inferior a 64 caràcters"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema obert"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Clau compartida"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (predeterminat)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Clau"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Most_ra la clau"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "Índe_x WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -847,12 +894,46 @@ msgstr ""
 "wpa-psk no vàlida: la longitud de la clau %zu no és vàlida. Ha de ser [8,63] "
 "bytes o 64 dígits hexadecimals"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk no vàlida: no es pot interpretar una clau amb 64 bytes com a "
 "hexadecimal"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "error desconegut quan s'estava validant la seguretat 802.1X"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "connexió de %s"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certificats PEM (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+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/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Seguretat de la _xarxa sense fil"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "Nom de _xarxa"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "Co_nnexió"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptador sense fil"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Gestioneu les connexions de xarxa"
 
@@ -868,88 +949,6 @@ msgstr ""
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Inhabilita les notificacions de connexió"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en "
-#~ "connectar-se a una xarxa."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Inhabilita les notificacions de desconnexió"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en "
-#~ "desconnectar-se d'una xarxa."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Inhabilita les notificacions de la VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en "
-#~ "connectar-se o desconnectar-se d'una VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "No mostris les notificacions de xarxes disponibles"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions quan hi "
-#~ "hagi disponibles xarxes sense fil."
-
-#~ msgid "Stamp"
-#~ msgstr "Segell"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "S'utilitza per determinar si cal migrar els paràmetres a una versió nova."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Inhabilita la creació de connexions sense fil"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar la creació de xarxes ad hoc "
-#~ "en utilitzar la miniaplicació."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Mostra la miniaplicació a l'àrea de notificació"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Establiu-lo a «FALSE» (fals) per no mostrar la miniaplicació a l'àrea de "
-#~ "notificació."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignora el certificat de CA"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els "
-#~ "certificats de CA en l'autenticació EAP."
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els "
-#~ "certificats de CA en la segona fase de l'autenticació EAP."
-
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
 
diff --git a/po/ca valencia po b/po/ca valencia po
index 68c06af4..d4071257 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: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\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,6 +23,101 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Inhabilita les notificacions de connexió"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en connectar-"
+"se a una xarxa."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Inhabilita les notificacions de desconnexió"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en "
+"desconnectar-se d'una xarxa."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Inhabilita les notificacions de la VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en connectar-"
+"se o desconnectar-se d'una VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "No mostres les notificacions de xarxes disponibles"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions quan hi haja "
+"disponibles xarxes sense fil."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Segell"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"S'utilitza per determinar si cal migrar els paràmetres a una versió nova."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Inhabilita la creació de connexions sense fil"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar la creació de xarxes ad hoc en "
+"utilitzar la miniaplicació."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Mostra la miniaplicació a l'àrea de notificació"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Establiu-lo a «FALSE» (fals) per no mostrar la miniaplicació a l'àrea de "
+"notificació"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignora el certificat de CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els certificats "
+"de CA en l'autenticació EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els certificats "
+"de CA en la segona fase de l'autenticació EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -69,44 +164,75 @@ msgstr "Contrasenya:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(cap)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Certificat de C_A:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Desconeguda"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "No es _requereix cap certificat de CA"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Trieu el vostre certificat personal..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Clau _privada:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Contrasenya de la clau _privada:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Trieu el vostre certificat personal..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Certificat de l'_usuari:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Most_ra la contrasenya"
 
@@ -118,36 +244,36 @@ msgstr "Per defecte"
 msgid "My country is not listed"
 msgstr "El meu país no és a la llista"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "No és a la llista"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "No és a la llista..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Proveïdor"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Dispositiu GSM instal·lat"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Dispositiu CDMA instal·lat"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Qualsevol dispositiu"
 
@@ -285,52 +411,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmeu els paràmetres de la banda ampla mòbil"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(cap)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Certificat de C_A:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Desconeguda"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Trieu el vostre certificat personal..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Certificat de l'_usuari:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Mo_stra les contrasenyes"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -353,13 +433,27 @@ msgstr "Nom"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Trieu el vostre certificat personal..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Certificat de l'_usuari:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Mo_stra les contrasenyes"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -412,60 +506,60 @@ msgstr "Contrasenya _secundària:"
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Desconnecta"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Cap"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clau WEP de 40/128 bits (Hex o ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Contrasenya WEP de 128 bits"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinàmic 802.1X"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA i WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA i WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_rea"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 #, fuzzy
 msgid "C_onnect"
 msgstr "Connectat"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -473,35 +567,35 @@ msgstr ""
 "Cal una contrasenya o claus d'encriptació per accedir a la xarxa sense fil "
 "«%s»."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Cal autenticació per a la xarxa sense fil"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Cal autenticació per a la xarxa sense fil"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Crea una xarxa sense fil nova"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Xarxa sense fil nova"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connecta't a la xarxa sense fil oculta"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Xarxa sense fil oculta"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -509,464 +603,369 @@ msgstr ""
 "Introduïu el nom i els paràmetres de seguretat de la xarxa sense fil oculta "
 "a la qual vos vulgueu connectar."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Seguretat de la _xarxa sense fil:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "Nom de _xarxa:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Co_nnexió:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "_Adaptador sense fil:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "connexió de %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certificats DER o PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "No es _requereix cap certificat de CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Seleccioneu un fitxer PAC..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Fitxers PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Tots els fitxers"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anònim"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenticat"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Ambdós"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Identitat anòni_ma:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "Fitxer _PAC:"
 
 # FIXME: (dpm)
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Autenticació i_nterna:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Permet la provisió automàtica PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "Nom d'_usuari:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Contrasenya:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versió 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versió 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "No es _requereix cap certificat de CA"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "Versió del _PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Contrasenya WEP de 128 bits"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "M_ostra les contrasenyes"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "No es _requereix cap certificat de CA"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_dentitat:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "No es _requereix cap certificat de CA"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "TLS per túnel"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegit (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Desconeguda"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_Autenticació:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Contrasenya de la clau _privada:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Tipus:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema obert"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Clau compartida"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (predeterminat)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Clau:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Most_ra la clau"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "Índe_x WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Gestioneu les connexions de xarxa"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Connexions de xarxa actives"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Gestioneu i modifiqueu els paràmetres de connexió de xarxa"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Inhabilita les notificacions de connexió"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en "
-#~ "connectar-se a una xarxa."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Inhabilita les notificacions de desconnexió"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en "
-#~ "desconnectar-se d'una xarxa."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Inhabilita les notificacions de la VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en "
-#~ "connectar-se o desconnectar-se d'una VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "No mostres les notificacions de xarxes disponibles"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions quan hi "
-#~ "haja disponibles xarxes sense fil."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "connexió de %s"
 
-#~ msgid "Stamp"
-#~ msgstr "Segell"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certificats DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "S'utilitza per determinar si cal migrar els paràmetres a una versió nova."
+#: src/utils/utils.c:547
+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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Inhabilita la creació de connexions sense fil"
+msgid "Wi-Fi _security"
+msgstr "Seguretat de la _xarxa sense fil:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar la creació de xarxes ad hoc "
-#~ "en utilitzar la miniaplicació."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "Nom de _xarxa:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Mostra la miniaplicació a l'àrea de notificació"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Co_nnexió:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Establiu-lo a «FALSE» (fals) per no mostrar la miniaplicació a l'àrea de "
-#~ "notificació"
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptador sense fil:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignora el certificat de CA"
+#~ msgid "Manage your network connections"
+#~ msgstr "Gestioneu les connexions de xarxa"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els "
-#~ "certificats de CA en l'autenticació EAP."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Connexions de xarxa actives"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els "
-#~ "certificats de CA en la segona fase de l'autenticació EAP."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Gestioneu i modifiqueu els paràmetres de connexió de xarxa"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/crh.po b/po/crh.po
index 37f4720b..6a0d0954 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: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\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,6 +21,106 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-04-23 03:00+0000\n"
 "X-Generator: Launchpad (build 15120)\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Bağlanuv bildirimlerini ğayrı qabilleştir"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Bir şebekege bağlanğanda bildirimlerni ğayriqabilleştirmek içün bunı \"doğru"
+"\"ğa tesbit etiñiz."
+
+# tüklü
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Bağlantı qoparılğan bildirimlerini ğayrıqabilleştir"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Bir şebekege bağlantını qoparğanda bildirimlerni ğayrıqabilleştirmek içün "
+"bunı \"doğru\"ğa tesbit etiñiz."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "VPN bildirimlerini ğayrıqabilleştir"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Bir VPN'ge bağlanğanda yaki bağlantısını qoparğanda bildirimlerni "
+"ğayrıqabilleştirmek içün bunı \"doğru\"ğa tesbit etiñiz."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Şebekeler faydalanılabilir bildirimlerini bastırıqla"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Telsiz-Vefa şebekeler faydalanışlı olğanda bildirimlerni ğayrıqabilleştirmek "
+"içün bunı \"doğru\"ğa tesbit etiñiz."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Mühür"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Ayarlarnıñ yañı bir sürümge köçürilmek kerek olıp olmağanını belgilemek içün "
+"qullanılır."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Wi-Fi (Telsiz Vefa) İcat Et Ğayrı Qabilleştirilsin"
+
+# tüklü
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Uyğulamaçıqnı qullanğanda tek-vaziyetli (adhoc) şebekelerniñ icadını "
+"ğayrıqabilleştirmek içün \"doğru\"ğa tesbit etiñiz."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Uyğulamaçıqnı tebliğ mıntıqasında köster"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Uyğulamaçıqnıñ tebliğ mıntıqasında kösterilmesini naqabilleştirmek içün "
+"\"FALSE\" (yañlış) olaraq tesbit etiñiz."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Bir şebekege bağlanğanda bildirimlerni ğayriqabilleştirmek içün bunı \"doğru"
+"\"ğa tesbit etiñiz."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Bir şebekege bağlanğanda bildirimlerni ğayriqabilleştirmek içün bunı \"doğru"
+"\"ğa tesbit etiñiz."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -67,44 +167,77 @@ msgstr "Sır-söz:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(hiçbiri)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA Şehadetnamesi:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Bilinmiyor"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Bir dosya seçin"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Bir dosya seçin"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "CA Sertifikası Seç"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Hususiy _anahtar:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_Hususiy anahtar sır-sözü:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "CA Sertifikası Seç"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_Qullanıcı şehadetnamesi:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Sır-sözni _köster"
 
@@ -116,36 +249,36 @@ msgstr "Ögbelgileme"
 msgid "My country is not listed"
 msgstr "Ülkem listelenmegendir"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Listelenmegen"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Planım listelenmegendir..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Teminatçı"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Kurulu GSM aygıtı"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Kurulu CDMA aygıtı"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Her hangi cihaz"
 
@@ -281,54 +414,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Mobil Keniş-bant Ayarlarıñıznı Tasdiqlañız"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(hiçbiri)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "CA Şehadetnamesi:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Bilinmiyor"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-#, fuzzy
-msgid "Select"
-msgstr "Bir dosya seçin"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-#, fuzzy
-msgid "Select from file…"
-msgstr "Bir dosya seçin"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "CA Sertifikası Seç"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Qullanıcı şehadetnamesi:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Sır-sözlerni _köster"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -351,13 +436,27 @@ msgstr "İsim"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "CA Sertifikası Seç"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Qullanıcı şehadetnamesi:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Sır-sözlerni _köster"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -408,59 +507,59 @@ msgstr "_Ekilemci Sır-söz:"
 msgid "_Password:"
 msgstr "_Parola:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Bağlantını qopar"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Yoq"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Anahtarı (Onaltışarlama ya da ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Sır-ibaresi"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamik WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Kişisel"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Kurum"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Kişisel"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "İcat _Et"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Bağlan"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -468,35 +567,35 @@ msgstr ""
 "'%s' Telsiz-Vefa şebekesine irişim içün sır-sözler ya da şifreleme "
 "anahtarları şarttır."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Telsiz-Vefa Şebeke Sahihlenimi Şart"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Telsiz-Vefa şebeke sahihlenimni talap ete"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Yañı Telsiz-Vefa Şebeke İcat Et"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Yañı Telsiz-Vefa şebeke"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Gizli Telsiz-Vefa Şebekege Bağlan"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Gizli Telsiz-Vefa şebeke"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -504,457 +603,373 @@ msgstr ""
 "Bağlanmağa istegeniñiz gizli Telsiz-Vefa şebekesiniñ ismini ve emniyet "
 "tafsilâtını kirsetiñiz."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Telsiz-Vefa _emniyeti:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "Şebeke _adı:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "_Bağlantı:"
-
-# tüklü
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Telsiz-Vefa _uyarlayıcısı:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s bağlantısı"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER veya PEM sertifikaları (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Bir PAC dosyesini saylañız..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC dosyeleri (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Dosyelerniñ hepsi"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "İsimsiz"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Sahihlengen"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Ekisi de"
 
 # tüklü
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "_Anonim kimlik:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC _dosyesi:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_İç sahihlenme:"
 
 # tüklü
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Avtomatik PAC _tedarikine izin ber"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Qullanıcı adı:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Parola:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Sürüm 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Sürüm 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP _sürümi:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Hususiy Anahtar Sır-sözü:"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Sır-sözlerni _köster"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "_Kimlik:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tünnelli TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Himayeli EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_Sahihlenim:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "_Hususiy anahtar sır-sözü:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Tür:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Açıq Sistem"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Üleşilgen Anahtar"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Ögbelgilengen)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Anahtar:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Anahtarnı _köster"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP _indeksi:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Şebeke bağlantılarıñıznı idare etiñiz"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Yeni Yapılandırma Oluşturuldu"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Şebeke bağlantısı tesbitleriñizni idare etiñiz ve değiştiriñiz"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Bağlanuv bildirimlerini ğayrı qabilleştir"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Bir şebekege bağlanğanda bildirimlerni ğayriqabilleştirmek içün bunı "
-#~ "\"doğru\"ğa tesbit etiñiz."
-
-# tüklü
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Bağlantı qoparılğan bildirimlerini ğayrıqabilleştir"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Bir şebekege bağlantını qoparğanda bildirimlerni ğayrıqabilleştirmek içün "
-#~ "bunı \"doğru\"ğa tesbit etiñiz."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "VPN bildirimlerini ğayrıqabilleştir"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Bir VPN'ge bağlanğanda yaki bağlantısını qoparğanda bildirimlerni "
-#~ "ğayrıqabilleştirmek içün bunı \"doğru\"ğa tesbit etiñiz."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s bağlantısı"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Şebekeler faydalanılabilir bildirimlerini bastırıqla"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER veya PEM sertifikaları (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Telsiz-Vefa şebekeler faydalanışlı olğanda bildirimlerni "
-#~ "ğayrıqabilleştirmek içün bunı \"doğru\"ğa tesbit etiñiz."
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+"DER, PEM, yaki PKCS#12 hususiy anahtarları (*.der, *.pem, *.p12, *.key)"
 
-#~ msgid "Stamp"
-#~ msgstr "Mühür"
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Telsiz-Vefa _emniyeti:"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Ayarlarnıñ yañı bir sürümge köçürilmek kerek olıp olmağanını belgilemek "
-#~ "içün qullanılır."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "Şebeke _adı:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wi-Fi (Telsiz Vefa) İcat Et Ğayrı Qabilleştirilsin"
+msgid "C_onnection"
+msgstr "_Bağlantı:"
 
 # tüklü
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Uyğulamaçıqnı qullanğanda tek-vaziyetli (adhoc) şebekelerniñ icadını "
-#~ "ğayrıqabilleştirmek içün \"doğru\"ğa tesbit etiñiz."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Telsiz-Vefa _uyarlayıcısı:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Uyğulamaçıqnı tebliğ mıntıqasında köster"
+#~ msgid "Manage your network connections"
+#~ msgstr "Şebeke bağlantılarıñıznı idare etiñiz"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Uyğulamaçıqnıñ tebliğ mıntıqasında kösterilmesini naqabilleştirmek içün "
-#~ "\"FALSE\" (yañlış) olaraq tesbit etiñiz."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Yeni Yapılandırma Oluşturuldu"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Şebeke bağlantısı tesbitleriñizni idare etiñiz ve değiştiriñiz"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/cs.po b/po/cs.po
index 5e949523..f123bfb2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-07-16 12:43+0200\n"
 "Last-Translator: Zdeněk Hataš <zdenek hatas gmail com>\n"
 "Language-Team: čeština <gnome-cs-list gnome org>\n"
@@ -26,6 +26,89 @@ msgstr ""
 "X-Generator: Poedit 2.0.6\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Zakázat upozornění na připojení"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "Nastavením na zapnuto zakážete upozornění na připojení k síti."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Zakázat upozornění na odpojení"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "Nastavením na zapnuto zakážete upozornění na odpojení ze sítě."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Zakázat upozornění na VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Nastavením na zapnuto zakážete upozornění na připojení či odpojení z VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Potlačit upozornění na dostupné sítě"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "Nastavením na zapnuto zakážete upozornění na dostupnost sítí Wi-Fi."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Údaj"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Účelem je zjištění, zda by měla být nastavení přenesena na novou verzi."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Zakázat vytváření WiFi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Když je používán applet, nastavením na zapnuto zakážete vytváření adhoc sítí."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Zobrazovat applet v oznamovací oblasti"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "Nastavení na VYPNUTO zablokuje zobrazení apletu v oznamovací oblasti."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignorovat certifikát CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Nastavením na zapnuto zakážete upozornění na certifikáty CA v ověření EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Nastavením na zapnuto zakážete upozornění na certifikáty CA v druhé fázi "
+"ověření EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -72,43 +155,72 @@ msgstr "Heslo"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr "Naskenujte svým telefonem nebo <a href=\"nma:print\">vytiskněte</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(žádný)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Klíč v %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certifikát v %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(neznámý)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Vybrat"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Vybrat ze souboru…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Není nastavený žádný certifikát"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Není nastavený žádný klíč"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Vyberte klíč pro certifikát %s"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "Soukromý _klíč %s"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "_Heslo klíče %s"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Vyberte certifikát %s"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "_Certifikát %s"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Zobrazit heslo"
 
@@ -120,35 +232,35 @@ msgstr "Výchozí"
 msgid "My country is not listed"
 msgstr "Moje země není v seznamu"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Není v seznamu"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Můj plán není v seznamu…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Poskytovatel"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Nainstalované zařízení GSM"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Nainstalované zařízení CDMA"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Jakékoli zařízení"
 
@@ -274,50 +386,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Potvrdit volby širokopásmového připojení"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(žádný)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Klíč v %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Certifikát v %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(neznámý)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Vybrat"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Vybrat ze souboru…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Vybrat certifikát %s"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "_Heslo certifikátu %s"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Zo_brazit hesla"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Záznam chyb v: "
@@ -338,13 +406,27 @@ msgstr "Název"
 msgid "Issued By"
 msgstr "Vydal"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Vybrat certifikát %s"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Heslo certifikátu %s"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Zo_brazit hesla"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Zadejte PIN %s"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Storno"
 
@@ -392,92 +474,92 @@ msgstr "_Sekundární heslo:"
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Kliknutím se připojíte"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Nový…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Žádná"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Klíč WEP 40/128 bitů (Hex nebo ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Heslo WEP 128 bitů"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamické WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Vytvořit"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "Přip_ojit"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, 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/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "K síti Wi-Fi je vyžadováno ověření"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Síť Wi-Fi vyžadovuje ověření"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Vytvořit novou síť Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nová síť Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Připojit se ke skryté síti Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Skrytá síť Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -485,301 +567,255 @@ msgstr ""
 "Zadejte název a podrobnosti o zabezpečení skryté sítě Wi-Fi, ke které se "
 "chcete připojit."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Zabezpečení _Wi-Fi"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Název sítě"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "Přip_ojení"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "_Adaptér Wi-Fi"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Připojení %s"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certifikáty PEM (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-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:351
-msgid "no CA certificate selected"
-msgstr "není vybrán žádný certifikát CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "vybraný soubor s certifikátem CA neexistuje"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "chybějící PAC soubor EAP-FAST"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Vyberte soubor PAC"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Soubory PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonymní"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Ověřeno"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Oba"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Anony_mní identita"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "_Soubor PAC"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "V_nitřní ověření"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Po_volit automatické nastavení PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "chybějící uživatelské jméno pro EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "chybějící heslo pro EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "_Uživatelské jméno"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Heslo"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Verze 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Verze 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Žádný ce_rtifikát CA není požadován"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "Verze _PEAP"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Přípona názvu serverového certifikátu."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Doména"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "chybějící uživatelské jméno pro EAP"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "chybějící heslo pro EAP"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "chybějící heslo soukromého klíče klienta EAP"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "Heslo souk_romého klíče"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "Z_obrazit heslo"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "chybějící identita EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "není vybrán žádný uživatelský certifikát"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "vybraný soubor s uživatelským certifikátem neexistuje"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "není vybrán žádný klíč"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "vybraný soubor s klíčem neexistuje"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "I_dentita"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Neznámá chyba při ověřování bezpečnosti 802.1X"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "neurčená chyba v zabezpečení 802.1X (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "není vybrán žádný certifikát CA"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "vybraný soubor s certifikátem CA neexistuje"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Nastaveno externě"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "Ověře_ní"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "chybí leap-username"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "chybí leap-password"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "chybějící heslo pro EAP"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Typ"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "chybí wep-key"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "neplatný wep-key: klíč délky %zu musí obsahovat jen šestnáctkové číslice"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "neplatný wep-key: klíč délky %zu musí obsahovat pouze znaky ASCII"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -788,39 +824,39 @@ msgstr ""
 "neplatný wep-key: nesprávná délka klíče %zu. Musí být dlouhý buď 5 nebo 13 "
 "znaků ASCII, a nebo 10 nebo 16 šestnáctkových číslic"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "neplatný wep-key: heslo nesmí být prázdné"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "neplatný wep-key: heslo musí být kratší než 64 znaků"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Otevřený systém"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Sdílený klíč"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (výchozí)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Klíč"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Z_obrazit klíč"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "Inde_x WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -829,11 +865,45 @@ 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 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ý"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Neznámá chyba při ověřování bezpečnosti 802.1X"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Připojení %s"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certifikáty PEM (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+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/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Zabezpečení _Wi-Fi"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Název sítě"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "Přip_ojení"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptér Wi-Fi"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Spravujte svá síťová připojení"
 
@@ -849,79 +919,6 @@ msgstr ""
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Zakázat upozornění na připojení"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "Nastavením na zapnuto zakážete upozornění na připojení k síti."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Zakázat upozornění na odpojení"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr "Nastavením na zapnuto zakážete upozornění na odpojení ze sítě."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Zakázat upozornění na VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Nastavením na zapnuto zakážete upozornění na připojení či odpojení z VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Potlačit upozornění na dostupné sítě"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "Nastavením na zapnuto zakážete upozornění na dostupnost sítí Wi-Fi."
-
-#~ msgid "Stamp"
-#~ msgstr "Údaj"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Účelem je zjištění, zda by měla být nastavení přenesena na novou verzi."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Zakázat vytváření WiFi"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Když je používán applet, nastavením na zapnuto zakážete vytváření adhoc "
-#~ "sítí."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Zobrazovat applet v oznamovací oblasti"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Nastavení na VYPNUTO zablokuje zobrazení apletu v oznamovací oblasti."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignorovat certifikát CA"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Nastavením na zapnuto zakážete upozornění na certifikáty CA v ověření EAP."
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Nastavením na zapnuto zakážete upozornění na certifikáty CA v druhé fázi "
-#~ "ověření EAP."
-
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
 
diff --git a/po/da.po b/po/da.po
index d47c5b13..df2dd050 100644
--- a/po/da.po
+++ b/po/da.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-08-19 19:29+0200\n"
 "Last-Translator: scootergrisen\n"
 "Language-Team: Danish <dansk dansk-gruppen dk>\n"
@@ -30,6 +30,105 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Deaktivér påmindelse ved etableret forbindelse"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Sæt denne til sand for at deaktivere påmindelser ved oprettelse af "
+"forbindelse til et netværk."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Deaktivér påmindelse ved afbrudt forbindelse"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Sæt denne til sand for at deaktivere påmindelser ved afbrydelse af "
+"forbindelse til et netværk."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Deaktivér VPN-påmindelser"
+
+# Skal "true" oversættes? Senere oversættes "false" ikke.
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Sæt denne til sand for at deaktivere påmindelser, når der forbindes til et "
+"VPN, eller når forbindelsen afbrydes."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Tilbagehold påmindelser om tilgængelige netværk"
+
+# Skal "true" oversættes? Senere oversættes "false" ikke.
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Sæt denne til sand for at deaktivere påmindelser, når der er tilgængelige wi-"
+"fi-netværk."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Stempel"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Bliver brugt til at bestemme, hvorvidt indstillinger skal genbruges til en "
+"ny version."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Deaktivér oprettelse af WiFi"
+
+# Skal "true" oversættes? Senere oversættes "false" ikke.
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Sæt denne til sand for at deaktivere oprettelse af adhoc-netværk, når "
+"panelprogrammet bruges."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Vis panelprogrammet i statusfeltet"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Sæt til FALSE for at deaktivere visning af panelprogrammet i statusfeltet."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignorér CA-certifikat"
+
+# Skal "true" oversættes? Senere oversættes "false" ikke.
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Sæt denne til sand for at deaktivere advarsler om CA-certifikater i EAP-"
+"godkendelsen."
+
+# Skal "true" oversættes? Senere oversættes "false" ikke.
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Sæt denne til sand for at deaktivere advarsler om CA-certifikater i fase 2 "
+"af EAP-godkendelsen."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -81,43 +180,72 @@ msgstr "Adgangskode"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr "Skan med din telefon eller <a href=\"nma:print\">udskriv</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Ingen)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Nøgle i %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certifikat i %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Ukendt)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Vælg"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Annullér"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Vælg fra fil …"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Intet certifikat angivet"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Ingen nøgle angivet"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Vælg en nøgle til %s-certifikat"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "Privat %s-nøg_le"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "Adgangskode til %s-nøgle"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Vælg %s-certifikat"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "%s-_certifikat"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Vis adgangskode"
 
@@ -129,35 +257,35 @@ msgstr "Standard"
 msgid "My country is not listed"
 msgstr "Mit land er ikke på listen"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Ikke på listen"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Mit abonnement er ikke på listen …"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Udbyder"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Installeret GSM-enhed"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Installeret CDMA-enhed"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Enhver enhed"
 
@@ -290,50 +418,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Bekræft indstillinger for mobilt bredbånd"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Ingen)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Nøgle i %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Certifikat i %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Ukendt)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Vælg"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Annullér"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Vælg fra fil …"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Vælg et %s-certifikat"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "Adgangs_kode til %s-certifikat"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Vis adgangskoder"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Fejl i forsøget på at logge ind: "
@@ -354,13 +438,27 @@ msgstr "Navn"
 msgid "Issued By"
 msgstr "Udstedt af"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Vælg et %s-certifikat"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "Adgangs_kode til %s-certifikat"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Vis adgangskoder"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Indtast %s-PIN"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Annullér"
 
@@ -408,57 +506,57 @@ msgstr "_Sekundær adgangskode:"
 msgid "_Password:"
 msgstr "A_dgangskode:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Klik for at forbinde"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Ny …"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ingen"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-nøgle (Hex eller ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit adgangsfrase"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisk WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA og WPA2 personlig"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA og WPA2 personlig"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "O_pret"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "F_orbind"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -466,35 +564,35 @@ msgstr ""
 "Der kræves adgangskoder eller krypteringsnøgler for at få adgang til wi-fi-"
 "netværket “%s”."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Godkendelse til wi-fi-netværket påkrævet"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Der kræves godkendelse til wi-fi-netværket"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Opret nyt wi-fi-netværk"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nyt wi-fi-netværk"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Indtast et navn på det wi-fi-netværk, du ønsker at oprette."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Forbind til skjult wi-fi-netværk"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Skjult wi-fi-netværk"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -502,302 +600,256 @@ msgstr ""
 "Indtast navn og sikkerhedsoplysninger på det wi-fi-netværk, du ønsker at "
 "forbinde til."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Wi-fi-_sikkerhed"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Netværksnavn"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "Forbi_ndelse"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "Wi-fi-ada_pter"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Forbindelse til %s"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM-certifikater (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "udefineret fejl i 802.1X-sikkerhed (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "intet CA-certifikat valgt"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "valgte CA-certifikatfil findes ikke"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "manglende EAP-FAST-PAC-fil"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Vælg en PAC-fil"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Alle filer"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Godkendt"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Begge"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Anony_m identitet"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "PAC-_fil"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "_Indre godkendelse"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillad automatisk PAC-pro_vision"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "manglende EAP-LEAP-brugernavn"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "manglende EAP-LEAP-adgangskode"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "Br_ugernavn"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "A_dgangskode"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Version 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Version 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA-certifikat ikke _påkrævet"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "PEAP-_version"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Endelse på servercertifikatets navn."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Domæne"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "manglende EAP-brugernavn"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "manglende EAP-adgangskode"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "manglende adgangsfrase til EAP-klientens private nøgle"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "A_dgangsfrase til privat nøgle"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "_Vis adgangsfrase"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "manglende EAP-TLS-identitet"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "intet brugercertifikat valgt"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "valgte brugercertifikatfil findes ikke"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "ingen nøgle valgt"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "valgte nøglefil findes ikke"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "I_dentitet"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (ingen EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Ukendt fejl ved validering af 802.1X-sikkerheden"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "udefineret fejl i 802.1X-sikkerhed (wpa-eap)"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "intet CA-certifikat valgt"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "valgte CA-certifikatfil findes ikke"
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "TLS gennem tunnel"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Beskyttet EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Konfigureret eksternt"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "_Godkendelse"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "manglende leap-brugernavn"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "manglende leap-adgangskode"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "manglende EAP-adgangskode"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Type"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "manglende wep-nøgle"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "ugyldig wep-nøgle: nøgle med en længde på %zu kan kun indeholde hexadecimal"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 "ugyldig wep-nøgle: nøgle med en længde på %zu kan kun indeholde ascii-tegn"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -806,39 +858,39 @@ msgstr ""
 "ugyldig wep-nøgle: forkert længde %zu på nøgle. En nøgle skal være enten af "
 "længde 5/13 (ascii) eller 10/26 (hexadecimal)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "ugyldig wep-nøgle: adgangsfrase kan ikke være tom"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "ugyldig wep-nøgle: adgangsfrasen skal være kortere end 64 tegn"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Åbent system"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Delt nøgle"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Standard)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Nøgle"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Vis nøg_le"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP-inde_ks"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -847,10 +899,44 @@ msgstr ""
 "ugyldig wpa-psk: ugyldig længde %zu på nøgle. Skal være [8,63] byte eller 64 "
 "hexadecimale cifre"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "ugyldig wpa-psk: kan ikke fortolke nøgle med 64 byte som hexadecimal"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Ukendt fejl ved validering af 802.1X-sikkerheden"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Forbindelse til %s"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM-certifikater (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+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/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Wi-fi-_sikkerhed"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Netværksnavn"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "Forbi_ndelse"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Wi-fi-ada_pter"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Håndtér dine netværksforbindelser"
 
@@ -866,93 +952,6 @@ msgstr "ugyldig wpa-psk: kan ikke fortolke nøgle med 64 byte som hexadecimal"
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Deaktivér påmindelse ved etableret forbindelse"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Sæt denne til sand for at deaktivere påmindelser ved oprettelse af "
-#~ "forbindelse til et netværk."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Deaktivér påmindelse ved afbrudt forbindelse"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Sæt denne til sand for at deaktivere påmindelser ved afbrydelse af "
-#~ "forbindelse til et netværk."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Deaktivér VPN-påmindelser"
-
-# Skal "true" oversættes? Senere oversættes "false" ikke.
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Sæt denne til sand for at deaktivere påmindelser, når der forbindes til "
-#~ "et VPN, eller når forbindelsen afbrydes."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Tilbagehold påmindelser om tilgængelige netværk"
-
-# Skal "true" oversættes? Senere oversættes "false" ikke.
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Sæt denne til sand for at deaktivere påmindelser, når der er tilgængelige "
-#~ "wi-fi-netværk."
-
-#~ msgid "Stamp"
-#~ msgstr "Stempel"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Bliver brugt til at bestemme, hvorvidt indstillinger skal genbruges til "
-#~ "en ny version."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Deaktivér oprettelse af WiFi"
-
-# Skal "true" oversættes? Senere oversættes "false" ikke.
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Sæt denne til sand for at deaktivere oprettelse af adhoc-netværk, når "
-#~ "panelprogrammet bruges."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Vis panelprogrammet i statusfeltet"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Sæt til FALSE for at deaktivere visning af panelprogrammet i statusfeltet."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignorér CA-certifikat"
-
-# Skal "true" oversættes? Senere oversættes "false" ikke.
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Sæt denne til sand for at deaktivere advarsler om CA-certifikater i EAP-"
-#~ "godkendelsen."
-
-# Skal "true" oversættes? Senere oversættes "false" ikke.
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Sæt denne til sand for at deaktivere advarsler om CA-certifikater i fase "
-#~ "2 af EAP-godkendelsen."
-
 #~ msgid "NetworkManager"
 #~ msgstr "Netværkshåndtering"
 
diff --git a/po/de.po b/po/de.po
index 91239fd4..ab332fc7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2018-08-25 23:06+0200\n"
 "Last-Translator: Mario Blättermann <mario blaettermann gmail com>\n"
 "Language-Team: Deutsch <gnome-de gnome org>\n"
@@ -34,6 +34,102 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.1.1\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Benachrichtigungen über neue Verbindung abschalten"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Legt fest, ob Benachrichtigungen über Verbindungen mit einem Netzwerk "
+"abgeschaltet werden."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Benachrichtigungen über Verbindungstrennung abschalten"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Legt fest, ob Benachrichtigungen über die Verbindungstrennung von einem "
+"Netzwerk abgeschaltet werden."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "VPN-Benachrichtigungen abschalten"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Legt fest, ob Benachrichtigungen über die Verbindungstrennung von einem VPN-"
+"Netzwerk abgeschaltet werden."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Benachrichtigung über neue Funknetzwerke unterdrücken"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Legt fest, ob Benachrichtigungen über neue Funknetzwerke abgeschaltet werden."
+
+# ?
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Einstellungen übernehmen"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Legt fest, ob die Einstellungen in eine neue Version übernommen werden "
+"sollen."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Das Erstellen von Wi-Fi-Netzen ausschalten"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Legt fest, ob die Erstellung von Adhoc-Netzwerken mit dem Applet "
+"abgeschaltet ist."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Applet im Benachrichtigungsbereich anzeigen"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Wählen Sie FALSCH, um die Anzeige des Applets im Benachrichtigungsbereich zu "
+"deaktivieren."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA-Zertifikat ignorieren"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Legt fest, ob Warnungen zu CA-Zertifikaten in der EAP-Authentifizierung "
+"abgeschaltet werden."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Legt fest, ob Warnungen zu CA-Zertifikaten in Phase 2 der EAP-"
+"Authentifizierung abgeschaltet werden."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -87,43 +183,72 @@ msgstr "Passwort:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(keine)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Schlüssel in %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Zertifikat in %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Unbekannt)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Auswählen"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Aus _Datei auswählen …"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Kein Zertifikat festgelegt"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Kein Schlüssel gesetzt"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Wählen Sie einen Schlüssel für das %s-Zertifikat"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "Geheimer %s-_Schlüssel"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "_Passwort des %s-Schlüssels"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Wählen Sie das %s-Zertifikat"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "%s-_Zertifikat"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Passwort _anzeigen"
 
@@ -135,35 +260,35 @@ msgstr "Vorgabe"
 msgid "My country is not listed"
 msgstr "Mein Land ist nicht aufgelistet"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Nicht aufgelistet"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Mein Abrechnungsmodus ist nicht aufgelistet …"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Dienstanbieter"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Installiertes GSM-Gerät"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Installiertes CDMA-Gerät"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Irgendein Gerät"
 
@@ -300,50 +425,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Mobile Breitbandeinstellungen bestätigen"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(keine)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Schlüssel in %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Zertifikat in %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Unbekannt)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Auswählen"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Aus _Datei auswählen …"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Wählen Sie ein %s-Zertifikat"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "_Passwort des %s-Zertifikats"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Pass_wörter anzeigen"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Fehler beim Anmelden: "
@@ -364,13 +445,27 @@ msgstr "Name"
 msgid "Issued By"
 msgstr "Ausgestellt von"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Wählen Sie ein %s-Zertifikat"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Passwort des %s-Zertifikats"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Pass_wörter anzeigen"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Geben Sie die PIN %s ein"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
@@ -418,57 +513,57 @@ msgstr "_Sekundäres Passwort:"
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Klicken Sie zum Verbinden"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Neu …"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Keine"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-Schlüssel (Hexadezimal oder ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit-Passphrase"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisches WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "E_rzeugen"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -476,36 +571,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/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Legitimierung für Funknetzwerk wird benötigt"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Legitimierung für Funknetzwerk wird benötigt"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Neues Funknetzwerk erstellen"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Neues Funknetzwerk"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Mit einem verborgenen Funknetzwerk verbinden"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Verborgenes Funknetzwerk"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -513,298 +608,252 @@ msgstr ""
 "Bitte geben Sie den Namen und die Sicherheitseinstellungen des verborgenen "
 "Funknetzwerks ein, mit dem Sie sich verbinden möchten."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "_Sicherheit des Funknetzwerks"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Netzwerkname"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "_Verbindung"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "WLAN-_Adapter"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Verbindung mit %s"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM-Zertifikate (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-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:351
-msgid "no CA certificate selected"
-msgstr "Kein CA-Zertifikat gewählt"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "Die gewählte Datei mit dem CA-Zertifikat ist nicht vorhanden"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC-Datei fehlt"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "PAC-Datei wählen"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-Dateien (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Legitimiert"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Beide"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Anony_me Identität"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "_PAC-Datei"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "I_nnere Legitimierung"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Automatische PAC-Bereitstellung erlauben"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP-Benutzername fehlt"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP-Passwort fehlt"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "_Benutzername"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Passwort"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Version 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Version 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA-Zertifikat igno_rieren"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "_PEAP-Version"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Suffix des Namens des Serverzertifikats."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Domäne"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "EAP-Benutzername fehlt"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "EAP-Passwort fehlt"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit-Passphrase"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Passwörter _zeigen"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS-Identität fehlt"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "Kein Benutzerzertifikat gewählt"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "Die gewählte Datei mit dem Benutzerzertifikat ist nicht vorhanden"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "kein Schlüssel ausgewählt"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "Die gewählte Schlüsseldatei ist nicht vorhanden"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "_Identität"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (kein EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Unbekannter Fehler beim Überprüfen der 802.1X-Sicherheit"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "Nicht definierter Fehler in der 802.1X-Sicherheit (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "Kein CA-Zertifikat gewählt"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "Die gewählte Datei mit dem CA-Zertifikat ist nicht vorhanden"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Getunneltes TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Geschütztes EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "_Legitimierung"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "LEAP-Benutzername fehlt"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "LEAP-Passwort fehlt"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "EAP-Passwort fehlt"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Typ"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "WEP-Schlüssel fehlt"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "Ungültiger WEP-Schlüssel: Schlüssel der Länge %zu darf nur hexadezimale "
 "Stellen enthalten"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -812,7 +861,7 @@ msgstr ""
 "Ungültiger WEP-Schlüssel: Schlüssel der Länge %zu darf nur ASCII-Zeichen "
 "enthalten"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -821,39 +870,39 @@ msgstr ""
 "Ungültiger WEP-Schlüssel: Falsche Schlüssellänge %zu. Ein Schlüssel muss "
 "entweder die Länge 5/13 (ASCII) oder 10/26 (hexadezimal) haben"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "Ungültiger WEP-Schlüssel: Passphrase darf nicht leer sein"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "Ungültiger WEP-Schlüssel: Passphrase muss kürzer als 64 Zeichen sein"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Offenes System"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Gemeinsamer Schlüssel"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Vorgabe)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Schlüssel"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Schlüssel an_zeigen"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP-Inde_x"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -862,106 +911,55 @@ 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "Ungültiger WPA-PSK: Schlüssel kann nicht als 64-Byte-hexadezimal "
 "interpretiert werden"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Verwaltung der Netzwerkverbindungen"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Rohkonfiguration"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Einstellungen für Verbindungen mit Netzwerken verwalten"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Benachrichtigungen über neue Verbindung abschalten"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Legt fest, ob Benachrichtigungen über Verbindungen mit einem Netzwerk "
-#~ "abgeschaltet werden."
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Unbekannter Fehler beim Überprüfen der 802.1X-Sicherheit"
 
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Benachrichtigungen über Verbindungstrennung abschalten"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Verbindung mit %s"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Legt fest, ob Benachrichtigungen über die Verbindungstrennung von einem "
-#~ "Netzwerk abgeschaltet werden."
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM-Zertifikate (*.pem, *.crt, *.cer)"
 
-#~ msgid "Disable VPN notifications"
-#~ msgstr "VPN-Benachrichtigungen abschalten"
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER-, PEM-, oder PKCS#12-Privatschlüssel (*.der, *.pem, *.p12, *.key)"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Legt fest, ob Benachrichtigungen über die Verbindungstrennung von einem "
-#~ "VPN-Netzwerk abgeschaltet werden."
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "_Sicherheit des Funknetzwerks"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Benachrichtigung über neue Funknetzwerke unterdrücken"
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Netzwerkname"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Legt fest, ob Benachrichtigungen über neue Funknetzwerke abgeschaltet "
-#~ "werden."
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "_Verbindung"
 
-# ?
-#~ msgid "Stamp"
-#~ msgstr "Einstellungen übernehmen"
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "WLAN-_Adapter"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Legt fest, ob die Einstellungen in eine neue Version übernommen werden "
-#~ "sollen."
+#~ msgid "Manage your network connections"
+#~ msgstr "Verwaltung der Netzwerkverbindungen"
 
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Das Erstellen von Wi-Fi-Netzen ausschalten"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Legt fest, ob die Erstellung von Adhoc-Netzwerken mit dem Applet "
-#~ "abgeschaltet ist."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Applet im Benachrichtigungsbereich anzeigen"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Wählen Sie FALSCH, um die Anzeige des Applets im Benachrichtigungsbereich "
-#~ "zu deaktivieren."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA-Zertifikat ignorieren"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Legt fest, ob Warnungen zu CA-Zertifikaten in der EAP-Authentifizierung "
-#~ "abgeschaltet werden."
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Rohkonfiguration"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Legt fest, ob Warnungen zu CA-Zertifikaten in Phase 2 der EAP-"
-#~ "Authentifizierung abgeschaltet werden."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Einstellungen für Verbindungen mit Netzwerken verwalten"
 
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
diff --git a/po/dz.po b/po/dz.po
index 7956ef28..a894d2d1 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.network-manager-applet-0-6.pot\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2007-03-16 09:28+0530\n"
 "Last-Translator: sonam pelden <sonaa_peldn yahoo com>\n"
 "Language-Team: Dzongkha <pgeyleg dit gov bt>\n"
@@ -20,6 +20,85 @@ msgstr ""
 "X-Poedit-Country: Bhutan\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+#, fuzzy
+msgid "Disable disconnected notifications"
+msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ་"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -67,44 +146,74 @@ msgstr "ཆོག་ཡིག:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "ཅི་མེད་"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཡིག་སྣོད:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཆོག་ཡིག:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 #, fuzzy
 msgid "Sho_w password"
 msgstr "ཆོག་ཡིག་སྟོན་"
@@ -118,35 +227,35 @@ msgstr "སྔོན་སྒྲིག་འགྲུལ་ལམ:"
 msgid "My country is not listed"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr ""
 
@@ -262,35 +371,25 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "ཅི་མེད་"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
+#: src/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr ""
+#: src/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་སྟོན་འབདཝ་ད་འཛོལ་བ:"
 
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:116
+msgid "Name"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
 msgstr ""
 
 #: src/nma-pkcs11-cert-chooser.c:381
@@ -308,34 +407,13 @@ msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 msgid "Sho_w passwords"
 msgstr "ཆོག་ཡིག་ཚུ་སྟོན་"
 
-#: src/nma-pkcs11-cert-chooser-dialog.c:241
-msgid "Error logging in: "
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.c:263
-#, fuzzy
-msgid "Error opening a session: "
-msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་སྟོན་འབདཝ་ད་འཛོལ་བ:"
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:20
-msgid "_Unlock token"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:116
-msgid "Name"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:126
-msgid "Issued By"
-msgstr ""
-
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -387,101 +465,101 @@ msgstr "གལ་གནད་ཆུང་བ་ཌི་ཨེན་ཨེསི
 msgid "_Password:"
 msgstr "ཆོག་ཡིག:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ཅི་མེད་"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 64/128-བིཊི་ ASCII"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-བིཊི་ཆོག་ཚིག་"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ནུས་ཅན་ཌབ་ལུ་ཨི་པི་"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 #, fuzzy
 msgid "WPA & WPA2 Personal"
 msgstr "WPA2 རང་དོན་"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 #, fuzzy
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA2 ཚོང་ལས་"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "ཌབ་ལུ་པི་ཨེ་རང་དོན་"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "མཐུད། (_o)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ལྡེ་མིག་དགོཔ་"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད་"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ཁྱོད་ཀྱིས་མཐུད་དགོ་མནོ་མི་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱི་མིང་འདི་ཐོ་བཀོད་འབད།"
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲུལ་གཞན་མི་ལུ་མཐུད་"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -489,375 +567,363 @@ msgid ""
 msgstr ""
 "ཁྱོད་རང་བཟོ་དགོ་མནོ་དོ་བཟུམ་སྦེ་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱི་མིང་དང་སྲུང་སྐྱོབ་སྒྲིག་སྟངས་ཚུ་ཐོ་བཀོད་འབད།"
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "མཐུད། (_o)"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "རླུང་འཕྲིན་མཐུན་བྱེད: (_a)"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr ""
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
-
-#: src/wireless-security/eap-method.c:356
-#, fuzzy
-msgid "selected CA certificate file does not exist"
-msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད་"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "ཇི་ཊི་སི་"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 #, fuzzy
 msgid "MSCHAPv2"
 msgstr "MSCHAPV2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "མིང་མེད་པའི་ངོ་རྟགས:"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "བདེན་བཤད:"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "མིང་མེད་པའི་ངོ་རྟགས:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "བདེན་བཤད:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "ལག་ལེན་པའི་མིང་:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "ཆོག་ཡིག:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 #, fuzzy
 msgid "Automatic"
 msgstr "རང་བཞིན་གྱི་ (སྔོན་སྒྲིག་)"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-བིཊི་ཆོག་ཚིག་"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "ཆོག་ཚིག་སྟོན་"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "ངོ་རྟགས:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "པི་ཨེ་པི་"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPV2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 #, fuzzy
 msgid "CHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#: src/nma-ws/nma-eap.c:353
+#, fuzzy
+msgid "selected CA certificate file does not exist"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད་"
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "བདེན་བཤད:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཆོག་ཡིག:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "དབྱེ་བ:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "རིམ་ལུགས་ཁ་ཕྱེ་"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "རུབ་སྤྱོད་འབད་ཡོད་པའི་ལྡེ་མིག་"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 #, fuzzy
 msgid "1 (Default)"
 msgstr "ཅི་མེད་ (སྔོན་སྒྲིག་)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "ལྡེ་མིག:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 #, fuzzy
 msgid "Sho_w key"
 msgstr "ལྡེ་མིག་སྟོན་"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr ""
+
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
+
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
+
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "མཐུད། (_o)"
+
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "རླུང་འཕྲིན་མཐུན་བྱེད: (_a)"
+
 #, fuzzy
 #~ msgid "Manage your network connections"
 #~ msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
@@ -866,10 +932,6 @@ msgstr ""
 #~ msgid "Advanced Network Configuration"
 #~ msgstr "ཝི་པི་ཨེན་རིམ་སྒྲིག་འཛོལ་བ་"
 
-#, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
-
 #, fuzzy
 #~ msgid "NetworkManager"
 #~ msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཊི་"
@@ -894,10 +956,6 @@ msgstr ""
 #~ msgid "Connection failure"
 #~ msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འཐུས་ཤོར་"
 
-#, fuzzy
-#~ msgid "Device disconnect failed"
-#~ msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ་"
-
 #, fuzzy
 #~ msgid "Disconnect failure"
 #~ msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ་"
diff --git a/po/el.po b/po/el.po
index 2d38084b..3a0bdcb3 100644
--- a/po/el.po
+++ b/po/el.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2014-07-21 12:37+0200\n"
 "Last-Translator: Tom Tryfonidis <tomtryf gmail com>\n"
 "Language-Team: team lists gnome gr\n"
@@ -24,6 +24,102 @@ msgstr ""
 "X-Generator: Poedit 1.6.5\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Απενεργοποίηση ειδοποιήσεων σύνδεσης"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Ορίστε το ως αληθές για να απενεργοποιήσετε τις ειδοποιήσεις όποτε συνδέεστε "
+"σε δίκτυο."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Απενεργοποίηση ειδοποιήσεων αποσύνδεσης"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Ορίστε το ως αληθές για να απενεργοποιήσετε τις ειδοποιήσεις όποτε "
+"αποσυνδέεστε από ένα δίκτυο."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Απενεργοποίηση ειδοποιήσεων VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Ορίστε το ως αληθές για να απενεργοποιήσετε τις ειδοποιήσεις όποτε "
+"αποσυνδέεστε από ένα δίκτυο VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Απενεργοποίηση ειδοποιήσεων διαθέσιμων δικτύων"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Ορίστε το ως αληθές για να απενεργοποιήσετε τις ειδοποιήσεις όποτε υπάρχουν "
+"διαθέσιμα δίκτυα Wi-Fi."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Σφραγίδα"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Χρησιμοποιείται για να καθορίζει αν οι ρυθμίσεις πρέπει να μεταφερθούν σε "
+"νέα έκδοση."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Απενεργοποίηση δημιουργίας ασύρματου δικτύου"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Ορίστε το ως αληθές για να απενεργοποιήσετε την δημιουργία adhoc δικτύων "
+"κατά τη χρήση της μικροεφαρμογής."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Εμφάνιση της μικροεφαρμογής στην περιοχή ειδοποιήσεων"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Ορισμός σε ΨΕΥΔΕΣ για απενεργοποίηση εμφάνισης της μικροεφαρμογής στην "
+"περιοχή ειδοποιήσεων."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Παράβλεψη πιστοποιητικού CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Ορίστε το ως αληθές για να απενεργοποιήσετε τις προειδοποιήσεις σχετικά με "
+"τα πιστοποιητικά CA στην πιστοποίηση EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Ορίστε το ως αληθές για να απενεργοποιήσετε τις προειδοποιήσεις σχετικά με "
+"τα πιστοποιητικά CA στην 2η φάσης της EAP πιστοποίησης."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -70,44 +166,77 @@ msgstr "Κωδικός πρόσβασης:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(κανένα)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Πιστοποιητικό C_A:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Άγνωστο"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Επιλέξτε αρχείο"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Επιλέξτε αρχείο"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Επιλέξτε πιστοποιητικό CA"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Ιδιωτικό κ_λειδί:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Κωδικός πρόσβασης _ιδιωτικού κλειδιού:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Επιλέξτε πιστοποιητικό CA"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Πιστοποιητικό _χρήστη:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Εμ_φάνιση κωδικού πρόσβασης"
 
@@ -119,36 +248,36 @@ msgstr "Προεπιλογή"
 msgid "My country is not listed"
 msgstr "Η χώρα μου δεν είναι στη λίστα"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Εκτός λίστας"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Η συνδρομή μου δεν αναφέρεται..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Πάροχος"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Εγκατεστημένη συσκευή GSM"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Εγκατεστημένη συσκευή CDMA"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Οποιαδήποτε συσκευή"
 
@@ -284,54 +413,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Επιβεβαίωση των ρυθμίσεων της κινητής ευρυζωνικής σύνδεσης"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(κανένα)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Πιστοποιητικό C_A:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Άγνωστο"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-#, fuzzy
-msgid "Select"
-msgstr "Επιλέξτε αρχείο"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-#, fuzzy
-msgid "Select from file…"
-msgstr "Επιλέξτε αρχείο"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Επιλέξτε πιστοποιητικό CA"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Πιστοποιητικό _χρήστη:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Εμ_φάνιση κωδικών πρόσβασης"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -354,13 +435,27 @@ msgstr "Όνομα"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Επιλέξτε πιστοποιητικό CA"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Πιστοποιητικό _χρήστη:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Εμ_φάνιση κωδικών πρόσβασης"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -413,59 +508,59 @@ msgstr "_Δευτερεύων κωδικός πρόσβασης:"
 msgid "_Password:"
 msgstr "Κωδικός _πρόσβασης:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Αποσύνδεση"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Κανένα"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Κλειδί WEP 40/128-bit (Hex ή ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Συνθηματική φράση WEP 128-bit"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Δυναμικό WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "Προσωπικό WPA & WPA2"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "Εταιρικό WPA & WPA2"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Προσωπικό WPA & WPA2"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "Δ_ημιουργία"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "Σύν_δεση"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -473,35 +568,35 @@ msgstr ""
 "Απαιτούνται κωδικοί πρόσβασης ή κλειδιά κρυπτογράφησης για πρόσβαση στο "
 "δίκτυο Wi-Fi '%s'."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Απαιτείται πιστοποίηση δικτύου Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Απαιτείται πιστοποίηση από το δίκτυο Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Δημιουργία νέου δικτύου Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Νέο δίκτυο Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Εισάγετε το όνομα του δικτύου Wi-Fi που επιθυμείτε να δημιουργήσετε."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Σύνδεση σε κρυφό δίκτυο Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Κρυφό δίκτυο Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -509,464 +604,368 @@ msgstr ""
 "Εισάγετε το όνομα και τις ρυθμίσεις ασφαλείας του κρυφού δικτύου Wi-Fi στο "
 "οποίο επιθυμείτε να συνδεθείτε."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Ασ_φάλεια δικτύου Wi-Fi:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "Ό_νομα δικτύου:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Σύν_δεση:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "_Προσαρμογέας Wi-Fi:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "σύνδεση %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Πιστοποιητικά DER ή PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Επιλέξτε ένα αρχείο PAC..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Αρχεία PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Ανώνυμος"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Πιστοποιήθηκε"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Και τα δύο"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Α_νώνυμη ταυτότητα:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "Α_ρχείο PAC:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_Εσωτερική πιστοποίηση:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Να επιτρέπεται η αυτόματη _παροχή PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "Όνομα _χρήστη:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "Κωδικός _πρόσβασης:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Αυτόματα"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Έκδοση 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Έκδοση 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "Έκ_δοση PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Συνθηματική φράση WEP 128-bit"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Εμφάνιση συνθηματικής φράσης"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "_Ταυτότητα:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "ΓΡΗΓΟΡΑ"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Διοχετευμένο TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Προστατευμένο EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_Πιστοποίηση:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Κωδικός πρόσβασης _ιδιωτικού κλειδιού:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Τύπος:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Ανοικτό σύστημα"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Κοινόχρηστο κλειδί"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (προεπιλογή)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "Κ_λειδί:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Εμ_φάνιση κλειδιού"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "Δείκτης _WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Διαχείριση των συνδέσεων δικτύου"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "_Χειροκίνητη σύνδεση"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Διαχείριση και αλλαγή ρυθμίσεων των συνδέσεων δικτύου"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Απενεργοποίηση ειδοποιήσεων σύνδεσης"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Ορίστε το ως αληθές για να απενεργοποιήσετε τις ειδοποιήσεις όποτε "
-#~ "συνδέεστε σε δίκτυο."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Απενεργοποίηση ειδοποιήσεων αποσύνδεσης"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Ορίστε το ως αληθές για να απενεργοποιήσετε τις ειδοποιήσεις όποτε "
-#~ "αποσυνδέεστε από ένα δίκτυο."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Απενεργοποίηση ειδοποιήσεων VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Ορίστε το ως αληθές για να απενεργοποιήσετε τις ειδοποιήσεις όποτε "
-#~ "αποσυνδέεστε από ένα δίκτυο VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Απενεργοποίηση ειδοποιήσεων διαθέσιμων δικτύων"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Ορίστε το ως αληθές για να απενεργοποιήσετε τις ειδοποιήσεις όποτε "
-#~ "υπάρχουν διαθέσιμα δίκτυα Wi-Fi."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "σύνδεση %s"
 
-#~ msgid "Stamp"
-#~ msgstr "Σφραγίδα"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Πιστοποιητικά DER ή PEM (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Χρησιμοποιείται για να καθορίζει αν οι ρυθμίσεις πρέπει να μεταφερθούν σε "
-#~ "νέα έκδοση."
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "Ιδιωτικά κλειδιά DER, PEM ή PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Απενεργοποίηση δημιουργίας ασύρματου δικτύου"
+msgid "Wi-Fi _security"
+msgstr "Ασ_φάλεια δικτύου Wi-Fi:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Ορίστε το ως αληθές για να απενεργοποιήσετε την δημιουργία adhoc δικτύων "
-#~ "κατά τη χρήση της μικροεφαρμογής."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "Ό_νομα δικτύου:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Εμφάνιση της μικροεφαρμογής στην περιοχή ειδοποιήσεων"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Σύν_δεση:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Ορισμός σε ΨΕΥΔΕΣ για απενεργοποίηση εμφάνισης της μικροεφαρμογής στην "
-#~ "περιοχή ειδοποιήσεων."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Προσαρμογέας Wi-Fi:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Παράβλεψη πιστοποιητικού CA"
+#~ msgid "Manage your network connections"
+#~ msgstr "Διαχείριση των συνδέσεων δικτύου"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Ορίστε το ως αληθές για να απενεργοποιήσετε τις προειδοποιήσεις σχετικά "
-#~ "με τα πιστοποιητικά CA στην πιστοποίηση EAP."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "_Χειροκίνητη σύνδεση"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Ορίστε το ως αληθές για να απενεργοποιήσετε τις προειδοποιήσεις σχετικά "
-#~ "με τα πιστοποιητικά CA στην 2η φάσης της EAP πιστοποίησης."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Διαχείριση και αλλαγή ρυθμίσεων των συνδέσεων δικτύου"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/en_CA.po b/po/en_CA.po
index f0fb6277..75fc9163 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2005-09-06 14:52-0400\n"
 "Last-Translator: Adam Weinberger <adamw gnome org>\n"
 "Language-Team: Canadian English <adamw gnome org>\n"
@@ -18,6 +18,84 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Password:"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -65,43 +143,73 @@ msgstr "Password:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "none"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Password:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Password:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 #, fuzzy
 msgid "Sho_w password"
 msgstr "Password:"
@@ -115,35 +223,35 @@ msgstr "Default Route:"
 msgid "My country is not listed"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr ""
 
@@ -259,35 +367,25 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "none"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
+#: src/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr ""
+#: src/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Error retrieving VPN connection '%s'"
 
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:116
+msgid "Name"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
 msgstr ""
 
 #: src/nma-pkcs11-cert-chooser.c:381
@@ -304,34 +402,13 @@ msgstr "Password:"
 msgid "Sho_w passwords"
 msgstr ""
 
-#: src/nma-pkcs11-cert-chooser-dialog.c:241
-msgid "Error logging in: "
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.c:263
-#, fuzzy
-msgid "Error opening a session: "
-msgstr "Error retrieving VPN connection '%s'"
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:20
-msgid "_Unlock token"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:116
-msgid "Name"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:126
-msgid "Issued By"
-msgstr ""
-
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -382,100 +459,100 @@ msgstr "Secondary DNS:"
 msgid "_Password:"
 msgstr "Password:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Wired network connection"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "None"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit ASCII"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 #, fuzzy
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP Passphrase"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 #, fuzzy
 msgid "WPA & WPA2 Personal"
 msgstr "WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wireless Network Key Required"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Create New Wireless Network"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connect to Other Wireless Network"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -484,364 +561,352 @@ msgstr ""
 "Enter the name and security settings of the wireless network you wish to "
 "create."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Wireless Security:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Network Name:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "C_onnect"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Wireless _adapter:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "VPN Connections"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr ""
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "Authentication:"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Authentication:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "User Name:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "Password:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 #, fuzzy
 msgid "Automatic"
 msgstr "WPA Automatic"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP Passphrase"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Passphrase:"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Authentication:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Password:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "Type:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Open System"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Shared Key"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 #, fuzzy
 msgid "1 (Default)"
 msgstr "Automatic (Default)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "Key:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "VPN Connections"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr ""
+
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Wireless Security:"
+
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Network Name:"
+
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "C_onnect"
+
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wireless _adapter:"
+
 #, fuzzy
 #~ msgid "Manage your network connections"
 #~ msgstr "No network connection"
diff --git a/po/en_GB.po b/po/en_GB.po
index 316710f6..db08c4a4 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: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\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,6 +18,95 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Disable connected notifications"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Set this to true to disable notifications when connecting to a network."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Disable disconnected notifications"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Set this to true to disable notifications when disconnecting from a network."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Disable VPN notifications"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Suppress networks available notifications"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Stamp"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Used to determine whether settings should be migrated to a new version."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Disable Wi-Fi Create"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Set to true to disable creation of adhoc networks when using the applet."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignore CA certificate"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+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:49
+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."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -64,44 +153,77 @@ msgstr "Password:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(none)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A certificate:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Unknown"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Select A File"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Select A File"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Ignore CA certificate"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Choose CA Certificate"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Private _key:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_Private key password:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Choose CA Certificate"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_User certificate:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Sho_w password"
 
@@ -113,36 +235,36 @@ msgstr "Default"
 msgid "My country is not listed"
 msgstr "My country is not listed"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Unlisted"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "My plan is not listed…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Provider"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Installed GSM device"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Installed CDMA device"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Any device"
 
@@ -276,54 +398,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirm Mobile Broadband Settings"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(none)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "C_A certificate:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Unknown"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-#, fuzzy
-msgid "Select"
-msgstr "Select A File"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-#, fuzzy
-msgid "Select from file…"
-msgstr "Select A File"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Choose CA Certificate"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_User certificate:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Sho_w passwords"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -346,13 +420,27 @@ msgstr "Name"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Choose CA Certificate"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_User certificate:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Sho_w passwords"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -405,98 +493,98 @@ msgstr "_Password:"
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Disconnect"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "None"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Key (Hex or ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_reate"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "C_onnect"
 
 #
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi Network Authentication Required"
 
 #
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Authentication required by Wi-Fi network"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Create New Wi-Fi Network"
 
 #
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "New Wi-Fi network"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connect to Hidden Wi-Fi Network"
 
 #
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Hidden Wi-Fi network"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -504,457 +592,373 @@ msgstr ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 
-#
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Wi-Fi _security:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Network name:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Co_nnection:"
-
-#
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Wi-Fi _adapter:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s connection"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Ignore CA certificate"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Choose a PAC file…"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC files (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "All files"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Authenticated"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Both"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Anony_mous identity:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC _file:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_Inner authentication:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Allow automatic PAC pro_visioning"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Username:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Password:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Version 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Version 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Ignore CA certificate"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP _version:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Show passphrase"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ignore CA certificate"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_dentity:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Ignore CA certificate"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunnelled TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Au_thentication:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "_Private key password:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Type:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Open System"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Shared Key"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Default)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Key:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Sho_w key"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP inde_x:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Manage your network connections"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "_Manual configuration"
-
-#
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Manage and change your network connection settings"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Disable connected notifications"
-
-#~ 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."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Disable disconnected notifications"
-
-#~ 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 "Disable VPN notifications"
-#~ msgstr "Disable VPN notifications"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ 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."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s connection"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Suppress networks available notifications"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 
-#~ 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."
+#: src/utils/utils.c:547
+#, fuzzy
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 
-#~ msgid "Stamp"
-#~ msgstr "Stamp"
+#
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi _security:"
 
-#~ 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."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Network name:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Disable Wi-Fi Create"
+msgid "C_onnection"
+msgstr "Co_nnection:"
 
-#~ 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."
+#
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi _adapter:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignore CA certificate"
+#~ msgid "Manage your network connections"
+#~ msgstr "Manage your network connections"
 
-#~ 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."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "_Manual configuration"
 
-#~ 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 "Manage and change your network connection settings"
+#~ msgstr "Manage and change your network connection settings"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/eo.po b/po/eo.po
index a2be739f..b6280ca5 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2018-01-06 01:51+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan schmidt googlemail com>\n"
 "Language-Team: Esperanto <gnome-eo-list gnome org>\n"
@@ -24,6 +24,96 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Elŝalti atentigojn pri konektoj"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam konektanta al reto."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Elŝalti atentigojn pri malkonektoj"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam malkonektanta al reto."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Elŝalti VPN-atentigojn"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam konektante aŭ "
+"malkonektante de VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Nuligi atentigon pri disponeblaj retoj"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam sendrataj retoj "
+"disponeblas."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Stampo"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "Uzita por determini ĉu agordoj devus esti migrigita al nova versio."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Elŝalti kreon de sendrataj konektoj"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Agordi tion ĉi \"vera\", se vi volas elŝalti la kreadon de por-okazaj retoj "
+"per la aplikaĵeto."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignori CA-atestilon"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam konektanta al reto."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam konektanta al reto."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -70,43 +160,73 @@ msgstr "Pasvorto:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(Neniu)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Atestilo in %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Nekonate)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Atestilo ne estas agordita"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Elektu atestilon de %s"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "%s privata ŝ_losilo:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "%s _pasvorto por ŝlosilo:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Elektu atestilon de %s"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "%s _atestilo:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Montri pasvorton"
 
@@ -118,36 +238,36 @@ msgstr "Defaŭlte"
 msgid "My country is not listed"
 msgstr "Mia lando ne estas listigita"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Nelistigite"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Mia plano estas nelistigite…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Provizanto"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Instalis GSM-aparaton"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Instalis CDMA-aparaton"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Iu aparato"
 
@@ -284,51 +404,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Konfirmi agordojn por poŝtelefona larĝkapacita reto"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(Neniu)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Atestilo in %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Nekonate)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Elektu atestilon de %s"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "%s permesila _pasvorto:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Montri pasvortojn"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -350,13 +425,27 @@ msgstr "Nomo"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Elektu atestilon de %s"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "%s permesila _pasvorto:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Montri pasvortojn"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -406,59 +495,59 @@ msgstr "_Duaranga pasvorto:"
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Malkonekti"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Neniu"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bita ŝlosilo (Deksesuma aŭ ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "128-bita WEP-pasfrazo"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamika WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA kaj WPA2 por personoj"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA kaj WPA2 por enterprenoj"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA kaj WPA2 por personoj"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "K_rei"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "K_onekti"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -466,35 +555,35 @@ msgstr ""
 "Pasvortoj aŭ ĉifroŝlosiloj estas postulataj por atingi la sendratan reton "
 "“%s”."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Aŭtentigo por sendrata reto estas postulata"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Sendrata reto postulas aŭtentigon"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Krei novan sendratan reton"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nova sendrata reto"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Konekti al kaŝita sendrata reto"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Kaŝita sendrata reto"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -502,435 +591,365 @@ msgstr ""
 "Entajpu la nomon kaj sekurecdetalojn de la kaŝita sendrata reto al kiu vi "
 "volas konekti."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Sendrata _sekureco:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "Ret_nomo:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Ko_nekto:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Sendrata _adaptilo:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s-konekto"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER- aŭ PEM-atestiloj (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "neniu CA-atestilo estas elektita"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Elekti PAC-dosieron"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-dosieroj (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Sennoma"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Aŭtentokontrolata"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Senno_ma idento:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC-_dosiero:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_Ena aŭtentigo:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permesi aŭtomatan PAC-pro_vizadon"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Uzantonomo:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Pasvorto:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Aŭtomate"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versio 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versio 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA-atestilo ne estas _bezonata"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "_Versio de PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "128-bita WEP-pasfrazo"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "M_ontri pasvortojn"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "neniu uzanto-atestilo estas elektita"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_dento:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (sen EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "neniu CA-atestilo estas elektita"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunelita TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Protektita EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Aŭ_tentigo:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "%s _pasvorto por ŝlosilo:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Tipo:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Malferma sistemo"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Kunhavigita ŝlosilo"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (defaŭlte)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "Ŝ_losilo:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "_Montri ŝlosilon"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP-inde_kso:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Kontroli viajn retkonektojn"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Aktivaj retkonektoj"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Administri kaj ŝanĝi viajn retkonektajn agordojn"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Elŝalti atentigojn pri konektoj"
-
-#~ 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."
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Elŝalti atentigojn pri malkonektoj"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s-konekto"
 
-#~ 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."
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER- aŭ PEM-atestiloj (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Elŝalti VPN-atentigojn"
+#: src/utils/utils.c:547
+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)"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam konektante aŭ "
-#~ "malkonektante de VPN."
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Sendrata _sekureco:"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Nuligi atentigon pri disponeblaj retoj"
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "Ret_nomo:"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam sendrataj retoj "
-#~ "disponeblas."
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Ko_nekto:"
 
-#~ msgid "Stamp"
-#~ msgstr "Stampo"
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Sendrata _adaptilo:"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "Uzita por determini ĉu agordoj devus esti migrigita al nova versio."
+#~ msgid "Manage your network connections"
+#~ msgstr "Kontroli viajn retkonektojn"
 
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Elŝalti kreon de sendrataj konektoj"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Agordi tion ĉi \"vera\", se vi volas elŝalti la kreadon de por-okazaj "
-#~ "retoj per la aplikaĵeto."
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Aktivaj retkonektoj"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignori CA-atestilon"
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Administri kaj ŝanĝi viajn retkonektajn agordojn"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/es.po b/po/es.po
index 85224313..7ae1671f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: networkmanager-applet.master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-10-10 15:22+0200\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: Spanish - Spain <gnome-es-list gnome org>\n"
@@ -26,6 +26,100 @@ msgstr ""
 "X-Generator: Gtranslator 3.34.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Desactivar las notificaciones de conexión"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Establecer esto a cierto para desactivar las notificaciones al conectarse "
+"con una red."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Desactivar las notificaciones de desconexión"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Establecer esto a cierto para desactivar las notificaciones al desconectarse "
+"de una red."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Desactivar las notificaciones de VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Establecer esto a cierto para desactivar las notificaciones al conectarse o "
+"desconectarse de una VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Suprimir notificaciones de redes disponibles"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Establecer esto a cierto para desactivar las notificaciones cuando hay redes "
+"inalámbricas disponibles."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Marca de tiempo"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Se usa para determinar si los ajustes de deben migrar a la nueva versión."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Desactivar la creación de red inalámbrica"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Establecer esto a cierto para desactivar la creación de redes inalámbricas "
+"adhoc al usar la miniaplicación."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Mostrar la miniaplicación en el área de notificación"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Establecer a falso para que no se muestre la miniaplicación en el área de "
+"notificación."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignorar certificado CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Establecer esto a cierto para desactivar las notificaciones sobre "
+"certificados CA en autenticación EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Establecer esto a cierto para desactivar las notificaciones sobre "
+"certificados CA en la fase 2 de la autenticación EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -78,43 +172,72 @@ msgstr "Contraseña"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr "Escanear con su teléfono o <a href=\"nma:print\">Imprimir</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(ninguno)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Clave en %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificado en %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Desconocido)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Seleccionar"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Seleccionar desde un archivo…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "No hay ningún certificado configurado"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "No hay clave establecida"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Elija una clave para el certificado %s"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "clave privada %s"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "contraseña de clave %s"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Elija un certificado %s"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "_certificado %s"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Mostrar la contraseña"
 
@@ -126,35 +249,35 @@ msgstr "Predeterminado"
 msgid "My country is not listed"
 msgstr "Mi país no está en la lista"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Sin listar"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Mi plan no está en la lista…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Proveedor"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalado"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalado"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Cualquier dispositivo"
 
@@ -283,50 +406,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmar los ajustes de la banda ancha móvil"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(ninguno)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Clave en %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Certificado en %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Desconocido)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Seleccionar"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Seleccionar desde un archivo…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Elija un certificado %s"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "_contraseña del certificado %s"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Mostrar las contraseñas"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Error al iniciar sesión."
@@ -347,13 +426,27 @@ msgstr "Nombre"
 msgid "Issued By"
 msgstr "Emitido por"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Elija un certificado %s"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_contraseña del certificado %s"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Mostrar las contraseñas"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Introduzca el PIN de %s"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -401,56 +494,56 @@ msgstr "Contraseña _secundaria:"
 msgid "_Password:"
 msgstr "Contrase_ña:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Pulse para conectar"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Nueva…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ninguna"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clave WEP 40/128-bit (Hexadecimal o ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase de paso WEP de 128 bits"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinámica (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA y WPA2 personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA y WPA2 enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 msgid "WPA3 Personal"
 msgstr "WPA3 personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_rear"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -458,35 +551,35 @@ msgstr ""
 "Se necesitan contraseñas o claves de cifrado para acceder a la red "
 "inalámbrica «%s»."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Se requiere autenticación para la red inalámbrica"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "La red inalámbrica necesita autenticación"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Crear una red inalámbrica"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Red inalámbrica nueva"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Conectar con una red inalámbrica oculta"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Red inalámbrica oculta"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -494,295 +587,249 @@ msgstr ""
 "Introduzca el nombre y los detalles de seguridad de la red inalámbrica "
 "oculta a la que quiere conectarse."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "_Seguridad inalámbrica"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Nombre de red"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "Co_nexión"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "_Adaptador inalámbrico"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Conexión %s"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certificados PEM (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-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:351
-msgid "no CA certificate selected"
-msgstr "No se seleccionado ningún certificado CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "el archivo de certificado CA seleccionado no existe"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "falta el archivo PAC de EAP-LEAP"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Elegir un archivo PAC"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Archivos PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenticado"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Ambos"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Identidad anóni_ma"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "Archivo _PAC"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "Autenticación i_nterna"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir la provisión PAC _automática"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "falta el nombre de usuario de EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "falta la contraseña de EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "Nombre de _usuario"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "Contrase_ña"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versión 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versión 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "No se necesita ningún ce_rtificado CA"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "Versión _PEAP"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Sufijo del nombre del servidor de certificados."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Dominio"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "falta el usuario EAP"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "falta la contraseña EAP"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "falta la frase de contraseña de la clave privada del cliente EAP"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "Frase de paso de la clave p_rivada"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "M_ostrar frase de paso"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "falta la identidad EAP"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "No se seleccionado ningún certificado de usuario"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "el certificado de usuario seleccionado no existe"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "ninguna clave seleccionada"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "el archivo de clave seleccionado no existe"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "I_dentidad"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (no EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Error desconocido al validar la seguridad 802.1x"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "error no definido en la seguridad 802.1x (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "No se seleccionado ningún certificado CA"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "el archivo de certificado CA seleccionado no existe"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "RÁPIDO"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "TLS a través de túnel"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegido (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Configurada externamente"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "_Autenticación"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "falta el nombre de usuario leap"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "falta la contraseña leap"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 msgid "missing password"
 msgstr "falta la contraseña"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Tipo"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "falta la clave wep"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "clave wep no válida: una clave con longitud %zu sólo debe contener dígitos "
 "hexadecimales"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -790,7 +837,7 @@ msgstr ""
 "clave wep no válida: una clave con longitud %zu sólo debe contener "
 "caracteres ASCII"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -799,40 +846,40 @@ msgstr ""
 "clave wep no válida: clave con longitud %zu. Una clave debe tener una "
 "longitud de 5/13 (ASCII) o 10/26 (hexadecimal)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "clave wep no válida: la frase de paso no puede estar vacía"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "clave wep no válida: la frase de paso debe tener menos de 64 caracteres"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema abierto"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Clave compartida"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (predeterminado)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Clave"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "_Mostrar la clave"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "Ín_dice WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -841,12 +888,46 @@ 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 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 "
 "hexadecimal"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Error desconocido al validar la seguridad 802.1x"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Conexión %s"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certificados PEM (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+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/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "_Seguridad inalámbrica"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Nombre de red"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "Co_nexión"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptador inalámbrico"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Gestione sus conexiones de red"
 
@@ -862,88 +943,6 @@ msgstr ""
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Desactivar las notificaciones de conexión"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Establecer esto a cierto para desactivar las notificaciones al conectarse "
-#~ "con una red."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Desactivar las notificaciones de desconexión"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Establecer esto a cierto para desactivar las notificaciones al "
-#~ "desconectarse de una red."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Desactivar las notificaciones de VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Establecer esto a cierto para desactivar las notificaciones al conectarse "
-#~ "o desconectarse de una VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Suprimir notificaciones de redes disponibles"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Establecer esto a cierto para desactivar las notificaciones cuando hay "
-#~ "redes inalámbricas disponibles."
-
-#~ msgid "Stamp"
-#~ msgstr "Marca de tiempo"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Se usa para determinar si los ajustes de deben migrar a la nueva versión."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Desactivar la creación de red inalámbrica"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Establecer esto a cierto para desactivar la creación de redes "
-#~ "inalámbricas adhoc al usar la miniaplicación."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Mostrar la miniaplicación en el área de notificación"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Establecer a falso para que no se muestre la miniaplicación en el área de "
-#~ "notificación."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignorar certificado CA"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Establecer esto a cierto para desactivar las notificaciones sobre "
-#~ "certificados CA en autenticación EAP."
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Establecer esto a cierto para desactivar las notificaciones sobre "
-#~ "certificados CA en la fase 2 de la autenticación EAP."
-
 #~ msgid "NetworkManager"
 #~ msgstr "Gestor de la red"
 
diff --git a/po/et.po b/po/et.po
index 412119de..cd574c38 100644
--- a/po/et.po
+++ b/po/et.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Network Manager MASTER\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2013-03-13 02:52+0300\n"
 "Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
 "Language-Team: Estonian <>\n"
@@ -25,6 +25,90 @@ msgstr ""
 "X-Poedit-Language: Estonia\n"
 "X-Poedit-Country: ESTONIAN\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Ühendumise saavutamisest ei teatata"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "Kui tõene, siis on võrguga ühendumise teated keelatud."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Ühenduse katkemisest ei teatata"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "Kui tõene, siis on võrguühenduse katkemise teated keelatud."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "VPN teadete keelamine"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "Kui tõene, siis on VPN ühenduse loomise ja katkemise teated keelatud."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Saadaolevatest võrkudest ei teatata"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "Kui tõene, siis on saadaolevatest Wi-Fi võrkudest teatamine keelatud."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Tempel"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Kasutatakse, et kindlaks teha, millal tuleb sätteid uuendada järgmisele "
+"versioonile."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Wi-Fi loomine keelatud"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr "Kui tõene, siis on adhoc võrgu loomine rakendi abil keelatud."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Rakendit näidatakse teatealas"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "Määra väärtuseks FALSE, et keelata rakendi näitamine teatealas."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Märgi see, et keelata hoiatused sertifitseerimiskeskuse (CA) sertide kohta "
+"EAP autentimisel."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Märgi see, et keelata hoiatused sertifitseerimiskeskuse (CA) sertide kohta "
+"EAP autentimise teises faasis."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -71,44 +155,75 @@ msgstr "Parool:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(puudub)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Sertifitseerimis_keskuse sert:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Tundmatu"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Vali sertifitseerimiskeskuse sertifikaat"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Privaat_võti:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_Privaatvõtme parool:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Vali sertifitseerimiskeskuse sertifikaat"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_Kasutaja sertifikaart:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Näita parooli"
 
@@ -120,36 +235,36 @@ msgstr "Vaikimisi"
 msgid "My country is not listed"
 msgstr "Minu riik pole loetelus"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Pole loetelus"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Minu makseplaan pole loetelus..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Teenusepakkuja"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Paigaldatud GSM-seade"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Paigaldatud CDMA-seade"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Iga seade"
 
@@ -284,52 +399,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Mobiiliühenduse sätete kinnitamine"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(puudub)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Sertifitseerimis_keskuse sert:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Tundmatu"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Vali sertifitseerimiskeskuse sertifikaat"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Kasutaja sertifikaart:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Näita paroole"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -352,13 +421,27 @@ msgstr "Nimi"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Vali sertifitseerimiskeskuse sertifikaat"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Kasutaja sertifikaart:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Näita paroole"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -411,547 +494,461 @@ msgstr "_Parool:"
 msgid "_Password:"
 msgstr "_Parool:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Katkesta ühendus"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Puudub"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitine võti (Hex või ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bitine parool"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dünaamiline WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 isiklik"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ettevõtte"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 isiklik"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Loo"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "Ü_hendu"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Ligipääsuks Wi-Fi võrgule '%s' on vaja parooli või krüpteerimisvõtit."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi võrk nõuab salasõna"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi võrgu jaoks on vaja salasõna"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Uue Wi-Fi võrgu loomine"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Uus Wi-Fi võrk"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Sisesta loodava Wi-Fi võrgu nimi."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Varjatud Wi-Fi võrku ühendumine"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Varjatud Wi-Fi võrk"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 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/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Wi-Fi _turvalisus:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Võrgu nimi:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Ü_hendus:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Wi-Fi _adapter:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s ühendus"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER või PEM sertifikaadid (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC-faili lubamine..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC failid (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Kõik failid"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonüümne"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenditud"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Mõlemad"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Anonüü_mne identiteet:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC _fail:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_Sise-autentimine:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Automaatsed _PAC-klauslid on lubatud"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Kasutajanimi:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Parool:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versioon 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versioon 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP _versioon:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bitine parool"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "_Näita paroole"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_dentiteet:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunnelis TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Kaitstud EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_Autentimine:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "_Privaatvõtme parool:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Liik:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Avatud süsteem"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Jagatud võti"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (vaikimisi)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Võti:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "_Näita võtit"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP inde_ks:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Võrguühenduste haldamine"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Aktiivsed võrguühendused"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Võrguühenduse sätete haldus"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Ühendumise saavutamisest ei teatata"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "Kui tõene, siis on võrguga ühendumise teated keelatud."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Ühenduse katkemisest ei teatata"
-
-#~ 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."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "VPN teadete keelamine"
-
-#~ 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."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Saadaolevatest võrkudest ei teatata"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ 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."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s ühendus"
 
-#~ msgid "Stamp"
-#~ msgstr "Tempel"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER või PEM sertifikaadid (*.der, *.pem, *.crt, *.cer)"
 
-#~ 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."
+#: src/utils/utils.c:547
+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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wi-Fi loomine keelatud"
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi _turvalisus:"
 
-#~ 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."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Võrgu nimi:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Rakendit näidatakse teatealas"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Ü_hendus:"
 
-#~ 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."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi _adapter:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
+#~ msgid "Manage your network connections"
+#~ msgstr "Võrguühenduste haldamine"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Märgi see, et keelata hoiatused sertifitseerimiskeskuse (CA) sertide "
-#~ "kohta EAP autentimisel."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Aktiivsed võrguühendused"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Märgi see, et keelata hoiatused sertifitseerimiskeskuse (CA) sertide "
-#~ "kohta EAP autentimise teises faasis."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Võrguühenduse sätete haldus"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/eu.po b/po/eu.po
index ab0eed91..749f8aa4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-10-19 10:00+0100\n"
 "Last-Translator: Asier Sarasua Garmendia <asier sarasua gmail com>\n"
 "Language-Team: Basque <librezale librezale eus>\n"
@@ -19,6 +19,100 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Desgaitu konektatutako jakinarazpenak"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Ezarri hau TRUE (egia) gisa jakinarazpenak desgaitzeko sare batera "
+"konektatzean."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Desgaitu deskonektatutako jakinarazpenak"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Ezarri hau TRUE (egia) gisa jakinarazpenak desgaitzeko sare batetik "
+"deskonektatzean."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Desgaitu VPNren jakinarazpenak"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Ezarri hau TRUE (egia) gisa jakinarazpenak desgaitzeko VPN batera "
+"konektatzean edo batetik deskonektatzean."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Ezabatu sare erabilgarrien jakinarazpenak"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Ezarri hau TRUE (egia) gisa jakinarazpenak desgaitzeko wifi sareak "
+"erabilgarri daudenean."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Zigilua"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Ezarpenak bertsio berrira migratuko diren edo ez  ezartzeko erabiltzen da."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Desgaitu WiFiaren sorrera"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Ezarri hau TRUE (egia) gisa bereziki prestatutako sareen sorrera desgaitzeko "
+"miniaplikazioa erabiltzean."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Erakutsi miniaplikazioa jakinarazpenen arean"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Ezarri FALSE (faltsua) gisa miniaplikazioa jakinarazpenen arean erakustea "
+"desgaitzeko."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ez ikusi egin ZE ziurtagiriri"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Ezarri TRUE (egia) gisa EAP autentifikazioan ZE ziurtagiriei buruzko abisuak "
+"desgaitzeko."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Ezarri TRUE (egia) gisa EAP autentifikazioaren 2. urratsean ZE ziurtagiriei "
+"buruzko abisuak desgaitzeko."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -67,43 +161,72 @@ msgstr "Pasahitza"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr "Eskaneatu zure telefonoarekin edo <a href=\"nma:print\">Inprimatu</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(bat ere ez)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Gakoa hemen: %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Ziurtagiria hemen: %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Ezezaguna)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Hautatu"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Utzi"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Hautatu fitxategitik…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Ez dago ziurtagiririk ezarrita"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Ez dago gakorik ezarrita"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Hautatu gako bat %s ziurtagirirako"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "%s _gako pribatua"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "%s gakoaren _pasahitza"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Hautatu %s ziurtagiria"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "%s _ziurtagiria"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Erakutsi _pasahitza"
 
@@ -115,35 +238,35 @@ msgstr "Lehenetsia"
 msgid "My country is not listed"
 msgstr "Nire herrialdea ez dago zerrendatuta"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Zerrendatu gabea"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Nire plana ez dago zerrendan…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Hornitzailea"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Instalatutako GSM gailua"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Instalatutako CDMA gailua"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Edozein gailu"
 
@@ -272,50 +395,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Berretsi banda zabal mugikorreko ezarpenak"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(bat ere ez)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Gakoa hemen: %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Ziurtagiria hemen: %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Ezezaguna)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Hautatu"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Utzi"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Hautatu fitxategitik…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Hautatu %s ziurtagiri bat"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "%s ziurtagiriaren _pasahitza"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Erakutsi _pasahitzak"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Errorea saioa hastean: "
@@ -336,13 +415,27 @@ msgstr "Izena"
 msgid "Issued By"
 msgstr "Jaulkitzailea"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Hautatu %s ziurtagiri bat"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s ziurtagiriaren _pasahitza"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Erakutsi _pasahitzak"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Sartu %s PINa"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Utzi"
 
@@ -390,90 +483,90 @@ msgstr "_Bigarren pasahitza:"
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Egin klik konektatzeko"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Berria…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Bat ere ez"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 bit-eko gakoa (hamaseitarra edo ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bit-eko pasaesaldia"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinamikoa (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA eta WPA2 pertsonala"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA eta WPA2 enpresa"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 msgid "WPA3 Personal"
 msgstr "WPA3 pertsonala"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Sortu"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Konektatu"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Pasahitzak edo zifratze-gakoak behar dira “%s” wifi sarera sartzeko."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wifi sarearen autentifikazioa beharrezkoa"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wifi sareak autentifikazioa eskatzen du"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Sortu wifi sare berria"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Wifi sare berria"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Sartu wifi sarearen izena sortzeko."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Konektatu ezkutuko wifi sarera"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Ezkutuko wifi sarea"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -481,295 +574,249 @@ msgstr ""
 "Sartu konektatzea nahi duzun ezkutuko wifi sarearen izena eta segurtasuneko "
 "xehetasunak."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Wifiaren _segurtasuna"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Sarearen izena"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "_Konexioa"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "Wifiaren _moldagailua:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s konexioa"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM ziurtagiriak (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "definitu gabeko errorea 802.1x segurtasunean (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "ez da ZE ziurtagiririk hautatu"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "hautatutako ZE ziurtagiria ez da existitzen"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC fitxategia falta da"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Aukeratu PAC fitxategia"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC fitxategiak (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Fitxategi denak"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonimoa"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autentifikatuta"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Biak"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Nortasun _anonimoa"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "PAC _fitxategia"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "_Barneko autentifikazioa"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Baimendu PAC automatikoki _hornitzea"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAPren erabiltzaile-izena falta da"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAPren pasahitza falta da"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "_Erabiltzaile-izena:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Pasahitza"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "0 bertsioa"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "1 bertsioa"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Ez da ZE ziurtagirik _behar"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "PEAP _bertsioa"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Zerbitzari-ziurtagiriaren izenaren atzizkia."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Domeinua"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "EAPren erabiltzaile-izena falta da"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "EAPren pasahitza falta da"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "EAP bezeroaren gako pribatuaren pasaesaldia falta da"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "Gako p_ribatuaren pasaesaldia"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "Erakutsi _pasaesaldia"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLSren erabiltzaile-izena falta da"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "ez da erabiltzaile-ziurtagiririk hautatu"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "hautatutako erabiltzaile-ziurtagiriaren fitxategia ez da existitzen"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "ez da gakorik hautatu"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "hautatutako gako-fitxategia ez da existitzen"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "_Identitatea"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (EAP gabe)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Errore ezezaguna 802.1X segurtasuna egiaztatzean"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "definitu gabeko errorea 802.1x segurtasunean (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "ez da ZE ziurtagiririk hautatu"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "hautatutako ZE ziurtagiria ez da existitzen"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tuneldun TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Babestutako EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Kanpoan konfiguratua"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "_Autentifikazioa"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "'leap'en erabiltzaile-izena falta da"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "'leap'en pasahitza falta da"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 msgid "missing password"
 msgstr "pasahitza falta da"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Mota"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "wep gakoa falta da"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "baliogabeko wep gakoa: %zu luzera duen gakoak soilik digitu hamaseitarrak "
 "eduki ditzake"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -777,7 +824,7 @@ msgstr ""
 "baliogabeko wep gakoa: %zu luzera duen gakoak soilik ascii karaktereak eduki "
 "ditzake"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -786,41 +833,41 @@ msgstr ""
 "baliogabeko wep gakoa: gakoak okerreko %zu luzera du. Gako baten luzerak "
 "5/13 (ascii) edo 10/26 (hamaseitarra) izan behar du"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "baliogabeko wep gakoa: pasaesaldia ezin da hutsik egon behar"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "baliogabeko wep gakoa: pasaesaldiak 64 karaktere baino gutxiago izan behar "
 "ditu"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema irekia"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Partekatutako gakoa"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (lehenetsia)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Gakoa"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "E_rakutsi gakoa"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP _indizea"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -829,12 +876,46 @@ msgstr ""
 "baliogabeko wpa-psk: gakoaren %zu luzera baliogabea. [8,63] byte edo 64 "
 "digitu hamaseitarrekoa izan behar du"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "baliogabeko wepwpa-psk: ezin da hamaseitar gisa 64 byte dituen gakoa "
 "interpretatu"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Errore ezezaguna 802.1X segurtasuna egiaztatzean"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s konexioa"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM ziurtagiriak (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+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/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Wifiaren _segurtasuna"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Sarearen izena"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "_Konexioa"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Wifiaren _moldagailua:"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Kudeatu sareko konexioak"
 
@@ -850,88 +931,6 @@ msgstr ""
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Desgaitu konektatutako jakinarazpenak"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Ezarri hau TRUE (egia) gisa jakinarazpenak desgaitzeko sare batera "
-#~ "konektatzean."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Desgaitu deskonektatutako jakinarazpenak"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Ezarri hau TRUE (egia) gisa jakinarazpenak desgaitzeko sare batetik "
-#~ "deskonektatzean."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Desgaitu VPNren jakinarazpenak"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Ezarri hau TRUE (egia) gisa jakinarazpenak desgaitzeko VPN batera "
-#~ "konektatzean edo batetik deskonektatzean."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Ezabatu sare erabilgarrien jakinarazpenak"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Ezarri hau TRUE (egia) gisa jakinarazpenak desgaitzeko wifi sareak "
-#~ "erabilgarri daudenean."
-
-#~ msgid "Stamp"
-#~ msgstr "Zigilua"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Ezarpenak bertsio berrira migratuko diren edo ez  ezartzeko erabiltzen da."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Desgaitu WiFiaren sorrera"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Ezarri hau TRUE (egia) gisa bereziki prestatutako sareen sorrera "
-#~ "desgaitzeko miniaplikazioa erabiltzean."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Erakutsi miniaplikazioa jakinarazpenen arean"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Ezarri FALSE (faltsua) gisa miniaplikazioa jakinarazpenen arean erakustea "
-#~ "desgaitzeko."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ez ikusi egin ZE ziurtagiriri"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Ezarri TRUE (egia) gisa EAP autentifikazioan ZE ziurtagiriei buruzko "
-#~ "abisuak desgaitzeko."
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Ezarri TRUE (egia) gisa EAP autentifikazioaren 2. urratsean ZE "
-#~ "ziurtagiriei buruzko abisuak desgaitzeko."
-
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
 
diff --git a/po/fa.po b/po/fa.po
index d9c3db2e..9f10e522 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2012-10-12 20:48+0330\n"
 "Last-Translator: Arash Mousavi <mousavi arash gmail com>\n"
 "Language-Team: Persian\n"
@@ -20,6 +20,100 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=1;\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "غیرفعال‌سازی اعلان‌های برقراری ارتباط"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"برای غیرفعال‌سازی اعلان‌ها هنگام ارتباط با یک شبکه این قسمت را True تنظیم کنید."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "غیرفعال‌سازی اعلان‌های قطع ارتباط"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"برای غیرفعال‌سازی اعلان‌ها در زمان قطع ارتباط از یک شبکه بر روی true تنظیم "
+"کنید."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "غیرفعال‌سازی اعلان‌های وی‌پی‌ان"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"برای غیرفعال‌سازی اعلان‌ها در زمان قطع ارتباط یا اتصال به وی‌پی‌ان این قسمت را "
+"True تنظیم کنید."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "متوقف کردن اعلان‌های موجود شبکه‌ها"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"برای غیرفعال‌سازی اعلان‌ها در زمانی که شبکه‌های بی‌سیم در دسترس هستند این قسمت "
+"را True تنظیم کنید."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "تمبر"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"جهت تشخیص اینکه آیا تنظیمات باید به نسخه جدید انتقال پیدا کنند یا خیر مورد "
+"استفاده قرار می‌گیرد."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "غیرفعال‌سازی ساخت وای‌فای"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"برای غیرفعال کردن شبکه‌های ادهاک زمانی که از برنامک استفاده می‌کنید گزینه True "
+"را انتخاب کنید."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "نادیده گرفتن گواهینامه‌ی CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"برای غیرفعال کردن هشدارهای مربوط به گواهینامه‌های CA در تصدیق‌هویت EAP برروی "
+"true تنظیم کنید."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"برای غیرفعال کردن هشدارهای مربوط به گواهینامه‌های CA در تصدیق‌هویت فاز ۲ از "
+"EAP برروی true تنظیم کنید."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -66,44 +160,75 @@ msgstr "گذرواژه:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(هیچکدام)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "_مجوز CA:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "ناشناس"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "نادیده گرفتن گواهینامه‌ی CA"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "مجوز CA انتخاب کنید"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "کلید خصوصی"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "گذرواژه کلید _خصوصی:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "مجوز CA انتخاب کنید"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "مجوز _کاربر:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_نمایش گذرواٰژه"
 
@@ -115,36 +240,36 @@ msgstr "پیش‌فرض"
 msgid "My country is not listed"
 msgstr "کشور من در فهرست نیست"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "جی‌اس‌ام"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "فهرست نشده"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "پلان من در فهرست نیست..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "ارائه‌دهنده"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "دستگاه GSM نصب شده"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "دستگاه CDMA نصب شده"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "هر دستگاهی"
 
@@ -279,52 +404,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "تایید تنظیمات شبکه پهن‌باند تلفن همراه"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(هیچکدام)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "_مجوز CA:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "ناشناس"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "مجوز CA انتخاب کنید"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "مجوز _کاربر:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_نمایش گذرواژه‌ها"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -347,13 +426,27 @@ msgstr "نام"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "مجوز CA انتخاب کنید"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "مجوز _کاربر:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_نمایش گذرواژه‌ها"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -406,101 +499,101 @@ msgstr "_گذرواژه:"
 msgid "_Password:"
 msgstr "_گذرواژه:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "ارتباط قطع شده"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "هیچکدام"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "کلید وپ ۴۰/۱۲۸ بیتی (Hex یا ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "عبارت عبور وپ ۱۲۸ بیتی"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "وپ پویا (x02.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 شخصی"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 شخصی"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_ساخت"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_اتصال"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "برای دسترسی به شبکه بی‌سیم «%s»، گذرواژه‌ها یا کلیدهای رمز نگاری شده نیاز است."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "شبکه بی‌سیم به تصدیق هویت نیاز دارد"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "شبکه بی‌سیم به تصدیق هویت نیاز دارد"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "ساخت یک شبکه بی‌سیم جدید"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "شبکه بی‌سیم جدید"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "نام شبکه بی‌سیمی را که می خواهید بسازید وارد کنید."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "اتصال به شبکه بی‌سیم مخفی "
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "شبکه‌های بی‌سیم مخفی"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -508,458 +601,370 @@ msgid ""
 msgstr ""
 "نام و جزئیات امنیتی شبکه مخفی که می‌خواهید به آن متصل شوید را وارد کنید."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "ا_منیت بی‌سیم:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "نام _شبکه:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "ا_رتباط:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "آ_داپتور بی‌سیم:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "اتصال %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "گواهینامه‌های DER یا PEM شامل (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "نادیده گرفتن گواهینامه‌ی CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "یک پرونده PAC انتخاب کنید..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "پرونده‌های PAC"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "تمام پرونده‌ها"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "ناشناس"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "تصدیق هویت شد"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "هر دو"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "هویت _ناشناس:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "_پرونده PAC:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "تصدیق هویت _درونی:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "استفاده از تامینِ خودکار PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_نام کاربری:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_گذرواژه:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "خودکار"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "نسخه ۰"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "نسخه ۱"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "نادیده گرفتن گواهینامه‌ی CA"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "ن_سخه PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "عبارت عبور وپ ۱۲۸ بیتی"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "_نمایش گذرواژه‌ها"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "نادیده گرفتن گواهینامه‌ی CA"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "_هویت:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "نادیده گرفتن گواهینامه‌ی CA"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "TLS تونل شده"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP محافظت شده (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "ناشناس"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_تصدیق هویت:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "گذرواژه کلید _خصوصی:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_نوع:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "سیستم باز"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "کلید به اشتراک گذاشته شده"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "۱ (پیش‌فرض)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_کلید:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "_نمایش کلید"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "_نمایه وپ:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "اتصال‌های شبکه خود را مدیریت کنید"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "اتصال‌های فعال شبکه"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "تنظیمات اتصال شبکه خود را مدیریت و تغییر دهید"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "غیرفعال‌سازی اعلان‌های برقراری ارتباط"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "برای غیرفعال‌سازی اعلان‌ها هنگام ارتباط با یک شبکه این قسمت را True تنظیم "
-#~ "کنید."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "غیرفعال‌سازی اعلان‌های قطع ارتباط"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "برای غیرفعال‌سازی اعلان‌ها در زمان قطع ارتباط از یک شبکه بر روی true تنظیم "
-#~ "کنید."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "غیرفعال‌سازی اعلان‌های وی‌پی‌ان"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "برای غیرفعال‌سازی اعلان‌ها در زمان قطع ارتباط یا اتصال به وی‌پی‌ان این قسمت "
-#~ "را True تنظیم کنید."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "اتصال %s"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "متوقف کردن اعلان‌های موجود شبکه‌ها"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "گواهینامه‌های DER یا PEM شامل (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "برای غیرفعال‌سازی اعلان‌ها در زمانی که شبکه‌های بی‌سیم در دسترس هستند این "
-#~ "قسمت را True تنظیم کنید."
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "کلیدهای خصوصی DER, PEM, یا PKCS#12 ی(*.der, *.pem, *.p12)"
 
-#~ msgid "Stamp"
-#~ msgstr "تمبر"
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "ا_منیت بی‌سیم:"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "جهت تشخیص اینکه آیا تنظیمات باید به نسخه جدید انتقال پیدا کنند یا خیر "
-#~ "مورد استفاده قرار می‌گیرد."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "نام _شبکه:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "غیرفعال‌سازی ساخت وای‌فای"
+msgid "C_onnection"
+msgstr "ا_رتباط:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "برای غیرفعال کردن شبکه‌های ادهاک زمانی که از برنامک استفاده می‌کنید گزینه "
-#~ "True را انتخاب کنید."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "آ_داپتور بی‌سیم:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "نادیده گرفتن گواهینامه‌ی CA"
+#~ msgid "Manage your network connections"
+#~ msgstr "اتصال‌های شبکه خود را مدیریت کنید"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "برای غیرفعال کردن هشدارهای مربوط به گواهینامه‌های CA در تصدیق‌هویت EAP "
-#~ "برروی true تنظیم کنید."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "اتصال‌های فعال شبکه"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "برای غیرفعال کردن هشدارهای مربوط به گواهینامه‌های CA در تصدیق‌هویت فاز ۲ از "
-#~ "EAP برروی true تنظیم کنید."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "تنظیمات اتصال شبکه خود را مدیریت و تغییر دهید"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/fi.po b/po/fi.po
index baef051e..df67bed4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2016-03-13 18:15+0200\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
@@ -28,6 +28,106 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.7\n"
 "X-POT-Import-Date: 2012-02-19 15:25:27+0000\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Älä näytä ilmoitusta kun yhteys muodostuu"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun kone etsii "
+"verkkoa."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Älä näytä ilmoitusta kun yhteys katkeaa"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun verkkoyhteys "
+"katkaistaan."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Poista VPN-ilmoitukset käytöstä"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun verkkoyhteys "
+"katkaistaan."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Älä näytä ilmoituksia saatavilla olevista verkoista"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun langattomia "
+"verkkoja on saatavilla."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Leima"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "Määrittää, tuodaanko asetukset uuteen versioon."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Estä Wi-Fi-luonti"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Aseta OIKEA estääksesi väliaikaisten verkkojen luonnin kun liitännäinen on "
+"käytössä"
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Näytä sovelma ilmoitusalueella"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+#, fuzzy
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "Näytä sovelma ilmoitusalueella"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Älä huomioi CA-varmennetta"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun kone etsii "
+"verkkoa."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun kone etsii "
+"verkkoa."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -74,44 +174,76 @@ msgstr "Salasana:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ei mitään)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A-varmenne"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Tuntematon"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+#, fuzzy
+msgid "Cancel"
+msgstr "_Peru"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "_CA-varmennetta ei vaadita"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Valitse CA-varmenne"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Y_ksityinen avain:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_Yksityisen avaimen salasana:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Valitse CA-varmenne"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_Käyttäjän varmenne:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Näytä _salasana"
 
@@ -123,36 +255,36 @@ msgstr "Oletus"
 msgid "My country is not listed"
 msgstr "Maani ei ole luettelossa"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Ei luettelossa"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Ei luettelossa…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Tarjoaja"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Asennettiin GSM-laite"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Asennettiin CDMA-laite"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Mikä tahansa laite"
 
@@ -286,53 +418,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Vahvista mobiililaajakaistan asetukset"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(ei mitään)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "C_A-varmenne"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Tuntematon"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-#, fuzzy
-msgid "Cancel"
-msgstr "_Peru"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Valitse CA-varmenne"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Käyttäjän varmenne:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Näy_tä salasanat"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -355,13 +440,27 @@ msgstr "Nimi"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Valitse CA-varmenne"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Käyttäjän varmenne:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Näy_tä salasanat"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Peru"
 
@@ -410,539 +509,460 @@ msgstr "_Toissijainen salasana:"
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Napsauta yhdistääksesi"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ei salausta"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-avain (hexa tai ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bittinen tunnuslause"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynaaminen WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 (henkilökohtainen)"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 (henkilökohtainen)"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Luo"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Yhdistä"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Salasanoja tai salausavaimia tarvitaan wifi-verkkoon ”%s” pääsemiseksi."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wifi-verkon salaustiedot vaaditaan"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wifi-verkko vaatii salaustietoja"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Luo uusi wifi-verkko"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Uusi wifi-verkko"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Syötä sen wifi-verkon nimi, jonka haluat luoda."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Yhdistä piilotettuun wifi-verkkoon"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Piilotettu wifi-verkko"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "Syötä yhdistettävän piilotetun wifi-verkon nimi ja salaustiedot."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Wifi-tietoturva:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Verkon nimi:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Yh_teys:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Wifi-verkkol_aite:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s (yhteys)"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER- tai PEM-varmenteet (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr "DER-, PEM- tai PKCS#12-yksityisavaimet (*.der, *.pem, *.p12, *.key)"
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "_CA-varmennetta ei vaadita"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "puuttuva EAP-FAST PAC -tiedosto"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Valitse PAC-tiedosto..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-tiedostot (* .pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonyymi"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Todennettu"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Molemmat"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Anonyy_mi identiteetti:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC-_tiedosto:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_Sisempi tunnistautuminen:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Salli automaattinen PAC-hankinta"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "puuttuva EAP-LEAP-käyttäjätunnus"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "puuttuva EAP-LEAP-salasana"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Käyttäjänimi:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Salasana:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versio 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versio 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "_CA-varmennetta ei vaadita"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP-_versio:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "puuttuva EAP-käyttäjätunnus"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "puuttuva EAP-salasana"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bittinen tunnuslause"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Näy_tä salasanat"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "_CA-varmennetta ei vaadita"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_dentiteetti:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "_CA-varmennetta ei vaadita"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "NOPEA"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunneloitu TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Suojattu EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Todentaminen:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "puuttuva EAP-salasana"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Tyyppi:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "wep-avain puuttuu"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Avoin järjestelmä"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Jaettu avain"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (oletus)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Avain:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Nä_ytä avain"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP-inde_ksi"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Hallitse verkkoyhteyksiä"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Aktiiviset verkkoyhteydet"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Hallitse ja muuta verkkoyhteyksien asetuksia"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Älä näytä ilmoitusta kun yhteys muodostuu"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s (yhteys)"
 
+#: src/utils/utils.c:535
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun kone etsii "
-#~ "verkkoa."
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER- tai PEM-varmenteet (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Älä näytä ilmoitusta kun yhteys katkeaa"
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER-, PEM- tai PKCS#12-yksityisavaimet (*.der, *.pem, *.p12, *.key)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun verkkoyhteys "
-#~ "katkaistaan."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Poista VPN-ilmoitukset käytöstä"
+msgid "Wi-Fi _security"
+msgstr "_Wifi-tietoturva:"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun verkkoyhteys "
-#~ "katkaistaan."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Älä näytä ilmoituksia saatavilla olevista verkoista"
+msgid "_Network name"
+msgstr "_Verkon nimi:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun langattomia "
-#~ "verkkoja on saatavilla."
-
-#~ msgid "Stamp"
-#~ msgstr "Leima"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "Määrittää, tuodaanko asetukset uuteen versioon."
+msgid "C_onnection"
+msgstr "Yh_teys:"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Estä Wi-Fi-luonti"
+msgid "Wi-Fi _adapter"
+msgstr "Wifi-verkkol_aite:"
 
-#, fuzzy
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Aseta OIKEA estääksesi väliaikaisten verkkojen luonnin kun liitännäinen "
-#~ "on käytössä"
+#~ msgid "Manage your network connections"
+#~ msgstr "Hallitse verkkoyhteyksiä"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Näytä sovelma ilmoitusalueella"
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Aktiiviset verkkoyhteydet"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Älä huomioi CA-varmennetta"
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Hallitse ja muuta verkkoyhteyksien asetuksia"
 
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
diff --git a/po/fr.po b/po/fr.po
index 45b123d9..844283a2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet 1.8.22\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-10-21 16:12+0200\n"
 "Last-Translator: Charles Monzat <charles monzat free fr>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
@@ -31,6 +31,101 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 3.34.0\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Désactiver les notifications de connexion"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Définir ce paramètre à vrai (true) pour désactiver les notifications lors de "
+"la connexion à un réseau."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Désactiver les notifications de déconnexion"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Définir ce paramètre à vrai (true) pour désactiver les notifications lors de "
+"la déconnexion d’un réseau."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Désactiver les notifications VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Définir ce paramètre à vrai (true) pour désactiver les notifications lors de "
+"la connexion ou déconnexion à un VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Désactiver les notifications de disponibilité de réseaux sans fil"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Définir ce paramètre à vrai (true) pour désactiver les notifications lors de "
+"la disponibilité de réseaux Wi-Fi."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Marque"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Sert à déterminer si les paramètres doivent être migrés dans une nouvelle "
+"version."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Désactiver la création Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Définir ce paramètre à vrai (true) pour désactiver la création de réseau "
+"adhoc lors de l’utilisation de l’applet."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Afficher l’applet dans la zone de notification"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Définir ce paramètre à faux (false) pour désactiver l’affichage de l’applet "
+"dans la zone de notification."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignorer le certificat de CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Définir ce paramètre à vrai (true) pour désactiver les avertissements à "
+"propos des certificats CA dans l’authentification EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+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."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -86,43 +181,72 @@ msgstr "Mot de passe"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr "Scannez avec votre portable ou <a href=\"nma:print\">Print</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(aucun)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Clé dans %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificat dans %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(inconnu)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Sélectionner"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Choisir à partir d’un fichier…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Aucun certificat défini"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Aucune clé définie"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Choisissez une clé pour le certificat %s"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "_Clé privée %s"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "_Mot de passe de la clé %s"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Choisissez le certificat %s"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "_Certificat %s"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "A_fficher le mot de passe"
 
@@ -134,35 +258,35 @@ msgstr "Par défaut"
 msgid "My country is not listed"
 msgstr "Mon pays n’est pas dans la liste"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Pas dans la liste"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Mon forfait ne figure pas dans la liste…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Fournisseur"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Périphérique GSM installé"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Périphérique CDMA installé"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "N’importe quel appareil"
 
@@ -294,50 +418,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmation des paramètres de connexion mobile"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(aucun)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Clé dans %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Certificat dans %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(inconnu)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Sélectionner"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Annuler"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Choisir à partir d’un fichier…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Choisissez un certificat %s"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "_Mot de passe du certificat %s"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "A_fficher les mots de passe"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Erreur de connexion :"
@@ -358,13 +438,27 @@ msgstr "Nom"
 msgid "Issued By"
 msgstr "Émis par"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Choisissez un certificat %s"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Mot de passe du certificat %s"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "A_fficher les mots de passe"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Saisissez le PIN %s"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "A_nnuler"
 
@@ -412,56 +506,56 @@ msgstr "Mot de passe _secondaire :"
 msgid "_Password:"
 msgstr "_Mot de passe :"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Cliquer pour se connecter"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Nouveau…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Aucune"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clé WEP 40/128-bit (Hex ou ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit à phrase secrète"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dynamique (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA et WPA2 personnel"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA et WPA2 entreprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 msgid "WPA3 Personal"
 msgstr "WPA3 personnel"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_réer"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "Se _connecter"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -469,35 +563,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/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Authentification nécessaire pour le réseau Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Authentification demandée par le réseau Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Création d’un nouveau réseau Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nouveau réseau Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connexion au réseau Wi-Fi invisible"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Réseau Wi-Fi invisible"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -505,295 +599,249 @@ msgstr ""
 "Saisissez le nom et les détails de sécurité du réseau Wi-Fi invisible auquel "
 "vous voulez vous connecter."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "_Sécurité Wi-Fi"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Nom du réseau"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "Co_nnexion"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "Ad_aptateur Wi-Fi"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Connexion à %s"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certificats PEM (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "erreur de sécurité 802.1X (WPA-EAP) indéfinie"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "aucun certificat sélectionné"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "le fichier de certificat CA n’existe pas"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "fichier EAP-FAST PAC manquant"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Choisir un fichier PAC…"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Fichier PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Authentifié"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Les deux"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Identité anony_me"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "Fichier _PAC"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "Authentification i_nterne"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "P_ermettre le provisionnement PAC automatique"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "nom d’utilisateur EAP-LEAP manquant"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "mot de passe EAP-LEAP manquant"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "Nom d’_utilisateur"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Mot de passe"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Version 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Version 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Aucun certificat d’AC n’est _requis"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "Version de _PEAP"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Suffixe du nom de certificat serveur."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Domaine"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "nom d’utilisateur EAP manquant"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "mot de passe EAP manquant"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "phrase de passe de clé privée cliente EAP manquante"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "Phrase de passe de clé p_rivée"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "A_fficher la phrase de passe"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "identité EAP-TLS manquante"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "aucun certificat utilisateur sélectionné"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "le fichier de certificat utilisateur sélectionné n’existe pas"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "aucune clé sélectionnée"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "le fichier de clé sélectionné n’existe pas"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "I_dentité"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (non EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Erreur inconnue lors de la validation de sécurité 802.1X"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "erreur de sécurité 802.1X (WPA-EAP) indéfinie"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "aucun certificat sélectionné"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "le fichier de certificat CA n’existe pas"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Inconnue"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Configurée de façon externe"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "Au_thentification"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "nom d’utilisateur LEAP manquant"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "mot de passe LEAP manquant"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 msgid "missing password"
 msgstr "mot de passe manquant"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Type"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "clé WEP manquante"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "clé WEP invalide : les clés de longueur %zu ne peuvent contenir que des "
 "chiffres hexadécimaux"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -801,7 +849,7 @@ msgstr ""
 "clé WEP invalide : les clés de longueur %zu ne peuvent contenir que des "
 "caractères ASCII"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -810,41 +858,41 @@ msgstr ""
 "clé WEP invalide : longueur de clé %zu non valide. La longueur d’une clé "
 "doit être soit de 5/13 (ASCII), soit de 10/26 (hexa)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "clé WEP invalide : la phrase de passe ne peut pas être vide"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "clé WEP invalide : la phrase de passe doit avoir une taille inférieure à 64 "
 "caractères"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Système ouvert"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "À clé partagée"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (par défaut)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Clé"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "A_fficher la clé"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "Inde_x WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -853,12 +901,46 @@ msgstr ""
 "WPA-PSK invalide : longueur de clé %zu non valide. Doit être de [8,63] "
 "octets ou 64 chiffres hexa"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "WPA-PSK invalide : impossible d’interpréter une clé de 64 octets en "
 "hexadécimal"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Erreur inconnue lors de la validation de sécurité 802.1X"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Connexion à %s"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certificats PEM (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+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/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "_Sécurité Wi-Fi"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Nom du réseau"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "Co_nnexion"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Ad_aptateur Wi-Fi"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Gérer vos connexions réseau"
 
@@ -874,89 +956,6 @@ msgstr ""
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Désactiver les notifications de connexion"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Définir ce paramètre à vrai (true) pour désactiver les notifications lors "
-#~ "de la connexion à un réseau."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Désactiver les notifications de déconnexion"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Définir ce paramètre à vrai (true) pour désactiver les notifications lors "
-#~ "de la déconnexion d’un réseau."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Désactiver les notifications VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Définir ce paramètre à vrai (true) pour désactiver les notifications lors "
-#~ "de la connexion ou déconnexion à un VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Désactiver les notifications de disponibilité de réseaux sans fil"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Définir ce paramètre à vrai (true) pour désactiver les notifications lors "
-#~ "de la disponibilité de réseaux Wi-Fi."
-
-#~ msgid "Stamp"
-#~ msgstr "Marque"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Sert à déterminer si les paramètres doivent être migrés dans une nouvelle "
-#~ "version."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Désactiver la création Wi-Fi"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Définir ce paramètre à vrai (true) pour désactiver la création de réseau "
-#~ "adhoc lors de l’utilisation de l’applet."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Afficher l’applet dans la zone de notification"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Définir ce paramètre à faux (false) pour désactiver l’affichage de "
-#~ "l’applet dans la zone de notification."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignorer le certificat de CA"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Définir ce paramètre à vrai (true) pour désactiver les avertissements à "
-#~ "propos des certificats CA dans l’authentification EAP."
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ 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."
-
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
 
diff --git a/po/gd.po b/po/gd.po
index 6a8bf8d3..fd3497a3 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eog\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2017-03-09 15:27+0100\n"
 "Last-Translator: GunChleoc <fios foramnagaidhlig net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
@@ -21,6 +21,102 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-09-15 06:24+0000\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Cur à comas brathan a dh'innseas gun deach ceangal a dhèanamh"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Tagh TRUE airson seo mur eil thu ag iarraidh brathan nuair a cheanglas tu ri "
+"lìonra."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Cur à comas brathan a dh'innseas gun deach ceangal a bhriseadh"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Tagh TRUE airson seo mur eil thu ag iarraidh brathan nuair a bhriseas tu an "
+"ceangal ri lìonra."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Cuir à comas brathan VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Tagh TRUE airson seo mur eil thu ag iarraidh brathan nuair a cheanglas tu ri "
+"VPN no nuair a bhriseas tu an ceangal ris."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Mùch brathan mu lìonraidhean a tha ri làimh"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Tagh TRUE airson seo mur eil thu ag iarraidh brathan nuair a bhios "
+"lìonraidhean Wi-Fi ri làimh."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Stampa"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Thèid seo a chleachdadh gus co-dhùnadh an dèid na roghainnean imrich gu "
+"tionndadh ùr gus nach dèid."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Cur à comas cruthachadh Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Tagh TRUE airson seo ma tha thu airson casg a chur air cruthachadh de "
+"lìonraidhean ad-hoc nuair a chleachdar an aplaid."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Seall an aplaid ann an raon nam brathan"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Tagh FALSE air a shon mur eil thu airson an aplaid fhaicinn ann an raon nam "
+"brathan."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Leig seachad an teisteanas CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Tagh TRUE air a shon mur eil thu ag iarraidh rabhaidhean mu theisteanasan CA "
+"ann an dearbhadh EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Tagh TRUE air a shon mur eil thu ag iarraidh rabhaidhean mu theisteanasan CA "
+"ann an ceum 2 dhen dearbhadh EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -67,44 +163,77 @@ msgstr "Facal-faire:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(chan eil gin)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Teisteanas C_A:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Neo-aithnichte"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+#, fuzzy
+msgid "Cancel"
+msgstr "S_guir dheth"
+
+#: src/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Ion-phortaich sgriobt o fhaidhle..."
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Chan eil teisteanas CA _riatanach"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Tagh teisteanas CA"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "_Iuchair phrìobhaideach"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Facal-faire na h-iuchrach _phrìobhaideach"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Tagh teisteanas CA"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_Teisteanas a' chleachdaiche:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Sea_ll am facal-faire"
 
@@ -116,35 +245,35 @@ msgstr "Bun-roghainn"
 msgid "My country is not listed"
 msgstr "Chan eil mo dhùthaich air an liosta"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Neo-liostaichte"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Chan eil am plana agam air an liosta..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Solaraiche"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Uidheam GSM stàlaichte"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Uidheam CDMA  stàlaichte"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Uidheam sam bith"
 
@@ -280,54 +409,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Dearbh roghainnean a' bhann-leathainn mobile"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(chan eil gin)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Teisteanas C_A:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Neo-aithnichte"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-#, fuzzy
-msgid "Cancel"
-msgstr "S_guir dheth"
-
-#: src/nma-cert-chooser-button.c:460
-#, fuzzy
-msgid "Select from file…"
-msgstr "Ion-phortaich sgriobt o fhaidhle..."
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Tagh teisteanas CA"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Teisteanas a' chleachdaiche:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Sea_ll na faclan-faire"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -350,13 +431,27 @@ msgstr "Ainm"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Tagh teisteanas CA"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Teisteanas a' chleachdaiche:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Sea_ll na faclan-faire"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "S_guir dheth"
 
@@ -404,57 +499,57 @@ msgstr "_Facal-faire dàrnach:"
 msgid "_Password:"
 msgstr "_Facal-faire:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Briog airson ceangal"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Ùr..."
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Chan eil gin"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Iuchair WEP 40/128-bit (Hex no ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Abairt-fhaire WEP 128-bit"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ⁊ WPA2 pearsanta"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA ⁊ WPA2 pearsanta"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_ruthaich"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "C_eangail"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -462,36 +557,36 @@ msgstr ""
 "Tha feum air faclan-faire no iuchraichean crioptachaidh mus fhaighear "
 "cothrom air an lìonra Wi-Fi \"%s\"."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Tha feum air dearbhadh lìonra Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Tha an lìonra Wi-Fi ag iarraidh dearbhadh"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Cruthaich lìonra Wi-Fi ùr"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Lìonra Wi-Fi ùr"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 "Cuir a-steach ainm airson an lìonra Wi-Fi a tha thu airson cruthachadh."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Ceangail ri lìonra Wi-Fi falaichte"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Lìonra Wi-Fi falaichte"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -499,316 +594,264 @@ msgstr ""
 "Cuir a-steach ainm agus fiosrachadh tèarainteachd an lìonraidh Wi-Fi "
 "fhalaichte a tha thu airson ceangal ris."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Tèarainteachd Wi-Fi:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "Ainm an _lìonraidh:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "C_eangal:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "_Adaptar Wi-Fi:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "ceangal %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Teisteanasan DER no PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "mearachd gun sònrachadh san tèarainteachd 802.1X (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Chan eil teisteanas CA _riatanach"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "tha faidhle EAP-FAST PAC a dhìth"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Tagh faidhle PAC"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Faidhlichean PAC  (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "A h-uile faidhle"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Gun urra"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Dearbhaichte"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "An dà chuid"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Dearbh-aithne gun _urra"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "_Faidhle PAC:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_Inner Authentication:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Ceadaich PAC _Provisioning fèin-obrachail"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "tha ainm-cleachdaiche EAP-LEAP a dhìth"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "tha facal-faire EAP-LEAP a dhìth"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Ainm-cleachdaiche:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Facal-faire:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Gu fèin-obrachail"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Tionndadh 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Tionndadh 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Chan eil teisteanas CA _riatanach"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "_Tionndadh PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "tha ainm-cleachdaiche EAP a dhìth"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "tha facal-faire EAP a dhìth"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Abairt-fhaire WEP 128-bit"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Sea_ll na faclan-faire"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "tha dearbh-aithne EAP-TLS a dhìth"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "cha deach faidhle a thaghadh"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 #, fuzzy
 msgid "no key selected"
 msgstr "cha deach faidhle a thaghadh"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "D_earbh-aithne:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (gun EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Mearachd nach aithne dhuinn le dearbhadh na tèarainteachd 802.1X"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "mearachd gun sònrachadh san tèarainteachd 802.1X (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Chan eil teisteanas CA _riatanach"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Neo-aithnichte"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "De_arbhadh:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "tha ainm-cleachdaiche leap a dhìth"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "tha facal-faire leap a dhìth"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "tha facal-faire EAP a dhìth"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Seòrsa:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "tha iuchair wep a dhìth"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "tha an iuchair wep mì-dhligheach: chan fhaod ach figearan sia-dheicheach a "
 "bhith am broinn iuchair a tha %zu a dh'fhaid"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -816,7 +859,7 @@ msgstr ""
 "tha an iuchair wep mì-dhligheach: chan fhaod ach caractaran ASCII a bhith am "
 "broinn iuchair a tha %zu a dh'fhaid"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -825,44 +868,44 @@ msgstr ""
 "tha an iuchair wep mì-dhligheach: tha faide na iuchrach %zu cearr. Feumaidh "
 "iuchair a bith 5/13 (ascii) no 10/26 (sia-dheicheach) a dh'fhaid"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 "tha an iuchair wep mì-dhligheach: chan fhaod an abairt-fhaire a bhith falamh"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "tha an iuchair wep mì-dhligheach: chan fhaod an abairt-fhaire a bhith nas "
 "giorra na 64 caractar"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Siostam fosgailte"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Iuchair cho-roinnte"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Bun-roghainn)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Iuchair:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Se_all an iuchair"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "Clàr-a_mais WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -871,105 +914,61 @@ msgstr ""
 "wpa-psk mì-dhligheach: tha faide na h-iuchrach %zu mì-dhligheach. Feumaidh i "
 "bhith [8,63] baidht no 64 figear sia-dheicheach"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk mì-dhligheach: cha ghabh an iuchair tuigsinn mar àireamh shia-"
 "dheicheach a tha 43 baidht a dh'fhaid"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Stiùirich na ceanglaichean agad ris an eadar-lìon"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Ceanglaichean lìonraidh a tha an gnìomh"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Stiùirich is atharraich roghainnean a' cheangail agad ris an lìonra"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Cur à comas brathan a dh'innseas gun deach ceangal a dhèanamh"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Tagh TRUE airson seo mur eil thu ag iarraidh brathan nuair a cheanglas tu "
-#~ "ri lìonra."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Cur à comas brathan a dh'innseas gun deach ceangal a bhriseadh"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Tagh TRUE airson seo mur eil thu ag iarraidh brathan nuair a bhriseas tu "
-#~ "an ceangal ri lìonra."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Cuir à comas brathan VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Tagh TRUE airson seo mur eil thu ag iarraidh brathan nuair a cheanglas tu "
-#~ "ri VPN no nuair a bhriseas tu an ceangal ris."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Mùch brathan mu lìonraidhean a tha ri làimh"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Mearachd nach aithne dhuinn le dearbhadh na tèarainteachd 802.1X"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Tagh TRUE airson seo mur eil thu ag iarraidh brathan nuair a bhios "
-#~ "lìonraidhean Wi-Fi ri làimh."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "ceangal %s"
 
-#~ msgid "Stamp"
-#~ msgstr "Stampa"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Teisteanasan DER no PEM (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Thèid seo a chleachdadh gus co-dhùnadh an dèid na roghainnean imrich gu "
-#~ "tionndadh ùr gus nach dèid."
+#: src/utils/utils.c:547
+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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Cur à comas cruthachadh Wi-Fi"
+msgid "Wi-Fi _security"
+msgstr "_Tèarainteachd Wi-Fi:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Tagh TRUE airson seo ma tha thu airson casg a chur air cruthachadh de "
-#~ "lìonraidhean ad-hoc nuair a chleachdar an aplaid."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "Ainm an _lìonraidh:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Seall an aplaid ann an raon nam brathan"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "C_eangal:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Tagh FALSE air a shon mur eil thu airson an aplaid fhaicinn ann an raon "
-#~ "nam brathan."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptar Wi-Fi:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Leig seachad an teisteanas CA"
+#~ msgid "Manage your network connections"
+#~ msgstr "Stiùirich na ceanglaichean agad ris an eadar-lìon"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Tagh TRUE air a shon mur eil thu ag iarraidh rabhaidhean mu theisteanasan "
-#~ "CA ann an dearbhadh EAP."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Ceanglaichean lìonraidh a tha an gnìomh"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Tagh TRUE air a shon mur eil thu ag iarraidh rabhaidhean mu theisteanasan "
-#~ "CA ann an ceum 2 dhen dearbhadh EAP."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Stiùirich is atharraich roghainnean a' cheangail agad ris an lìonra"
 
 #~ msgid "NetworkManager"
 #~ msgstr "Manaidsear lìonraidh"
diff --git a/po/gl.po b/po/gl.po
index 2a766d47..9df66e8f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2017-07-29 21:30+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: Galician\n"
@@ -26,6 +26,102 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Desactivar as notificacións de conexión"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Estabeleza isto a certo para desactivar as notificacións ao conectarse a "
+"unha rede."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Desactivar as notificacións de desconexión"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Estabeleza isto a certo para desactivar as notificacións ao desconectarse de "
+"unha rede."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Desactivar as notificacións de VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Estabeleza isto a certo para desactivar as notificacións ao desconectarse a "
+"unha VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Eliminar as notificacións de redes dispoñíbeis"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Estabeleza isto a certo para desactivar as notificacións cando hai redes sen "
+"fíos dispoñíbeis."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Marca de tempo"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Empregado para determinar se as configuracións deberían ser migradas á nova "
+"versión."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Desactivar a creación de rede sen fíos"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Estabeleza isto a certo para desactivar a creación de redes sen fíos adhoc "
+"ao usar o miniaplicativo."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Mostrar o miniaplicativo na área de notificacións"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Estabelecer a FALSE para desactivar mostrar o miniaplicativo na área de "
+"notificacións."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignorar certificado AC"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Estabelecer isto a certo para desactivar as notificacións sobre certificados "
+"CA en autenticación EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Estabelecer isto a certo para desactivar as notificacións sobre certificados "
+"CA na fase 2 da autenticación EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -79,43 +175,72 @@ msgstr "Contrasinal:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Ningún)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Clave en %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificado en %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Descoñecido)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Seleccionar"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Seleccionar dun ficheiro..."
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Non hai un certificado estabelecido"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Non hai unha clave estabelecida"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Seleccionar unha clave para o certificado %s"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "_Clave privada de %s:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Contrasinal da _clave %s:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Seleccionar o certificado %s"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_Certificado de %s:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Mos_trar o contrasinal"
 
@@ -127,35 +252,35 @@ msgstr "Predeterminado"
 msgid "My country is not listed"
 msgstr "O meu país non está na lista"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Sen listar"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "O meu plan non está listado..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Provedor"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalado"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalado"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Calquera dispositivo"
 
@@ -288,50 +413,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirme as preferencias da conexión de banda larga móbil"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Ningún)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Clave en %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Certificado en %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Descoñecido)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Seleccionar"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Seleccionar dun ficheiro..."
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Seleccione un Certificado %s"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Contrasinal do certificado %s:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Mos_trar os contrasinais"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Produciuse un erro iniciando sesión en: "
@@ -352,13 +433,27 @@ msgstr "Nome"
 msgid "Issued By"
 msgstr "Emitido por"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Seleccione un Certificado %s"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Contrasinal do certificado %s:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Mos_trar os contrasinais"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Introducir o PIN de %s"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -406,57 +501,57 @@ msgstr "Contrasinal _secundario:"
 msgid "_Password:"
 msgstr "_Contrasinal:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Prema para conectar"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Novo…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ningún"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clave WEP de 40/128 bits (Hexadecimal ou ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase de paso WEP 128-bit"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinámica (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Persoal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Empresarial"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Persoal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_rear"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -464,35 +559,35 @@ msgstr ""
 "Requírese o contrasinal ou clave de cifrado para acceder á rede sen fíos "
 "«%s»."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Requírese a autenticación para a rede sen fíos"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "A rede sen fíos require autenticación"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Crear unha rede sen fíos"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Rede sen fíos nova"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Conectarse a unha rede sen fíos oculta"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Rede sen fíos oculta"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -500,312 +595,262 @@ msgstr ""
 "Escriba o nome e os detalles de seguranza da rede sen fíos á que quere "
 "conectarse."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Seguranza sen fíos:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "Nome da _rede:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Co_nexión:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "_Adaptador sen fíos:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Conexión %s"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certificados PEM (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr "Claves privadas DER, PEM, ou PKCS#12 (*.der, *.pem, *.p12, *.key)"
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "produciuse un erro sen definir na seguranza 802.1X (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "non seleccionou ningún certificado CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "o certificado CA seleccionado non existe"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "Falta o ficheiro EAP-FAST PAC"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Seleccione un ficheiro PAC"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Ficheiros PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenticado"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Ambos"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Identidade anóni_ma:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "Ficheiro _PAC:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Autenticación i_nterna:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir a provisión PAC _automática"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "Falta o nome do usuario do EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "Falta o contrasinal do EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "Nome de _usuario:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Contrasinal:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versión 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versión 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Non se p_recisa un certificado CA"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "Versión _PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Sufixo do nome do certificado do servidor."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 #, fuzzy
 msgid "_Domain"
 msgstr "_Dominio:"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "Falta o nome do usuario EAP"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "Falta o contrasinal EAP"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Contrasinal de chave _privada:"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "M_ostrar os contrasinais"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "Falta a identidade EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "ningún certificado de usuario seleccionado"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "o certificado de usuario seleccionado non existe"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "non seleccionou ningunha clave"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "a clave seleccionada non existe"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_dentidade:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (non EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Produciuse un erro descoñecido validando a seguranza 802.1X"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "produciuse un erro sen definir na seguranza 802.1X (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "non seleccionou ningún certificado CA"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "o certificado CA seleccionado non existe"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "TLS por medio de túnel"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protexido (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Descoñecida"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_Autenticación:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "Falta o nome do usuario do leap"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "Falta o contrasinal do leap"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Falta o contrasinal EAP"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Tipo:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "Falta a clave wep"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "Clave wep incorrecta: as claves cunha lonxitude de %zu deben conter só "
 "díxitos hexadecimais"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -813,7 +858,7 @@ msgstr ""
 "Clave wep incorrecta: as claves cunha lonxitude de %zu deben conter só "
 "caracteres ascii"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -822,41 +867,41 @@ msgstr ""
 "Clave wep incorrecta: a lonxitude da clave %zu é incorrecta. Unha clave debe "
 "ter unha lonxitude de 5/13 (ascii) ou 10/26 (hexadecimal)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "Clave wep incorrecta: a frase de paso non pode quedar baleira"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "Clave wep incorrecta: a frase de paso debe ser menor de 64 caracteres"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema aberto"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Clave compartida"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Predeterminada)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Clave:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Mo_strar a clave"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "Índic_e WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -865,105 +910,59 @@ msgstr ""
 "wpa-psk incorrecta: a lonxitude da clave %zu é incorrecta. Debe ser [8,63] "
 "bytes ou 64 díxitos hexadecimais"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk incorrecta: non é posíbel interpretar unha clave con 64 bytes como "
 "hexadecimal"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Xestione as súas conexións de rede"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Configuración sen elaborar"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Xestione e cambie as súas configuracións de conexión de rede"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Desactivar as notificacións de conexión"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Estabeleza isto a certo para desactivar as notificacións ao conectarse a "
-#~ "unha rede."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Desactivar as notificacións de desconexión"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Estabeleza isto a certo para desactivar as notificacións ao desconectarse "
-#~ "de unha rede."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Desactivar as notificacións de VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Estabeleza isto a certo para desactivar as notificacións ao desconectarse "
-#~ "a unha VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Eliminar as notificacións de redes dispoñíbeis"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Produciuse un erro descoñecido validando a seguranza 802.1X"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Estabeleza isto a certo para desactivar as notificacións cando hai redes "
-#~ "sen fíos dispoñíbeis."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Conexión %s"
 
-#~ msgid "Stamp"
-#~ msgstr "Marca de tempo"
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certificados PEM (*.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Empregado para determinar se as configuracións deberían ser migradas á "
-#~ "nova versión."
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "Claves privadas DER, PEM, ou PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Desactivar a creación de rede sen fíos"
+msgid "Wi-Fi _security"
+msgstr "_Seguranza sen fíos:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Estabeleza isto a certo para desactivar a creación de redes sen fíos "
-#~ "adhoc ao usar o miniaplicativo."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "Nome da _rede:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Mostrar o miniaplicativo na área de notificacións"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Co_nexión:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Estabelecer a FALSE para desactivar mostrar o miniaplicativo na área de "
-#~ "notificacións."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptador sen fíos:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignorar certificado AC"
+#~ msgid "Manage your network connections"
+#~ msgstr "Xestione as súas conexións de rede"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Estabelecer isto a certo para desactivar as notificacións sobre "
-#~ "certificados CA en autenticación EAP."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Configuración sen elaborar"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Estabelecer isto a certo para desactivar as notificacións sobre "
-#~ "certificados CA na fase 2 da autenticación EAP."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Xestione e cambie as súas configuracións de conexión de rede"
 
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
diff --git a/po/gu.po b/po/gu.po
index 9b72b72d..703b4788 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gu\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2014-09-01 21:44+0530\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc kde org>\n"
@@ -20,6 +20,105 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "જોડાયેલ સૂચનાઓને નિષ્ક્રિય કરો"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"જ્યારે નેટવર્ક ને જોડી રહ્યા હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE તરીકે સુયોજિત "
+"કરો."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "જોડાયેલ નહિં હોય તેવી સૂચનાઓને નિષ્ક્રિય કરો"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"જ્યારે નેટવર્ક માંથી જોડાણને તોડી રહ્યા હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE "
+"તરીકે સુયોજિત કરો."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "VPN સૂચનાઓને નિષ્ક્રિય કરો"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"જ્યારે નેટવર્ક માંથી જોડાણને તોડી રહ્યા હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE "
+"તરીકે સુયોજિત કરો."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "નેટવર્ક ઉપલબ્ધ સૂચનાઓને દાબી દો"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"જ્યારે નેટવર્કો ઉપલ્બધ હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE તરીકે સુયોજિત કરો."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "સ્ટૅમ્પ"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "નક્કી કરવા માટે વાપરેલ છે ક્યાંતો સુયોજનો અ નવી આવૃત્તિમાં સ્થળાંતર થયેલ હોવા જોઇએ."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Wi-Fi બનાવવાનું નિષ્ક્રિય કરો"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, 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:36
+msgid "Show the applet in notification area"
+msgstr "સૂચન વિસ્તારમાં ઍપલેટને બતાવો"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+#, fuzzy
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "સૂચન વિસ્તારમાં ઍપલેટને બતાવો"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA પ્રમાણપત્રને અવગણો"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"જ્યારે નેટવર્ક ને જોડી રહ્યા હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE તરીકે સુયોજિત "
+"કરો."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"જ્યારે નેટવર્ક ને જોડી રહ્યા હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE તરીકે સુયોજિત "
+"કરો."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -66,44 +165,75 @@ msgstr "પાસવર્ડ:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(કંઇ નહિં)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA પ્રમાણપત્ર (_A):"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "અજ્ઞાત"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "ખાનગી કી (_k):"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "ખાનગી કી પાસવર્ડ (_P):"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "વપરાશકર્તા પ્રમાણપત્ર (_U):"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "પાસવર્ડને બતાવો (_w)"
 
@@ -115,36 +245,36 @@ msgstr "મૂળભૂત"
 msgid "My country is not listed"
 msgstr "મારો દેશ યાદી થયેલ નથી"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "યાદી ન થયેલ"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "મારો પ્લાન યાદી થયેલ નથી..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "પોષણકર્તા"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "સ્થાપિત થયેલ GSM ઉપકરણ"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "સ્થાપિત થયેલ CDMA ઉપકરણ"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "કોઇપણ ઉપકરણ"
 
@@ -278,52 +408,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "મોબાઇલ બ્રોડબેન્ડ સુયોજનોની ખાતરી કરો"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(કંઇ નહિં)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "CA પ્રમાણપત્ર (_A):"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "અજ્ઞાત"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "વપરાશકર્તા પ્રમાણપત્ર (_U):"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "પાસવર્ડોને બતાવો (_w)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -346,13 +430,27 @@ msgstr "નામ"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "વપરાશકર્તા પ્રમાણપત્ર (_U):"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "પાસવર્ડોને બતાવો (_w)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -405,93 +503,93 @@ msgstr "ગૌણ પાસવર્ડ (_S):"
 msgid "_Password:"
 msgstr "પાસવર્ડ (_P):"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "જોડાણ તોડી નાંખો"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "કંઇ નહિં"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit કી (Hex અથવા ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-બીટ પાસફ્રેઝ"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ગતિક WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 વ્યક્તિગત"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 એન્ટરપ્રાઇઝ"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 વ્યક્તિગત"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "બનાવો (_r)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "જોડાવો (_o)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "પાસવર્ડ અથવા એનક્રિપ્શન કીને Wi-Fi નેટવર્ક '%s' ને વાપરવાની જરૂર છે."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi નેટવર્ક સત્તાધિકરણ જરૂરી"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi નેટવર્ક દ્દારા સત્તાધિકરણ જરૂરી"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "નવાં Wi-Fi નેટવર્કને બનાવો"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "નવું Wi-Fi નેટવર્ક"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Wi-Fi નેટવર્ક માટે નામને દાખલ કરો જે તમે બનાવવા ઇચ્છો છો."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "છુપાયેલ Wi-Fi નેટવર્ક સાથે જોડાવો"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "છુપાયેલ Wi-Fi નેટવર્ક"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -499,448 +597,368 @@ msgid ""
 msgstr ""
 "તમે તેમાં જોડાવવા માંગો છો તે છુપાયેલ વાયરલેસ નેટવર્કનાં નામ અને સુરક્ષા વિગતોને દાખલ કરો."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "વાયરલેસ સુરક્ષા (_s):"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "નેટવર્ક નામ (_N):"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "જોડાણ (_n):"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Wi-Fi એડપ્ટર (_a):"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s જોડાણ"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER અથવા PEM પ્રમાણપત્રો (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC ફાઇલને પસંદ કરો..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ફાઇલો (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "બધી ફાઇલો"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "અનામિક"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "સત્તાધિકરણ"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "બંને"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "અવ્યવસ્થિત રીતે ઓળખો (_m):"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC ફાઇલ (_f):"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "આંતરિક સત્તાધિકરણ (_I):"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "આપોઆપ PAC બચાવ માટે પરવાનગી આપે છે (_v)"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "વપરાશકર્તા નામ (_U):"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "પાસવર્ડ (_P):"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "આપોઆપ"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "આવૃત્તિ 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "આવૃત્તિ 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP આવૃત્તિ (_v):"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-બીટ પાસફ્રેઝ"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "પાસવર્ડોને બતાવો (_o)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "ઓળખાણપત્ર (_d):"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "ટનલ થયેલ TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "સુરક્ષિત થયેલ EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "સત્તાધિકરણ (_t):"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "ખાનગી કી પાસવર્ડ (_P):"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "પ્રકાર (_T):"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "સિસ્ટમને ખોલો"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "વહેંચાયેલ કી"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (મૂળભૂત)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "કી (_K):"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "કીને બતાવો (_w)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP અનુક્રમણિકા (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "તમારા નેટવર્ક જોડાણોને સંચાલિત કરો"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "નેટવર્ક જોડાણો સક્રિય કરો"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "તમારા નેટવર્ક જોડાણ સુયોજનોને બદલો અને સંચાલિત કરો"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "જોડાયેલ સૂચનાઓને નિષ્ક્રિય કરો"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s જોડાણ"
 
+#: src/utils/utils.c:535
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "જ્યારે નેટવર્ક ને જોડી રહ્યા હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE તરીકે "
-#~ "સુયોજિત કરો."
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER અથવા PEM પ્રમાણપત્રો (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "જોડાયેલ નહિં હોય તેવી સૂચનાઓને નિષ્ક્રિય કરો"
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, અથવા PKCS#12 ખનગી કી (*.der, *.pem, *.p12, *.key)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "જ્યારે નેટવર્ક માંથી જોડાણને તોડી રહ્યા હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE "
-#~ "તરીકે સુયોજિત કરો."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "VPN સૂચનાઓને નિષ્ક્રિય કરો"
+msgid "Wi-Fi _security"
+msgstr "વાયરલેસ સુરક્ષા (_s):"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "જ્યારે નેટવર્ક માંથી જોડાણને તોડી રહ્યા હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE "
-#~ "તરીકે સુયોજિત કરો."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "નેટવર્ક ઉપલબ્ધ સૂચનાઓને દાબી દો"
+msgid "_Network name"
+msgstr "નેટવર્ક નામ (_N):"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "જ્યારે નેટવર્કો ઉપલ્બધ હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE તરીકે સુયોજિત "
-#~ "કરો."
-
-#~ msgid "Stamp"
-#~ msgstr "સ્ટૅમ્પ"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "નક્કી કરવા માટે વાપરેલ છે ક્યાંતો સુયોજનો અ નવી આવૃત્તિમાં સ્થળાંતર થયેલ હોવા જોઇએ."
+msgid "C_onnection"
+msgstr "જોડાણ (_n):"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wi-Fi બનાવવાનું નિષ્ક્રિય કરો"
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi એડપ્ટર (_a):"
 
-#, fuzzy
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "જ્યારે એપલેટ ને વાપરી રહ્યા હોય ત્યારે adhoc નેટવર્કોને બનાવવાનું નિષ્ક્રિય કરવા માટે આને "
-#~ "TRUE તરીકે સુયોજિત કરો."
+#~ msgid "Manage your network connections"
+#~ msgstr "તમારા નેટવર્ક જોડાણોને સંચાલિત કરો"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "સૂચન વિસ્તારમાં ઍપલેટને બતાવો"
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "નેટવર્ક જોડાણો સક્રિય કરો"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA પ્રમાણપત્રને અવગણો"
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "તમારા નેટવર્ક જોડાણ સુયોજનોને બદલો અને સંચાલિત કરો"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/he.po b/po/he.po
index ef196294..5436c0c9 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: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\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,6 +19,96 @@ msgstr ""
 "X-Generator: Poedit 1.5.4\n"
 "X-Launchpad-Export-Date: 2010-11-02 07:32+0000\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Disable connected notifications"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Set this to true to disable notifications when connecting to a network."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Disable disconnected notifications"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Set this to true to disable notifications when disconnecting from a network."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Disable VPN notifications"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Suppress networks available notifications"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Stamp"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Used to determine whether settings should be migrated to a new version."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Disable Wi-Fi Create"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Set to true to disable creation of adhoc networks when using the applet."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Show the applet in notification area"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Set to FALSE to disable displaying the applet in the notification area."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignore CA certificate"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+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:49
+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."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -65,44 +155,77 @@ msgstr "ססמה:‏"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(אין)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "אישור C_A:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "לא ידוע"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "בחר קובץ"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "בחר קובץ"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "לא _נדרש אישור של רשות אישורים"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "בחירת אישור CA"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "_מפתח פרטי:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "ססמת מפתח _פרטי:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "בחירת אישור CA"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "אישור _משתמש:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "הצ_גת ססמה"
 
@@ -114,36 +237,36 @@ msgstr "בררת מחדל"
 msgid "My country is not listed"
 msgstr "המדינה שלי לא מופיעה"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "לא רשום"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "התכנית שלי לא מופיעה..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "ספק"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "התקן GSM מותקן"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "התקן CDMA מותקן"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "התקן כלשהו"
 
@@ -272,54 +395,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "אישור הגדרות פס רחב נייד"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(אין)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "אישור C_A:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "לא ידוע"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-#, fuzzy
-msgid "Select"
-msgstr "בחר קובץ"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-#, fuzzy
-msgid "Select from file…"
-msgstr "בחר קובץ"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "בחירת אישור CA"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "אישור _משתמש:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "הצ_גת ססמאות"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -342,13 +417,27 @@ msgstr "שם"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "בחירת אישור CA"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "אישור _משתמש:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "הצ_גת ססמאות"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -399,553 +488,461 @@ msgstr "ססמה מ_שנית:"
 msgid "_Password:"
 msgstr "_ססמה:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "הנתקות"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "אין"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "מפתח WEP בן ‎40/128-bit (הקסדצימלי או ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "ססמת WEP ‏bit-‏128"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "‏WEP דינאמי (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "‏WPA & WPA2 אישי"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "‏WPA & WPA2 עסקי"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "‏WPA & WPA2 אישי"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "י_צירה"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "ה_תחברות"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "נדרשים ססמאות או מפתחות הצפנה כדי לגשת לרשת האלחוטית '%s'."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "נדרש אימות לרשת האלחוטית"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "הרשת האלחוטית דורשת אימות"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "יצירת רשת אלחוטית חדשה"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "רשת אלחוטית חדשה"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "נא להזין את שם הרשת האלחוטית שברצונך ליצור."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "התחברות לרשת אלחוטית סמויה"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "רשת אלחוטית סמויה"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 "נא להקליד את השם ואת פרטי האבטחה של הרשת האלחוטית הסמויה שברצונך להתחבר אליה."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "אבטחת רשת אל_חוטית:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "שם ה_רשת:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "חי_בור:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "מ_תאם רשת אלחוטית:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "חיבור %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "אישורי DER או PEM ‏(‎*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "לא _נדרש אישור של רשות אישורים"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "נא לבחור בקובץ PAC..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "קובצי PAC‏ (‎*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "כל הקבצים"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "אלמוני"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "מאומת"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "שניהם"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "זהות א_למונית:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "_קובץ PAC:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "אימות _פנימי:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_מתן האפשרות לבדיקת PAC אוטומטית"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "שם _משתמש:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_ססמה:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "גרסה 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "גרסה 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "לא _נדרש אישור של רשות אישורים"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "_גרסת PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "ססמת WEP ‏bit-‏128"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "הצ_גת ססמאות"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "לא _נדרש אישור של רשות אישורים"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "ז_הות:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "לא _נדרש אישור של רשות אישורים"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "מהיר"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "‏TLS ממונהר"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "‏EAP מוגן (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_אימות:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "ססמת מפתח _פרטי:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_סוג:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "מערכת פתוחה"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "מפתח משותף"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (בררת מחדל)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_מפתח:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "הצ_גת מפתח"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "_אינדקס WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "ניהול חיבורי הרשת שלך"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "חיבורי חשת פעילים"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "ניהול ושינוי הגדרות חיבורי הרשת שלך"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Disable connected notifications"
-
-#~ 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."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Disable disconnected notifications"
-
-#~ 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 "Disable VPN notifications"
-#~ msgstr "Disable VPN notifications"
-
-#~ 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 "Suppress networks available notifications"
-#~ msgstr "Suppress networks available notifications"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ 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."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "חיבור %s"
 
-#~ msgid "Stamp"
-#~ msgstr "Stamp"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "אישורי DER או PEM ‏(‎*.der, *.pem, *.crt, *.cer)"
 
-#~ 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."
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "‏DER, ‏PEM או מפתחות פרטיים מסוג PKCS#12 ‏(‎*.der, *.pem, *.p12)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Disable Wi-Fi Create"
+msgid "Wi-Fi _security"
+msgstr "אבטחת רשת אל_חוטית:"
 
-#~ 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."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "שם ה_רשת:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Show the applet in notification area"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "חי_בור:"
 
-#~ 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."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "מ_תאם רשת אלחוטית:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignore CA certificate"
+#~ msgid "Manage your network connections"
+#~ msgstr "ניהול חיבורי הרשת שלך"
 
-#~ 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."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "חיבורי חשת פעילים"
 
-#~ 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 "Manage and change your network connection settings"
+#~ msgstr "ניהול ושינוי הגדרות חיבורי הרשת שלך"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/hi.po b/po/hi.po
index 58358647..869ec18c 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2013-03-24 13:57+0000\n"
 "Last-Translator: chandankumar <chandankumar 093047 gmail com>\n"
 "Language-Team: Hindi <kde-i18n-doc kde org>\n"
@@ -28,6 +28,89 @@ msgstr ""
 "\n"
 "X-Generator: Lokalize 1.5\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "कनेक्शन सूचना निष्क्रिय करें"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "इसे सही पर सेट करें सूचना निष्क्रिय करने के लिए जब संजाल से कनेक्ट कर रहा हो. "
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "डिसकनेक्टेज सूचना निष्क्रिय करें"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "सूचना निष्क्रिय करने के लिए इसे सही पर सेट करें जब संजाल से डिसकनेक्ट कर रहा हो. "
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr " VPN सूचना निष्क्रिय करें"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "इसे सही पर सेट सूचनाओं जब जोड़ने या एक वीपीएन से डिस्कनेक्ट को निष्क्रिय."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "संडाल उपलब्ध अधिसूचना दबाएँ"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "सही पर सेट करने के लिए सूचनाओं को अक्षम जब वाईफाई नेटवर्क उपलब्ध हैं."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "स्टैम्प"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"निर्धारित करने के लिए प्रयुक्त कि क्या सेटिंग को नए संस्करण में उत्प्रवासित करना चाहिए."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Wi-Fi निर्माण निष्क्रिय करें"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"तदर्थ नेटवर्क के निर्माण को निष्क्रिय करने के लिए जब एप्लेट का उपयोग सही पर सेट करें."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA प्रमाणपत्र पर ध्यान न दें"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"इसे सही पर सेट  EAP प्रमाणीकरण में CA प्रमाणपत्र के बारे में चेतावनी को अक्षम करने के."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"सही पर सेट करें EAP प्रमाणीकरण के चरण 2 में CA प्रमाणपत्र के बारे में चेतावनी को निष्क्रिय "
+"करने के लिए."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -74,44 +157,75 @@ msgstr "पासवर्ड: "
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(कोई नहीं)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "सीए प्रमाणपत्र (_A):"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "अज्ञात"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "सीए प्रमाणपत्र चुनें"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "निजी कुंजी (_k):"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "निजी कुंजी कूटशब्द (_P):"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "सीए प्रमाणपत्र चुनें"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "उपयोक्ता प्रमाणपत्र (_U):"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "कूटशब्द दिखाएँ (_w)"
 
@@ -123,36 +237,36 @@ msgstr "डिफ़ॉल्ट"
 msgid "My country is not listed"
 msgstr "मेरा देश सूचीबद्ध नहीं है"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "जीएसएम"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "गैर सूचीबद्ध"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "मेरा प्लान सूचीबद्ध नहीं है..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "प्रदाता"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "संस्थापित जीएसएम युक्तियां"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "संस्थापित CDMA युक्ति"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "कोई युक्तियां"
 
@@ -286,52 +400,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "मोबाइल ब्रॉडबैंड सेटिंग की पुष्टि करें"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(कोई नहीं)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "सीए प्रमाणपत्र (_A):"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "अज्ञात"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "सीए प्रमाणपत्र चुनें"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "उपयोक्ता प्रमाणपत्र (_U):"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "कूटशब्द दिखाएँ (_w)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -354,13 +422,27 @@ msgstr "नाम"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "सीए प्रमाणपत्र चुनें"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "उपयोक्ता प्रमाणपत्र (_U):"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "कूटशब्द दिखाएँ (_w)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -413,539 +495,462 @@ msgstr "कूटशब्द (_P):"
 msgid "_Password:"
 msgstr "कूटशब्द (_P):"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "डिस्कनेक्ट"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "कुछ नहीं"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-बिट कुंजी (हेक्स या ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit पासफ्रेज"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "गतिशील WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 निजी"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 एंटरप्राइज"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 निजी"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "बनाएँ (_r)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "कनेक्ट (_o)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "कूटशब्द या गोपन कुंजी वाई फाई  संजाल '%s' की पहुँच के लिए जरूरी है."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "वाई फाई नेटवर्क प्रमाणीकरण आवश्यक"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "वाई फाईसंजाल द्वारा प्रमाणीकरण जरूरी"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "नया वाई फाई नेटवर्क बनाएँ"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "नया वाई फाई संजाल"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "अपने बनाए जाने वाले वाई - फाई संजाल के लिए नाम दर्ज करें."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "छुपे वाई फाई  संजाल से कनेक्ट करें"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "छुपा वाई फाई  संजाल"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 "छुपे वाई फाई  संजाल के सुरक्षा विवरण और नाम को दर्ज करें जिसमें आप कनेक्ट करना चाहते हैं."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "वाई फाई सुरक्षा (_s):"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "संजाल नाम (_N):"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "कनेक्शन (_n):"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "वाई फाई एडाप्टर (_a):"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s कनेक्शन"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER या PEM प्रमाणपत्र (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC फ़ाइल चुनें ..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC फ़ाइल (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "सभी फ़ाइलें"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "अज्ञात"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "सत्यापित"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "दोनों"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "बेनाम पहचान (_m):"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC फाइल: (_F)"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "आंतरिक सत्यापन: (_I)"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "स्वत: PAC pro_visioning की अनुमति दें"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "प्रयोक्ता नाम (_U):"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "कूटशब्द (_P):"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "एमडी5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "स्वचालित"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "संस्करण 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "संस्करण 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP संस्करण: (_v)"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit पासफ्रेज"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "कूटशब्द दिखाएँ (_w)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "पहचान (_d):"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "पीएपी"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "सीएचएपी"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "टीएलएस"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "तीव्र"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "टनेल किया टीएलएस"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "संरक्षित EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "सत्यापन: (_t)"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "निजी कुंजी कूटशब्द (_P):"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "प्रकार (_T):"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "खुला तंत्र"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "साझा कुंजी"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (तयशुदा)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "कुंजी: (_K)"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "कुंजी दिखाएँ (_w)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP सूची (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "अपना संजाल कनेक्शन नियंत्रित करें"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "सक्रिय संजाल कनेक्शन"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "अपना संजाल कनेक्शन सेटिंग प्रबंधित करें और बदलें"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "कनेक्शन सूचना निष्क्रिय करें"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "इसे सही पर सेट करें सूचना निष्क्रिय करने के लिए जब संजाल से कनेक्ट कर रहा हो. "
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "डिसकनेक्टेज सूचना निष्क्रिय करें"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "सूचना निष्क्रिय करने के लिए इसे सही पर सेट करें जब संजाल से डिसकनेक्ट कर रहा हो. "
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr " VPN सूचना निष्क्रिय करें"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr "इसे सही पर सेट सूचनाओं जब जोड़ने या एक वीपीएन से डिस्कनेक्ट को निष्क्रिय."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s कनेक्शन"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "संडाल उपलब्ध अधिसूचना दबाएँ"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER या PEM प्रमाणपत्र (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "सही पर सेट करने के लिए सूचनाओं को अक्षम जब वाईफाई नेटवर्क उपलब्ध हैं."
+#: src/utils/utils.c:547
+#, fuzzy
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, या PKCS#12 निजी कुंजी (*.der, *.pem, *.p12)"
 
-#~ msgid "Stamp"
-#~ msgstr "स्टैम्प"
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "वाई फाई सुरक्षा (_s):"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "निर्धारित करने के लिए प्रयुक्त कि क्या सेटिंग को नए संस्करण में उत्प्रवासित करना चाहिए."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "संजाल नाम (_N):"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wi-Fi निर्माण निष्क्रिय करें"
+msgid "C_onnection"
+msgstr "कनेक्शन (_n):"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "तदर्थ नेटवर्क के निर्माण को निष्क्रिय करने के लिए जब एप्लेट का उपयोग सही पर सेट करें."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "वाई फाई एडाप्टर (_a):"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA प्रमाणपत्र पर ध्यान न दें"
+#~ msgid "Manage your network connections"
+#~ msgstr "अपना संजाल कनेक्शन नियंत्रित करें"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "इसे सही पर सेट  EAP प्रमाणीकरण में CA प्रमाणपत्र के बारे में चेतावनी को अक्षम करने के."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "सक्रिय संजाल कनेक्शन"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "सही पर सेट करें EAP प्रमाणीकरण के चरण 2 में CA प्रमाणपत्र के बारे में चेतावनी को "
-#~ "निष्क्रिय करने के लिए."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "अपना संजाल कनेक्शन सेटिंग प्रबंधित करें और बदलें"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/hr.po b/po/hr.po
index 8a09d775..9255bfe6 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-10-17 17:02+0200\n"
 "Last-Translator: gogo <linux hr protonmail com>\n"
 "Language-Team: Croatian <hr li org>\n"
@@ -20,6 +20,92 @@ msgstr ""
 "X-Launchpad-Export-Date: 2017-04-09 22:32+0000\n"
 "X-Generator: Poedit 2.2.1\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Onemogući obavijesti povezivanja"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "Odaberite za onemogućavanje obavijesti pri povezivanju s mrežom."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Onemogući obavijesti prekida povezivanja"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Odaberite za onemogućavanje obavijesti prilikom prekida povezivanja s mrežom."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Onemogući VPN obavijesti"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Odaberite za onemogućavanje obavijesti prilikom povezivanja ili prekida "
+"povezivanja s VPN-a."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Zabrani obavijesti o dostupnim mrežama"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "Odaberite za onemogućavanje obavijesti kada su bežične mreže dostupne."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Pečat"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Koristi se kako bi se utvrdilo trebaju li postavke migrirati na noviju "
+"inačicu."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Onemogući stvaranje bežične mreže"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Odaberite za onemogućavanje stvaranje adhoc mreža pri korištenju apleta."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Prikaži aplet u području obavijesti"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "Odaberite za onemogućavanje prikaza apleta u području obavijesti."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Zanemari CA vjerodajnicu"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Odaberite za onemogućavanje upozorenja o CA vjerodajnicama u EAP ovjeri."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Odaberite za onemogućavanje upozorenja o CA vjerodajnicama u drugoj fazi EAP "
+"ovjere."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -70,43 +156,72 @@ msgstr "Lozinka"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr "Skenirajte sa svojim telefonom ili <a href=\"nma:print\">Ispišite</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(nijedan)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Ključ u %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Vjerodajnica u %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(nepoznato)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Odaberi"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Odustani"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Odaberi iz datoteke…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Nema postavljenih vjerodajnica"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Nema postavljenih ključeva"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Odaberite svoj ključ za %s vjerodajnicu"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "%s privatni _ključ"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "%s lozinka _ključa"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Odaberite %s vjerodajnicu"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "%s _vjerodajnica"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Pri_kaži lozinku"
 
@@ -118,35 +233,35 @@ msgstr "Zadano"
 msgid "My country is not listed"
 msgstr "Moja država nije navedena"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Nenavedeno"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Moj plan nije naveden…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Pružatelj usluge"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Instaliran GSM uređaj"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Instaliran CDMA uređaj"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Bilo koji uređaj"
 
@@ -279,50 +394,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Potvrdi mobilne širokopojasne postavke"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(nijedan)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Ključ u %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Vjerodajnica u %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(nepoznato)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Odaberi"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Odustani"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Odaberi iz datoteke…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Odaberite %s vjerodajnicu"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "Lozinka %s _vjerodajnice"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Prikaž_i lozinku"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Greška prijave: "
@@ -343,13 +414,27 @@ msgstr "Naziv"
 msgid "Issued By"
 msgstr "Izdao"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Odaberite %s vjerodajnicu"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "Lozinka %s _vjerodajnice"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Prikaž_i lozinku"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Upiši %s PIN"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Odustani"
 
@@ -397,91 +482,91 @@ msgstr "_Druga lozinka:"
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Klikni za povezivanje"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Novo…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nijedno"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitni ključ (heksadecimalni ili ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bitna lozinka"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Promjenjivi WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 osobni"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 tvrtke"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 msgid "WPA3 Personal"
 msgstr "WPA3 osobni"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "S_tvori"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Spoji se"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Lozinka ili ključ šifriranja je potreban za pristup bežičnoj mreži \"%s\"."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Potrebna je ovjera bežične mreže"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Potrebna je ovjera bežične mreže"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Stvori novu bežičnu mrežu"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nova bežična mreža"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Upišite naziv bežične mreže koju želite stvoriti."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Poveži se na skrivenu bežičnu mrežu"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Skrivena bežična mreža"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -489,302 +574,256 @@ msgstr ""
 "Upišite naziv i sigurnosne pojedinosti skrivene mreže na koju se želite "
 "povezati."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Bežična _sigurnost"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Naziv mreže"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "P_ovezivanje"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "Bežični _uređaj"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s povezivanje"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM vjerodajnice (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr "DER, PEM ili PKCS#12 privatni ključevi (*.der, *.pem, *.p12, *.key)"
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "neodređena greška u 802.1X sigurnosti (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "nema odabrane CA vjerodajnice"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "odabrana datoteka CA vjerodajnice ne postoji"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "nedostaje EAP-FAST PAC datoteka"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Odaberite PAC datoteku"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC datoteke (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Ovjereno"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Oboje"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Anoni_mni identitet"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "PAC _datoteka"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "_Unutarnja ovjera"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Dopusti automatsko PAC dodijelji_vanje"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "nedostaje EAP-LEAP korisničko ime"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "nedostaje EAP-LEAP lozinka"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "_Korisničko ime"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Lozinka"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatski"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Inačica 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Inačica 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA vjerodajnice nisu _potrebne"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "PEAP _inačica"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Sufiks naziva vjerodajnice poslužitelja."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Domena"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "nedostaje EAP korisničko ime"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "nedostaje EAP lozinka"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "nedostaje lozinka privatnog ključa EAP klijenta"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "L_ozinka privatnog ključa"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "P_rikaži lozinku"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "nedostaje EAP-TLS identitet"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "nema odabrane korisničke vjerodajnice"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "odabrana datoteka korisničke vjerodajnice ne postoji"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "nema odabranog ključa"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "odabrana datoteka ključa ne postoji"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "I_dentitet"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Nepoznata greška provjere 802.1X sigurnosti"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "neodređena greška u 802.1X sigurnosti (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "nema odabrane CA vjerodajnice"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "odabrana datoteka CA vjerodajnice ne postoji"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "BRZO"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunelirani TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Zaštićeni EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Vanjski podešeno"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "Ov_jera"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "nedostaje leap-korisničko_ime"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "nedostaje leap-lozinka"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 msgid "missing password"
 msgstr "nedostaje lozinka"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Vrsta"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "nedostaje wep-ključ"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "neispravan wep-ključ: ključ duljine %zu može sadržavati samo heksadecimalne "
 "znamenke"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 "neispravan wep-ključ: ključ duljine %zu može sadržavati samo ascii znamenke"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -793,39 +832,39 @@ msgstr ""
 "neispravan wep-ključ: pogrešna duljina ključa %zu. Ključ može sadržavati "
 "samo ili 5/13 (ascii) ili 10/26 (heks) duljinu"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "neispravan wep-ključ: lozinka ne smije biti prazna"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "neispravan wep-ključ: lozinka mora biti kraća od 64 znamenke"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Otvoreni sustav"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Dijeljeni ključ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (zadano)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Ključ"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Prika_ži ključ"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP inde_ks"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -834,11 +873,45 @@ msgstr ""
 "neispravan wpa-psk: neispravna duljina-ključa %zu. Mora biti [8,63] bajta "
 "ili 64 heksadecimalnih znamenki"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "neispravan wpa-psk: nemoguće protumačiti ključ od 64 bajta kao heksadecimalni"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Nepoznata greška provjere 802.1X sigurnosti"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s povezivanje"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM vjerodajnice (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM ili PKCS#12 privatni ključevi (*.der, *.pem, *.p12, *.key)"
+
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Bežična _sigurnost"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Naziv mreže"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "P_ovezivanje"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Bežični _uređaj"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Upravljanje mrežnim povezivanjem"
 
@@ -854,82 +927,6 @@ msgstr ""
 #~ msgid "preferences-system-network"
 #~ msgstr "osobitosti-mrežnog-sustava"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Onemogući obavijesti povezivanja"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "Odaberite za onemogućavanje obavijesti pri povezivanju s mrežom."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Onemogući obavijesti prekida povezivanja"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Odaberite za onemogućavanje obavijesti prilikom prekida povezivanja s "
-#~ "mrežom."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Onemogući VPN obavijesti"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Odaberite za onemogućavanje obavijesti prilikom povezivanja ili prekida "
-#~ "povezivanja s VPN-a."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Zabrani obavijesti o dostupnim mrežama"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Odaberite za onemogućavanje obavijesti kada su bežične mreže dostupne."
-
-#~ msgid "Stamp"
-#~ msgstr "Pečat"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Koristi se kako bi se utvrdilo trebaju li postavke migrirati na noviju "
-#~ "inačicu."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Onemogući stvaranje bežične mreže"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Odaberite za onemogućavanje stvaranje adhoc mreža pri korištenju apleta."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Prikaži aplet u području obavijesti"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr "Odaberite za onemogućavanje prikaza apleta u području obavijesti."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Zanemari CA vjerodajnicu"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Odaberite za onemogućavanje upozorenja o CA vjerodajnicama u EAP ovjeri."
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Odaberite za onemogućavanje upozorenja o CA vjerodajnicama u drugoj fazi "
-#~ "EAP ovjere."
-
 #~ msgid "NetworkManager"
 #~ msgstr "Mrežni upravitelj"
 
diff --git a/po/hu.po b/po/hu.po
index 9d9777c3..4ae9a797 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-10-10 14:49+0200\n"
 "Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -22,6 +22,98 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 18.12.3\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "„Csatlakoztatott” értesítések kikapcsolása"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Állítsa igazra a hálózathoz csatlakozásról szóló értesítések kikapcsolásához."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "„Bontva” értesítések kikapcsolása"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Állítsa igazra a hálózati kapcsolat bontásáról szóló értesítések "
+"kikapcsolásához."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "VPN értesítések kikapcsolása"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Állítsa igazra a VPN-kapcsolat bontásáról szóló értesítések kikapcsolásához."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr ""
+"Vezeték nélküli hálózatok elérhetőségéről szóló értesítések kikapcsolása"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Állítsa igazra a Wi-Fi hálózatok elérhetőségéről szóló értesítések "
+"kikapcsolásához."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Bélyeg"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "A szükség van-e a beállítások új verzióra költöztetésére."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "WiFi létrehozás kikapcsolása"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Állítsa igazra az eseti hálózatok létrehozásának kikapcsolásához a "
+"kisalkalmazás használatakor."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "A kisalkalmazás megjelenítése az értesítési területen"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Állítsa HAMISRA a kisalkalmazás értesítési területen való megjelenítésének "
+"tiltásához."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA tanúsítvány mellőzése"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Állítsa igazra a CA tanúsítványokról szóló figyelmeztetések kikapcsolásához "
+"az EAP hitelesítés során."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Állítsa igazra a CA tanúsítványokról szóló figyelmeztetések kikapcsolásához "
+"az EAP hitelesítés 2. fázisa során."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -72,43 +164,72 @@ msgstr "Jelszó"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr "Beolvasás a telefonjával vagy <a href=\"nma:print\">nyomtatás</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Nincs)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Kulcs ebben: %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Tanúsítvány ebben: %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Ismeretlen)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Kiválasztás"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Mégse"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Kiválasztás fájlból…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Nincs tanúsítvány beállítva"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Nincs kulcs beállítva"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Válasszon egy kulcsot a(z) %s tanúsítványhoz"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "%s személyes _kulcs"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "%s kulcs _jelszava"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Válasszon %s tanúsítványt"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "%s _tanúsítvány"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Jelszó megjelenítése"
 
@@ -120,35 +241,35 @@ msgstr "Alapértelmezett"
 msgid "My country is not listed"
 msgstr "Az ország nincs felsorolva"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Egyéb"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "A tarifám nincs felsorolva…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Szolgáltató"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Telepített GSM eszköz"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Telepített CDMA eszköz"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Bármely eszköz"
 
@@ -280,50 +401,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Mobil széles sáv beállításainak megerősítése"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Nincs)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Kulcs ebben: %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Tanúsítvány ebben: %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Ismeretlen)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Kiválasztás"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Mégse"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Kiválasztás fájlból…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Válasszon egy %s tanúsítványt"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "%s tanúsítvány jel_szava"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Jelszavak megjelenítése"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Hiba a bejelentkezéskor: "
@@ -344,13 +421,27 @@ msgstr "Név"
 msgid "Issued By"
 msgstr "Kibocsátó"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Válasszon egy %s tanúsítványt"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s tanúsítvány jel_szava"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Jelszavak megjelenítése"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Adja meg a(z) %s PIN-kódját"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "Mé_gse"
 
@@ -398,56 +489,56 @@ msgstr "_Másodlagos jelszó:"
 msgid "_Password:"
 msgstr "_Jelszó:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Kattintson a kapcsolódáshoz"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Új…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nincs"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 bites kulcs (Hex vagy ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bites jelmondat"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamikus WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA és WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA és WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 msgid "WPA3 Personal"
 msgstr "WPA3 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Létrehozás"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "Kapcs_olódás"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -455,35 +546,35 @@ msgstr ""
 "Jelszavak vagy titkosítási kulcsok szükségesek a(z) „%s” Wi-Fi hálózat "
 "eléréséhez."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Hitelesítés szükséges a Wi-Fi hálózathoz"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "A Wi-Fi hálózat hitelesítést igényel"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Új Wi-Fi hálózat létrehozása"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Új Wi-Fi hálózat"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Adja meg a létrehozni kívánt Wi-Fi hálózat nevét."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Kapcsolódás rejtett Wi-Fi hálózathoz"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Rejtett Wi-Fi hálózat"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -491,302 +582,256 @@ msgstr ""
 "Adja meg a rejtett Wi-Fi hálózat nevét és biztonsági adatait, amelyhez "
 "kapcsolódni kíván."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Wi-Fi _biztonság"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Hálózatnév"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "_Kapcsolat"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "Wi-Fi _csatoló"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s kapcsolat"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM tanúsítványok (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr "DER, PEM vagy PKCS#12 személyes kulcsok (*.der, *.pem, *.p12, *.key)"
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "meghatározatlan hiba a 802.1X biztonságban (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "nincs CA tanúsítvány kiválasztva"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "a kiválasztott CA tanúsítványfájl nem létezik"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "hiányzó EAP-FAST PAC fájl"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Válasszon PAC fájlt"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC fájlok (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Minden fájl"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Névtelen"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Hitelesített"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Mindkettő"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "_Névtelen személyazonosság"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "PAC-_fájl"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "Belső _hitelesítés"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Automatikus PA_C létesítés engedélyezése"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "hiányzó EAP-LEAP felhasználónév"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "hiányzó EAP-LEAP jelszó"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "_Felhasználónév"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Jelszó"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "0. verzió"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "1. verzió"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA tanúsítvány nem _szükséges"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "_PEAP verzió"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "A kiszolgáló tanúsítványnevének utótagja."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Tartomány"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "hiányzó EAP felhasználónév"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "hiányzó EAP jelszó"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "hiányzó EAP-kliens személyes kulcs jelmondat"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "P_rivát kulcs jelmondat"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "_Jelmondat megjelenítése"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "hiányzó EAP-TLS személyazonosság"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "nincs felhasználói tanúsítvány kiválasztva"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "a kiválasztott felhasználói tanúsítványfájl nem létezik"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "nincs kulcs kiválasztva"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "a kiválasztott kulcsfájl nem létezik"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "Sze_mélyazonosság"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (nincs EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Ismeretlen hiba a 802.1X biztonság ellenőrzésekor"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "meghatározatlan hiba a 802.1X biztonságban (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "nincs CA tanúsítvány kiválasztva"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "a kiválasztott CA tanúsítványfájl nem létezik"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Alagutazott TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Védett EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Külsőleg konfigurált"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "_Hitelesítés"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "hiányzó leap felhasználónév"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "hiányzó leap jelszó"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 msgid "missing password"
 msgstr "hiányzó jelszó"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Típus"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "hiányzó wep-kulcs"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "érvénytelen wep-kulcs: egy %zu hosszú kulcsban csak hexadecimális számjegyek "
 "lehetnek"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 "érvénytelen wep-kulcs: egy %zu hosszú kulcsban csak ascii karakterek lehetnek"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -795,40 +840,40 @@ msgstr ""
 "érvénytelen wep-kulcs: hibás kulcshossz: %zu. A kulcs hossza 5/13 (ascii) "
 "vagy 10/26 lehet (hex)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "érvénytelen wep-kulcs: a jelmondat nem lehet üres"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "érvénytelen wep-kulcs: a jelmondatnak 64 karakternél rövidebbnek kell lennie"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Nyílt rendszer"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Megosztott kulcs"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (alapértelmezett)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Kulcs"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Kul_cs megjelenítése"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP inde_x"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -837,11 +882,45 @@ msgstr ""
 "érvénytelen wpa-psk: érvénytelen kulcshossz: %zu. [8,63] bájtnak, vagy 64 "
 "hexadecimális számjegynek kell lennie"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "érvénytelen wpa-psk: a 64 bájtos kulcs nem értelmezhető hexadecimálisként"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Ismeretlen hiba a 802.1X biztonság ellenőrzésekor"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s kapcsolat"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM tanúsítványok (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM vagy PKCS#12 személyes kulcsok (*.der, *.pem, *.p12, *.key)"
+
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi _biztonság"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Hálózatnév"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "_Kapcsolat"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi _csatoló"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Hálózati kapcsolatok kezelése"
 
@@ -857,88 +936,6 @@ msgstr ""
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "„Csatlakoztatott” értesítések kikapcsolása"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Állítsa igazra a hálózathoz csatlakozásról szóló értesítések "
-#~ "kikapcsolásához."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "„Bontva” értesítések kikapcsolása"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Állítsa igazra a hálózati kapcsolat bontásáról szóló értesítések "
-#~ "kikapcsolásához."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "VPN értesítések kikapcsolása"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Állítsa igazra a VPN-kapcsolat bontásáról szóló értesítések "
-#~ "kikapcsolásához."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr ""
-#~ "Vezeték nélküli hálózatok elérhetőségéről szóló értesítések kikapcsolása"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Állítsa igazra a Wi-Fi hálózatok elérhetőségéről szóló értesítések "
-#~ "kikapcsolásához."
-
-#~ msgid "Stamp"
-#~ msgstr "Bélyeg"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "A szükség van-e a beállítások új verzióra költöztetésére."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "WiFi létrehozás kikapcsolása"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Állítsa igazra az eseti hálózatok létrehozásának kikapcsolásához a "
-#~ "kisalkalmazás használatakor."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "A kisalkalmazás megjelenítése az értesítési területen"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Állítsa HAMISRA a kisalkalmazás értesítési területen való "
-#~ "megjelenítésének tiltásához."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA tanúsítvány mellőzése"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Állítsa igazra a CA tanúsítványokról szóló figyelmeztetések "
-#~ "kikapcsolásához az EAP hitelesítés során."
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Állítsa igazra a CA tanúsítványokról szóló figyelmeztetések "
-#~ "kikapcsolásához az EAP hitelesítés 2. fázisa során."
-
 #~ msgid "NetworkManager"
 #~ msgstr "Hálózatkezelő"
 
diff --git a/po/id.po b/po/id.po
index 0614ea5c..938e8a5f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2018-08-27 14:58+0700\n"
 "Last-Translator: Kukuh Syafaat <kukuhsyafaat gnome org>\n"
 "Language-Team: Indonesian <gnome i15n org>\n"
@@ -21,6 +21,98 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Generator: Poedit 2.0.6\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Matikan pemberitahuan saat tersambung"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Tata ke true untuk mematikan pemberitahuan ketika menyambung ke suatu "
+"jaringan."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Matikan pemberitahuan saat terputus"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Tata ke true untuk mematikan pemberitahuan ketika terputus dari suatu "
+"jaringan."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Matikan pemberitahuan VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Tata ke true untuk mematikan pemberitahuan ketika tersambung atau terputus "
+"dari suatu VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Redam pemberitahuan bahwa jaringan tersedia"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Tata ke true untuk mematikan pemberitahuan ketika jaringan Wi-Fi tersedia."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Stamp"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "Dipakai untuk menentukan apakah tatanan mesti dipindah ke versi baru."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Matikan Pembuatan Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Tata ke true untuk mencegah pembuatan jaringan adhoc ketika memakai aplet."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Tampilkan aplet di area pemberitahuan"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Isi dengan FALSE untuk menonaktifkan penampilan aplet dalam area "
+"pemberitahuan."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Abaikan sertifikat CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Tata ini ke true untuk menonaktifkan peringatan tentang sertifikat CA dalam "
+"otentikasi EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Tata ini ke true untuk menonaktifkan peringatan tentang sertifikat CA dalam "
+"otentikasi EAP fasa 2."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -70,43 +162,72 @@ msgstr "Sandi:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Nihil)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Kunci dalam %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Sertifikat dalam %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Tidak dikenal)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Pilih"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Batal"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Pilih dari berkas…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Tidak ada sertifikat yang ditata"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Tidak ada kunci yang ditata"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Pilih sebuah kunci bagi Sertifikat %s"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "_Kunci privat %s"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "Kata _sandi kunci %s"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Pilih Sertifikat %s"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "_Sertifikat %s"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Tampilkan _sandi"
 
@@ -118,35 +239,35 @@ msgstr "Baku"
 msgid "My country is not listed"
 msgstr "Negaraku tak terdaftar"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Tak terdaftar"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Tipe langgananku tak terdaftar…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Operator"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Perangkat GSM terpasang"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Perangkat CDMA terpasang"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Sebarang perangkat"
 
@@ -277,50 +398,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Konfirmasikan Tatanan Data Seluler"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Nihil)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Kunci dalam %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Sertifikat dalam %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Tidak dikenal)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Pilih"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Batal"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Pilih dari berkas…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Pilih Sertifikat %s"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "Kata _sandi sertifikat %s"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Tampilkan sandi"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Galat saat log masuk: "
@@ -341,13 +418,27 @@ msgstr "Nama"
 msgid "Issued By"
 msgstr "Diterbitkan Oleh"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Pilih Sertifikat %s"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "Kata _sandi sertifikat %s"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Tampilkan sandi"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Masukkan PIN %s"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Batal"
 
@@ -395,92 +486,92 @@ msgstr "Sandi _Sekunder:"
 msgid "_Password:"
 msgstr "_Sandi:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Klik untuk menyambung"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Baru…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Tak ada"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Kunci WEP 40/128-bit (Heksa atau ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Frasa-kunci WEP 128-bit"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP Dinamik (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Buat"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Sambung"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, 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/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Otentikasi Jaringan Wi-Fi Diperlukan"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Otentikasi dibutuhkan oleh jaringan Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Buat Jaringan Wi-Fi Baru"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Jaringan Wi-Fi baru"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Sambungkan ke Jaringan Wi-Fi Tersembunyi"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Jaringan Wi-Fi tersembunyi"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -488,297 +579,251 @@ msgstr ""
 "Masukkan nama dan rincian keamanan dari jaringan Wi-Fi tersembunyi yang "
 "ingin Anda sambungkan."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Kemananan _Wi-Fi"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Nama jaringan"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "K_oneksi"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "_Adaptor Wi-Fi"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Koneksi %s"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Sertifikat PEM  (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "galat tak terdefinisi dalam keamanan 802.1X (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "tidak ada sertifikat CA yang dipilih"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "berkas sertifikat CA yang dipilih tidak ada"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "kurang berkas PAC EAP-FAST"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Pilih suatu berkas PAC"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Berkas PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Semua berkas"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonim"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Terotentikasi"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Keduanya"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Identitas anoni_m"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "_Berkas PAC"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "Otent_ikasi dalam"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Otomatis ijinkan pro_visi PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "kurang nama pengguna EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "kurang sandi EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "Nama Pengg_una"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Sandi"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Otomatis"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versi 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versi 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Tak pe_rlu ada sertifikat CA"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "_Versi PEAP"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Akhiran nama sertifikat server."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Domain"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "kurang nama pengguna EAP"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "kurang sandi EAP"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Frasa-kunci WEP 128-bit"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "_Tampilkan sandi"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "kurang identitas EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "tidak ada sertifikat pengguna yang dipilih"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "berkas sertifikat pengguna yang dipilih tidak ada"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "tidak ada kunci yang dipilih"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "berkas kunci yang dipilih tidak ada"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "I_dentitas"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (tanpa EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Galat tak diketahui saat memvalidasi keamanan 802.1X"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "galat tak terdefinisi dalam keamanan 802.1X (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "tidak ada sertifikat CA yang dipilih"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "berkas sertifikat CA yang dipilih tidak ada"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Tak dikenal"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "O_tentikasi"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "kurang nama pengguna leap"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "kurang sandi leap"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "kurang sandi EAP"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Jenis"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "kurang kunci wep"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "kunci wep tak valid: kunci dengan panjang %zu mesti hanya memuat dijit heksa"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -786,7 +831,7 @@ msgstr ""
 "kunci wep tak valid: kunci dengan panjang %zu mesti hanya memuat karakter "
 "ascii"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -795,40 +840,40 @@ msgstr ""
 "kunci wep tak valid: panjang kunci %zu salah. Suatu kunci mesti memiliki "
 "panjang 5/13 (ascii) atau 10/26 (heksa)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "wep-key tak valid: frasa sandi tak boleh kosong"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "kunci wep tak valid: frasa sandi mesti lebih pendek daripada 64 karakter"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistem Terbuka"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Kunci Bersama"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Bawaan)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Kunci"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Tampilkan _kunci"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "Inde_ks WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -837,102 +882,55 @@ msgstr ""
 "wpa-psk tak valid: panjang kunci %zu tak valid. Mesti antara [8,63] byte "
 "atau 64 heksa dijit"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk tak valid: tak bisa menginterpretasi kunci dengan 64 byte sebagai "
 "heksa"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Mengelola koneksi jaringan Anda"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Konfigurasi Mentah"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Kelola dan ubah tatanan koneksi jaringan Anda"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Matikan pemberitahuan saat tersambung"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Tata ke true untuk mematikan pemberitahuan ketika menyambung ke suatu "
-#~ "jaringan."
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Galat tak diketahui saat memvalidasi keamanan 802.1X"
 
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Matikan pemberitahuan saat terputus"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Koneksi %s"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Tata ke true untuk mematikan pemberitahuan ketika terputus dari suatu "
-#~ "jaringan."
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Sertifikat PEM  (*.pem, *.crt, *.cer)"
 
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Matikan pemberitahuan VPN"
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "Kunci privat DER, PEM, atau PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Tata ke true untuk mematikan pemberitahuan ketika tersambung atau "
-#~ "terputus dari suatu VPN."
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Kemananan _Wi-Fi"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Redam pemberitahuan bahwa jaringan tersedia"
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Nama jaringan"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Tata ke true untuk mematikan pemberitahuan ketika jaringan Wi-Fi tersedia."
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "K_oneksi"
 
-#~ msgid "Stamp"
-#~ msgstr "Stamp"
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptor Wi-Fi"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Dipakai untuk menentukan apakah tatanan mesti dipindah ke versi baru."
+#~ msgid "Manage your network connections"
+#~ msgstr "Mengelola koneksi jaringan Anda"
 
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Matikan Pembuatan Wi-Fi"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Tata ke true untuk mencegah pembuatan jaringan adhoc ketika memakai aplet."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Tampilkan aplet di area pemberitahuan"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Isi dengan FALSE untuk menonaktifkan penampilan aplet dalam area "
-#~ "pemberitahuan."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Abaikan sertifikat CA"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Tata ini ke true untuk menonaktifkan peringatan tentang sertifikat CA "
-#~ "dalam otentikasi EAP."
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Konfigurasi Mentah"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Tata ini ke true untuk menonaktifkan peringatan tentang sertifikat CA "
-#~ "dalam otentikasi EAP fasa 2."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Kelola dan ubah tatanan koneksi jaringan Anda"
 
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
diff --git a/po/is.po b/po/is.po
index 3e8ef2dd..f1625abd 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2018-03-19 15:25+0000\n"
 "Last-Translator: Sveinn í Felli <sv1 fellsnet is>\n"
 "Language-Team: Icelandic <translation-team-is lists sourceforge net>\n"
@@ -17,6 +17,99 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.5\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Afvirkja tilkynningar þegar tengst er við netið"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Settu þetta sem satt til að afvirkja tilkynningar þegar tengst er netkerfum."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Afvirkja tilkynningar þegar aftengst er við netið"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Settu þetta sem satt til að afvirkja tilkynningar þegar aftengst er "
+"netkerfum."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Afvirkja VPN tilkynningar"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Settu þetta sem satt til að afvirkja tilkynningar þegar tengst er eða "
+"aftengst VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Útiloka tilkynningar um tiltæk netkerfi"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Settu þetta sem satt til að afvirkja tilkynningar þegar Wi-Fi netkerfi eru "
+"fáanleg"
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Stimpill"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "Notað til að ákvarða hvort stillingar skuli yfirfærðar í nýja útgáfu."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Gera óvirkt að búa til ný Wi-Fi-net"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Settu þetta sem satt til að gera óvirka gerð beintengdra (ad-hoc) neta þegar "
+"þessi forritlingur er í notkun."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Birta tákn fyrir forritið á tilkynningasvæði"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Settu þetta sem ÓSATT til að koma í veg fyrir að tákn fyrir forritið birtist "
+"á tilkynningasvæði."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Hunsa CA skilríki"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Settu þetta sem satt til að afvirkja tilkynningar varðandi CA-skilríki í EAP-"
+"auðkenningu."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Settu þetta sem satt til að afvirkja tilkynningar varðandi CA-skilríki í "
+"fasa 2 í EAP-auðkenningu."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -63,44 +156,73 @@ msgstr "Lykilorð:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(ekkert)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Skilríki í %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(óþekkt)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Velja"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Hætta við"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Veldu úr skrá…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA skilríkis e_r ekki krafist"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Veldu lykil fyrir skilríki %s"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Einkaly_kill %s:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Lykil_orð einkalykils %s:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Veldu skilríki %s"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_Skilríki %s:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Sýna lykilorð"
 
@@ -112,35 +234,35 @@ msgstr "Sjálfgefið"
 msgid "My country is not listed"
 msgstr "Landið mitt er ekki á listanum"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Óskráð"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Áskriftin mín er ekki á listanum…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Þjónustuveita"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Uppsett GSM tæki"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Uppsett CDMA tæki"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Eitthvað tæki"
 
@@ -275,50 +397,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Staðfestu stillingar ferðabreiðbands"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(ekkert)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Skilríki í %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(óþekkt)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Velja"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Hætta við"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Veldu úr skrá…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Veldu %s skilríki"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Skilríki notanda:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Sýna lykilorð"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -339,13 +417,27 @@ msgstr "Nafn"
 msgid "Issued By"
 msgstr "Gefið út af"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Veldu %s skilríki"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Skilríki notanda:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Sýna lykilorð"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Settu inn PIN-númer %s"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Hætta við"
 
@@ -393,57 +485,57 @@ msgstr "_Auka-lykilorð"
 msgid "_Password:"
 msgstr "_Lykilorð:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Smelltu til að tengjast"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "_Nýtt…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ekkert"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit lykill (Hex eða ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit lykilsetning"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Breytilegt (dynamic) WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA og WPA2 einka"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 fyrirtækja"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA og WPA2 einka"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Búa til"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Tengjast"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -451,35 +543,35 @@ msgstr ""
 "Lykilorða eða dulritunarlykla er krafist til að tengjast Wi-Fi netkerfinu "
 "'%s'."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi netkerfisauðkenningar krafist"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Auðkenningar er krafist af Wi-Fi netkerfi"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Búa til nýtt Wi-Fi netkerfi"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nýtt Wi-Fi netkerfi"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Tengjast við falið Wi-Fi netkerfi"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Falið Wi-Fi netkerfi"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -487,309 +579,259 @@ msgstr ""
 "Settu inn heiti og öryggisupplýsingar fyrir falda Wi-Fi netkerfið sem þú "
 "vilt tengjast."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Öruggt _Wi-Fi"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "Heiti _netkerfis:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Ten_ging:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "W_i-Fi_netkort:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s tenging"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM skilríki (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "óskilgreind villa í öruggu 802.1X (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "ekkert CA skilríki valið"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "vantar EAP-FAST PAC skrá"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Veldu PAC-skrá"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC skrár (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Allar skrár"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Nafnlaust"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Auðkennt"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Bæði"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "_Nafnlaust auðkenni"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "PAC _skrá"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "_Innri auðkenning"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Leyfa sjálfvirka PAC _veitingu (provisioning)"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "vantar EAP-LEAP notandanafn"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "vantar EAP-LEAP lykilorð"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "Notan_danafn"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "Lykil_orð"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Sjálfvirkt"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Útgáfa 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Útgáfa 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA skilríkis e_r ekki krafist"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "PEAP út_gáfa"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Lén"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "vantar EAP notandanafn"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "vantar EAP lykilorð"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit lykilsetning"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Sýna lykil_orð"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "vantar EAP-TLS auðkenni"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA skilríkis e_r ekki krafist"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "_Auðkenni"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (ekkert EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Óþekkt villa við að sannreyna 802.1X öryggi"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "óskilgreind villa í öruggu 802.1X (wpa-eap)"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "ekkert CA skilríki valið"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Óþekkt"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "_Auðkenning"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "vantar leap-notandanafn"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "vantar leap-lykilorð"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "vantar EAP lykilorð"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Tegund"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "vantar wep-lykil"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "ógildur wep-lykill: lykill með lengdina %zu má aðeins innihalda hex-stafi"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 "ógildur wep-lykill: lykill með lengdina %zu má aðeins innihalda ascii-stafi"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -798,39 +840,39 @@ msgstr ""
 "ógildur wep-lykill: röng lengd lykils %zu. Lengd lykils verður að vera annað "
 "hvort 5/13 (ascii) eða 10/26 (hex)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "ógildur wep-lykill: lykilfrasi má ekki vera tómur"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "ógildur wep-lykill: lykilfrasi verður að vera styttri en 64 stafir"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Opið kerfi"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Dreifilykill"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (sjálfgefið)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Lykill"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "_Sýna lykil"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP _vísir"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -839,102 +881,57 @@ msgstr ""
 "ógildur wpa-psk: röng lengd lykils %zu. Lengd lykils verður að vera annað "
 "hvort [8,63] bæti eða 64 hex-stafir"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "ógildur wpa-psk: get ekki túlkað lykil með 64 bætum sem hex"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Sýsla með nettengingar"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Virkar nettengingar"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Breyta og halda utan um nettenginguna"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Afvirkja tilkynningar þegar tengst er við netið"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Settu þetta sem satt til að afvirkja tilkynningar þegar tengst er "
-#~ "netkerfum."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Afvirkja tilkynningar þegar aftengst er við netið"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Settu þetta sem satt til að afvirkja tilkynningar þegar aftengst er "
-#~ "netkerfum."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Afvirkja VPN tilkynningar"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Settu þetta sem satt til að afvirkja tilkynningar þegar tengst er eða "
-#~ "aftengst VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Útiloka tilkynningar um tiltæk netkerfi"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Óþekkt villa við að sannreyna 802.1X öryggi"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Settu þetta sem satt til að afvirkja tilkynningar þegar Wi-Fi netkerfi "
-#~ "eru fáanleg"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s tenging"
 
-#~ msgid "Stamp"
-#~ msgstr "Stimpill"
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM skilríki (*.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Notað til að ákvarða hvort stillingar skuli yfirfærðar í nýja útgáfu."
+#: src/utils/utils.c:547
+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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Gera óvirkt að búa til ný Wi-Fi-net"
+msgid "Wi-Fi _security"
+msgstr "Öruggt _Wi-Fi"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Settu þetta sem satt til að gera óvirka gerð beintengdra (ad-hoc) neta "
-#~ "þegar þessi forritlingur er í notkun."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "Heiti _netkerfis:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Birta tákn fyrir forritið á tilkynningasvæði"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Ten_ging:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Settu þetta sem ÓSATT til að koma í veg fyrir að tákn fyrir forritið "
-#~ "birtist á tilkynningasvæði."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "W_i-Fi_netkort:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Hunsa CA skilríki"
+#~ msgid "Manage your network connections"
+#~ msgstr "Sýsla með nettengingar"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Settu þetta sem satt til að afvirkja tilkynningar varðandi CA-skilríki í "
-#~ "EAP-auðkenningu."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Virkar nettengingar"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Settu þetta sem satt til að afvirkja tilkynningar varðandi CA-skilríki í "
-#~ "fasa 2 í EAP-auðkenningu."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Breyta og halda utan um nettenginguna"
 
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager netstýring"
diff --git a/po/it.po b/po/it.po
index 86456217..6ba9e662 100644
--- a/po/it.po
+++ b/po/it.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-08-09 09:13+0200\n"
 "Last-Translator: Milo Casagrande <milo milo name>\n"
 "Language-Team: Italian <tp lists linux it>\n"
@@ -29,6 +29,100 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-03-09 08:20+0000\n"
 "X-Generator: Poedit 2.2.3\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Disabilita le notifiche di connessione"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Impostare a VERO per disabilitare le notifiche quando si effettua la "
+"connessione ad una rete."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Disabilita le notifiche di disconnessione"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Impostare a VERO per disabilitare le notifiche quando si effettua la "
+"disconnessione da una rete."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Disabilita le notifiche VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Impostare a VERO per disabilitare le notifiche quando si effettua la "
+"connessione/disconnessione da una VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Sopprime le notifiche di reti disponibili"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Impostare a VERO per disabilitare le notifiche quando sono disponibili reti "
+"senza fili."
+
+# [NdT] non ho idea di cosa indichi... dubito si tratti di un francobollo
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Marcatura"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Usato per determinare se le impostazioni devono essere migrate alla nuova "
+"versione."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Disabilita la creazione di Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Impostare a VERO per disabilitare la creazione di reti ad-hoc quando si usa "
+"l'applet."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Mostra l'applet nell'area di notifica"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "Impostare a FALSO per non visualizzare l'applet nell'area di notifica."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignora certificato CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Impostare a VERO per disabilitare gli avvisi riguardo ai certificati CA "
+"nell'autenticazione EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Impostare a VERO per disabilitare gli avvisi riguardo ai certificati CA "
+"nella fase 2 dell'autenticazione EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -80,44 +174,73 @@ msgstr "Password"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr "Scansionare col proprio telefono o <a href=\"nma:print\">stampare</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(nessuno)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Chiave in %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificato in %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(sconosciuto)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Seleziona"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Annulla"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Seleziona da file…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Nessun certificato impostato"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Nessuna chiave impostata"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Scelta chiave per certificato %s"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "_Chiave privata %s"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "_Password della chiave %s"
 
 # (ndt) titolo finestra
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Scelta certificato %s"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "_Certificato %s"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Mo_stra la password"
 
@@ -129,35 +252,35 @@ msgstr "Predefinita"
 msgid "My country is not listed"
 msgstr "Nazione non presente in elenco"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Non elencato"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Piano tariffario non presente…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Operatore"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM installato"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA installato"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Qualsiasi dispositivo"
 
@@ -290,51 +413,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confermare le impostazioni a banda larga mobile"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(nessuno)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Chiave in %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Certificato in %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(sconosciuto)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Seleziona"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Annulla"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Seleziona da file…"
-
-# (ndt) titolo finestra
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Scelta certificato %s"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "_Password certificato %s"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Mo_stra le password"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Errore nell'accedere in: "
@@ -355,13 +433,28 @@ msgstr "Nome"
 msgid "Issued By"
 msgstr "Emesso da"
 
+# (ndt) titolo finestra
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Scelta certificato %s"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Password certificato %s"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Mo_stra le password"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Inserire PIN di %s"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "A_nnulla"
 
@@ -409,32 +502,32 @@ msgstr "_Password secondaria:"
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Fare clic per connettersi"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Nuova…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nessuna"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Chiave WEP a 40/128 bit (Hex o ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase d'accesso WEP a 128 bit"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinamico (802.1x)"
 
@@ -445,11 +538,11 @@ msgstr "WEP dinamico (802.1x)"
 # fornite dai prodotti. I WPA(2)-Personal utilizzeranno il metodo PSK a
 # chiave condivisa mentre i WPA(2)-Enterprise utilizzeranno un server
 # di autenticazione.
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA e WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA e WPA2 Enterprise"
 
@@ -460,23 +553,23 @@ msgstr "WPA e WPA2 Enterprise"
 # fornite dai prodotti. I WPA(2)-Personal utilizzeranno il metodo PSK a
 # chiave condivisa mentre i WPA(2)-Enterprise utilizzeranno un server
 # di autenticazione.
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA e WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_rea"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "C_onnetti"
 
 # [NdT] lo so che nell'originale c'è il plurale...
 #       ma di password o chiave per una data rete
 #       ce ne può essere al più una no?
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -485,37 +578,37 @@ msgstr ""
 "cifratura."
 
 # [NdT] è il titolo della finestra
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Richiesta autenticazione rete Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "La rete Wi-Fi richiede autenticazione"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Crea nuova rete Wi-fi"
 
 # [NdT] è il titolo della finestra
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nuova rete Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Inserire un nome per la rete Wi-Fi da creare."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connetti a rete Wi-Fi nascosta"
 
 # [NdT] è il titolo della finestra
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Rete Wi-Fi nascosta"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -523,297 +616,251 @@ msgstr ""
 "Inserire il nome e i dettagli di sicurezza della rete Wi-Fi nascosta a cui "
 "connettersi."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Sicurezza _Wi-Fi"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Nome rete"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "Co_nnessione"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "_Adattatore Wi-Fi"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Connessione %s"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certificati PEM (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr "Chiavi private DER, PEM o PKCS#12 (*.der, *.pem, *.p12, *.key)"
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "errore non definito nella sicurezza 802.1X (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "nessun certificato CA selezionato"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "il file di certificato CA selezionato non esiste"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "manca il file PAC EAP-FAST"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 # (ndt) titolo finestra
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Scelta file PAC"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "File PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Tutti i file"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenticato"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Entrambi"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Identità anoni_ma"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "File _PAC"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "Autenticazione i_nterna"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Fornire a_utomaticamente PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "manca il nome utente EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "manca la password EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "Nome _utente"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Password"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versione 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versione 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Nessun certificato CA _richiesto"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "Versione _PEAP"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Suffisso del nome del certificato del server"
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Dominio"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "manca il nome utente EAP"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "manca la password EAP"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "manca la frase d'accesso della chiave privata EAP"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "F_rase d'accesso chiave privata"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "Mo_stra frase d'accesso"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "manca l'identità EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "nessun certificato utente selezionato"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "il file del certificato utente selezionato non esiste"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "nessuna chiave selezionata"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "il file chiave selezionato non esiste"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "I_dentità"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (no EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Errore sconosciuto nel validare la sicurezza 802.1X"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "errore non definito nella sicurezza 802.1X (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "nessun certificato CA selezionato"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "il file di certificato CA selezionato non esiste"
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "TLS via tunnel"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP Protetto (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Sconosciuta"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Configurato esternamente"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "_Autenticazione"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "manca leap-username"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "manca leap-password"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "manca la password EAP"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Tipo"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "manca wep-key"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "wpa-key non valida: una chiave di lunghezza %zu deve contenere solo cifre "
 "esadecimali"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -821,7 +868,7 @@ msgstr ""
 "wpa-key non valida: una chiave di lunghezza %zu deve contenere solo "
 "caratteri ascii"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -830,40 +877,40 @@ msgstr ""
 "wpa-key non valida: lunghezza chiave %zu non valida. Una chiave deve essere "
 "di lunghezza 5/13 (ascii) o 10/26 (esadecimale)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "wpa-key non valida: la frase d'accesso non può essere vuota"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "wpa-key non valida: la frase d'accesso deve essere più corta di 64 caratteri"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema aperto"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Chiave condivisa"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (predefinito)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Chiave"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Mo_stra la chiave"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "Indic_e WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -872,12 +919,46 @@ msgstr ""
 "wpa-psk non valida: lunghezza chiave %zu non valida. Deve essere [8,63] byte "
 "o 64 cifre esadecimali"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk non valida: impossibile interpretare chiave con 64 byte come "
 "esadecimali"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Errore sconosciuto nel validare la sicurezza 802.1X"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Connessione %s"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certificati PEM (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "Chiavi private DER, PEM o PKCS#12 (*.der, *.pem, *.p12, *.key)"
+
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Sicurezza _Wi-Fi"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Nome rete"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "Co_nnessione"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adattatore Wi-Fi"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Gestisce le connessioni di rete"
 
@@ -893,89 +974,6 @@ msgstr ""
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Disabilita le notifiche di connessione"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Impostare a VERO per disabilitare le notifiche quando si effettua la "
-#~ "connessione ad una rete."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Disabilita le notifiche di disconnessione"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Impostare a VERO per disabilitare le notifiche quando si effettua la "
-#~ "disconnessione da una rete."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Disabilita le notifiche VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Impostare a VERO per disabilitare le notifiche quando si effettua la "
-#~ "connessione/disconnessione da una VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Sopprime le notifiche di reti disponibili"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Impostare a VERO per disabilitare le notifiche quando sono disponibili "
-#~ "reti senza fili."
-
-# [NdT] non ho idea di cosa indichi... dubito si tratti di un francobollo
-#~ msgid "Stamp"
-#~ msgstr "Marcatura"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Usato per determinare se le impostazioni devono essere migrate alla nuova "
-#~ "versione."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Disabilita la creazione di Wi-Fi"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Impostare a VERO per disabilitare la creazione di reti ad-hoc quando si "
-#~ "usa l'applet."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Mostra l'applet nell'area di notifica"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Impostare a FALSO per non visualizzare l'applet nell'area di notifica."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignora certificato CA"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Impostare a VERO per disabilitare gli avvisi riguardo ai certificati CA "
-#~ "nell'autenticazione EAP."
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Impostare a VERO per disabilitare gli avvisi riguardo ai certificati CA "
-#~ "nella fase 2 dell'autenticazione EAP."
-
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
 
diff --git a/po/ja.po b/po/ja.po
index 23ea2aa2..70705239 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet 1.8.22\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-08-15 04:55+0000\n"
 "Last-Translator: kemorigu <kemorigu redhat com>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
@@ -28,6 +28,93 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "接続通知を無効にする"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "これを true にすると、ネットワークへの接続中の通知を無効にします。"
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "切断通知を無効にする"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "これを true にすると、ネットワークからの切断中の通知を無効にします。"
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "VPN 通知を無効にする"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"これを true にすると、VPN への接続、あるいは VPN からの切断の際の通知を無効に"
+"します。"
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "ネットワーク使用可能通知を抑制する"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"これを true にすると、無線ネットワークが利用可能になった時の通知を無効にしま"
+"す。"
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "スタンプ"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "設定を、新規バージョンに移行すべきかどうかの判定に使用されます。"
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Wi-Fi の作成を無効にする"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"これを true にすると、アプレットでのアドホックネットワークの作成を無効にしま"
+"す。"
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "通知領域にアプレットを表示する"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"これを false にすると、通知領域にアプレットを表示するのを無効化します。"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA 証明書を無視"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"これを true にすると、EAP の認証中の CA 証明書関連の警告を無効にします。"
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"これを true にすると、EAP 認証のフェーズ 2 での CA 証明書関連の警告を無効にし"
+"ます。"
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -81,43 +168,72 @@ msgstr "パスワード"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr "電話でスキャンするか、<a href=\"nma:print\">印刷します</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(なし)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "%s 内のキー"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "%s 内の 証明書"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(不明)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "選択"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "ファイルから選択…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "証明書セットがありません"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "キーセットがありません"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "%s 証明書のキーを選択する"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "%s プライベートキー(_K)"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "%s キーパスワード(_P)"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "%s 証明書を選択する"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "%s 証明書(_C)"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "パスワードを表示(_W)"
 
@@ -129,35 +245,35 @@ msgstr "デフォルト"
 msgid "My country is not listed"
 msgstr "私の国は一覧に有りません"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "一覧に無い"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "プランが一覧にありません..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "プロバイダー"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "GSM デバイスがインストールされています"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "CDMA デバイスがインストールされています"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "すべてのデバイス"
 
@@ -284,50 +400,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "モバイルブロードバンドセッティングを確定する"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(なし)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "%s 内のキー"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "%s 内の 証明書"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(不明)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "選択"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "ファイルから選択…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "%s  証明書を選択する"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "%s 証明書のパスワード(_P)"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "パスワードを表示(_W)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "ログインでエラー: "
@@ -348,13 +420,27 @@ msgstr "名前"
 msgid "Issued By"
 msgstr "発行"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "%s  証明書を選択する"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s 証明書のパスワード(_P)"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "パスワードを表示(_W)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "%s PIN を入力"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "取り消し(_C)"
 
@@ -402,58 +488,58 @@ msgstr "セカンダリーパスワード(_S):"
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "クリックして接続する"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "新規…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "なし"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit キー (HEX または ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit パスフレーズ"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "動的 WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 # そういう仕様の名前なので訳すべきでない。
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "作成(_R)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "接続(_O)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -461,338 +547,292 @@ msgstr ""
 "Wi-Fi ネットワーク '%s' にアクセスするには、パスワードか暗号化キーが必要で"
 "す。"
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi ネットワークの認証が必要です"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi ネットワークでは認証が要求されます"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "新しい Wi-Fi ネットワークを作成"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "新規 Wi-Fi ネットワーク"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "作成する Wi-Fi ネットワークの名前を入力してください。"
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "非表示 Wi-Fi ネットワークに接続する"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "非表示 Wi-Fi ネットワーク"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 "接続する Wi-Fi ネットワークの名前とセキュリティー詳細を入力してください。"
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Wi-Fi セキュリティー(_S)"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "ネットワーク名(_N)"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "接続(_O)"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "Wi-Fi アダプター(_A)"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s 接続"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM 証明書 (*.pem、*.crt、*.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "802.1X セキュリティーで未定義のエラー (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "CA 証明書が選択されていません"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "選択された CA 証明書ファイルは存在しません"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC ファイルがありません"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "PAC ファイルを選択"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ファイル (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "匿名"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "認証"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "両方"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "匿名の識別子(_M)"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "PAC ファイル(_F)"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "内部認証(_I)"
 
 # see http://www.cisco.com/cisco/web/support/JP/100/1005/1005630_eapfast-wlc-rad-config.html#PAC
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "自動 PAC プロビジョニングを許可(_V)"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP ユーザー名がありません"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP パスワードがありません"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "ユーザー名(_U)"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "パスワード(_P)"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "自動"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "バージョン 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "バージョン 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA 証明書は必要ありません(_R)"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "PEAP バージョン(_V)"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "サーバー証明書名のサフィックス"
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "ドメイン(_D)"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "EAP ユーザー名がありません"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "EAP パスワードがありません"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "EAP クライアントの秘密鍵のパスフレーズがありません"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "秘密鍵のパスフレーズ(_R)"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "パスフレーズの表示(_O)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS アイデンティティーがありません"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "ユーザー証明書が選択されていません"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "選択されたユーザー証明書ファイルは存在しません"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "キーが選択されていません"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "選択されたキーファイルは存在しません"
 
 # とりあえずこのように訳しておくが "Identity" のままの方が適切かもしれない。
 # (WPA-EAP Identity 認証方式: ユーザ ID とパスワードの組で認証)
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "ID(_D)"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (非 EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "802.1X セキュリティーの検証中に原因不明のエラー"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "802.1X セキュリティーで未定義のエラー (wpa-eap)"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "CA 証明書が選択されていません"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "選択された CA 証明書ファイルは存在しません"
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "トンネル化 TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "保護つき EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "不明"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "外部で設定"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "認証(_T)"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "leap-username が見つかりません"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "leap-password が見つかりません"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "EAP パスワードがありません"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "種類(_T)"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "wep-key が見つかりません"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "無効な wep-key: %zu の長さのキーには、16 進数しか使用できません"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "無効な wep-key: %zu の長さのキーには、ascii 文字しか使用できません"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -801,39 +841,39 @@ msgstr ""
 "無効な wep-key: キーの長さ %zu が正しくありません。キーの長さは 5/13 (ascii) "
 "か 10/26 (hex) にする必要があります"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "無効な wep-key: パスフレーズを空白にすることはできません"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "無効な wep-key: パスフレーズは 64 文字未満にする必要があります。"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "オープンシステム"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "共有鍵"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (デフォルト)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "キー(_K)"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "キーを表示(_W)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP インデックス(_X)"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -842,10 +882,44 @@ msgstr ""
 "無効な wpa-psk: キーの長さ %zu が無効です。[8,63] バイトもしくは 16 進数で "
 "64 桁にする必要があります"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "無効な wpa-psk: 16 進数の 64 バイトでキーを解釈できません"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "802.1X セキュリティーの検証中に原因不明のエラー"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s 接続"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM 証明書 (*.pem、*.crt、*.cer)"
+
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER か、PEM、 PKCS#12 のプライベートキー (*.der, *.pem, *.p12, *.key)"
+
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi セキュリティー(_S)"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "ネットワーク名(_N)"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "接続(_O)"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi アダプター(_A)"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "ネットワーク接続を管理"
 
@@ -861,82 +935,6 @@ msgstr "無効な wpa-psk: 16 進数の 64 バイトでキーを解釈できま
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "接続通知を無効にする"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "これを true にすると、ネットワークへの接続中の通知を無効にします。"
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "切断通知を無効にする"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "これを true にすると、ネットワークからの切断中の通知を無効にします。"
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "VPN 通知を無効にする"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "これを true にすると、VPN への接続、あるいは VPN からの切断の際の通知を無"
-#~ "効にします。"
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "ネットワーク使用可能通知を抑制する"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "これを true にすると、無線ネットワークが利用可能になった時の通知を無効にし"
-#~ "ます。"
-
-#~ msgid "Stamp"
-#~ msgstr "スタンプ"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "設定を、新規バージョンに移行すべきかどうかの判定に使用されます。"
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wi-Fi の作成を無効にする"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "これを true にすると、アプレットでのアドホックネットワークの作成を無効にし"
-#~ "ます。"
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "通知領域にアプレットを表示する"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "これを false にすると、通知領域にアプレットを表示するのを無効化します。"
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA 証明書を無視"
-
-#~ 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 phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "これを true にすると、EAP 認証のフェーズ 2 での CA 証明書関連の警告を無効"
-#~ "にします。"
-
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
 
diff --git a/po/kk.po b/po/kk.po
index 87a164d6..76b643ab 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2018-08-26 08:42+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst gmail com>\n"
 "Language-Team: Kazakh <kk_KZ googlegroups com>\n"
@@ -18,6 +18,99 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.1.1\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Байланысты орнату хабарламаларын сөндіру"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Желіге байланысты орнатқан кезде хабарламаларды сөндіру үшін бұны true етіп "
+"орнатыңыз."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Байланысты ажырату хабарламаларын сөндіру"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Желімен байланыс ажыратылған кезде хабарламаларды сөндіру үшін бұны true "
+"етіп орнатыңыз."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "VPN хабарламаларын сөндіру"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"VPN-ге байланыс орнатылған не ажыратылған кезде хабарламаларды сөндіру үшін "
+"бұны true етіп орнатыңыз."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Қолжетерлік желілер туралы хабарламаларды басу"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "Wi-Fi желілері қолжетерлік болу туралы хабарламаларды сөндіру."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Wi-Fi жасауды сөндіру"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Апплетті қолданған кезде adhoc желілерін жасауды сөндіру үшін бұны true етіп "
+"орнатыңыз."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Хабарлау өрісінде апплетті көрсету"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+#, fuzzy
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "Хабарлау өрісінде апплетті көрсету"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA сертификатын елемеу"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Желіге байланысты орнатқан кезде хабарламаларды сөндіру үшін бұны true етіп "
+"орнатыңыз."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Желіге байланысты орнатқан кезде хабарламаларды сөндіру үшін бұны true етіп "
+"орнатыңыз."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -64,43 +157,72 @@ msgstr "Пароль:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Ешнәрсе)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "%s ішіндегі кілт"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "%s ішіндегі сертификаты"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Белгісіз)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Таңдау"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Бас тарту"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Файлдан таңдау…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Сертификат көрсетілмеген"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Кілт көрсетілмеді"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "%s сертификаты үшін кілтті таңдаңыз"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "%s жеке _кілті"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "%s кілт _паролі"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "%s сертификатын таңдаңыз"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "%s _сертификаты"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Пар_ольді көрсету"
 
@@ -112,35 +234,35 @@ msgstr "Бастапқы"
 msgid "My country is not listed"
 msgstr "Менің елім көрсетілмеген"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Тізілмеген"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Менің жоспарым тізімде жоқ…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Провайдер"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Орнатылған GSM құрылғысы"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Орнатылған CDMA құрылғысы"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Кез-келген құрылғы"
 
@@ -258,50 +380,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Мобильді кеңжолақты баптауларын растау"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Ешнәрсе)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "%s ішіндегі кілт"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "%s ішіндегі сертификаты"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Белгісіз)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Таңдау"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Бас тарту"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Файлдан таңдау…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "%s сертификатын таңдау"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "%s сертификат _паролі"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Пар_ольдерді көрсету"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Кіру қатесі: "
@@ -322,13 +400,27 @@ msgstr "Аты"
 msgid "Issued By"
 msgstr "Шығарған"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "%s сертификатын таңдау"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s сертификат _паролі"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Пар_ольдерді көрсету"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "%s PIN кодын енгізіңіз"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "Ба_с тарту"
 
@@ -376,91 +468,91 @@ msgstr "Қо_сымша пароль:"
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Байланысу үшін шертіңіз"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Жаңа…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 биттік кілті (Hex не ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 биттік кілттік фразасы"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Динамикалық WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "Жаса_у"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "Ба_йланысу"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "\"%s\" Wi-Fi желісіне байланысу үшін пароль не шифрлеу кілттері керек."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi желі аутентификациясы керек"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi желісі үшін аутентификация керек"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Жаңа Wi-Fi желісін жасау"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Жаңа Wi-Fi желісі"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Жасалатын Wi-Fi желісінің атын енгізіңіз."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Жасырын Wi-Fi желісіне байланысу"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Жасырын Wi-Fi желісі"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -468,304 +560,258 @@ msgstr ""
 "Байланысты орнатқыңыз келетін Wi-Fi жасырын желісінің атын мен қауіпсіздік "
 "ақпаратын енгізіңіз."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Wi-Fi қауі_псіздігі"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "Желі а_тауы"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "Ба_йланыс"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "Wi-Fi _құрылғысы"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s байланысы"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM сертификаттары (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "802.1X қауіпсіздігі (wpa-eap) ішіндегі анықталмаған қате"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "СО сертификаты таңдалмады"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "таңдалған СО сертификат файлы жоқ болып тұр"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC файлы жоқ"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "PAC файлын таңдаңыз"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC файлдары (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Барлық файлдар"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Анонимды"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Аутентификациядан өткен"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Екеуі де"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "А_нонимды аутентификация"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "PAC фа_йлы"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "І_шкі аутентификация"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Автоматты PAC ұсы_нуды рұқсат ету"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP пайдаланушы аты жоқ"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP паролі жоқ"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "_Пайдаланушы аты"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Пароль"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Автоматты"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Нұсқасы 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Нұсқасы 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA сертификаты керек е_мес"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "_PEAP нұсқасы"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Домен"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "EAP пайдаланушы аты жоқ"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "EAP паролі жоқ"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128 биттік кілттік фразасы"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Пар_ольдерді көрсету"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS identity жоқ"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "пайдаланушы сертификаты таңдалмады"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "таңдалған пайдаланушы сертификат файлы жоқ болып тұр"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "кілт таңдалмады"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "таңдалған кілттер файлы жоқ болып тұр"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (EAP жоқ)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "802.1X қауіпсіздігін тексерудің белгісіз қатесі"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "802.1X қауіпсіздігі (wpa-eap) ішіндегі анықталмаған қате"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "СО сертификаты таңдалмады"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "таңдалған СО сертификат файлы жоқ болып тұр"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Туннельденген TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Қорғалған EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Белгісіз"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "Аутент_ификация"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "leap-username жоқ"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "leap-password жоқ"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "EAP паролі жоқ"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Түрі"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "wep-key жоқ"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "жарамсыз wep-key: ұзындығы %zu кілт ішінде тек оналтылық сандар болуы тиіс"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 "жарамсыз wep-key: ұзындығы %zu кілт ішінде тек ascii таңбалары болуы тиіс"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -774,39 +820,39 @@ msgstr ""
 "жарамсыз wep-key: кілт ұзындығы %zu қате. Кілт ұзындығы 5/13 (ascii) немесе "
 "10/26 (оналтылық) болуы тиіс"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "жарамсыз wep-key: кілттік фраза бос емес болуы тиіс"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "жарамсыз wep-key: кілттік фраза 64 таңбадан аз болуы тиіс"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Ашық жүйе"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Ортақ кілт"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Бастапқы)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "Кі_лт"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Кіл_тті көрсету"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP и_ндексі"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -815,74 +861,55 @@ msgstr ""
 "жарамсыз wpa-psk: кілт ұзындығы %zu жарамсыз. Ол [8,63] байт немесе 64 "
 "оналтылық сан болуы тиіс"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "жарамсыз wpa-psk: 64 байты бар кілтті он алтылық кілт ретінде талдау мүмкін "
 "емес"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Желілік байланыстарыңызды басқару"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Шикі баптаулар"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Сіздің желілік байланысыңызды басқару мен түзету"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "802.1X қауіпсіздігін тексерудің белгісіз қатесі"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Байланысты орнату хабарламаларын сөндіру"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s байланысы"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Желіге байланысты орнатқан кезде хабарламаларды сөндіру үшін бұны true "
-#~ "етіп орнатыңыз."
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM сертификаттары (*.pem, *.crt, *.cer)"
 
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Байланысты ажырату хабарламаларын сөндіру"
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, не PKCS#12 жеке кілттері (*.der, *.pem, *.p12, *.key)"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Желімен байланыс ажыратылған кезде хабарламаларды сөндіру үшін бұны true "
-#~ "етіп орнатыңыз."
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi қауі_псіздігі"
 
-#~ msgid "Disable VPN notifications"
-#~ msgstr "VPN хабарламаларын сөндіру"
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "Желі а_тауы"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "VPN-ге байланыс орнатылған не ажыратылған кезде хабарламаларды сөндіру "
-#~ "үшін бұны true етіп орнатыңыз."
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "Ба_йланыс"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Қолжетерлік желілер туралы хабарламаларды басу"
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi _құрылғысы"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "Wi-Fi желілері қолжетерлік болу туралы хабарламаларды сөндіру."
+#~ msgid "Manage your network connections"
+#~ msgstr "Желілік байланыстарыңызды басқару"
 
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wi-Fi жасауды сөндіру"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Апплетті қолданған кезде adhoc желілерін жасауды сөндіру үшін бұны true "
-#~ "етіп орнатыңыз."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Хабарлау өрісінде апплетті көрсету"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Шикі баптаулар"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA сертификатын елемеу"
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Сіздің желілік байланысыңызды басқару мен түзету"
 
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
diff --git a/po/km.po b/po/km.po
index 82c9c107..04058d9e 100644
--- a/po/km.po
+++ b/po/km.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po_nm-applet-km\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\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,6 +21,85 @@ msgstr ""
 "X-Generator: WordForge 0.8 RC1\n"
 "X-Language: km-KH\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "បិទ​ការ​ជូនដំណឹង​ដែល​បាន​តភ្ជាប់"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ជូនដំណឹង​នៅ​ពេល​ភ្ជាប់​បណ្ដាញ។"
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "បិទ​ការ​ជូនដំណឹង​ដែល​បាន​ផ្ដាច់"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ជូនដំណឹង​នៅ​ពេល​ផ្ដាច់​ពី​បណ្ដាញ។"
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "បិទ​ការ​ជូនដំណឹង VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ជូនដំណឹង​នៅ​ពេល​ភ្ជាប់ ឬ​ផ្ដាច់​ពី VPN ។"
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "លាក់​​​ការ​ជូនដំណឹង​បណ្ដាញ​ដែល​មាន"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ជូនដំណឹង នៅ​ពេល​មាន​បណ្ដាញ​វ៉ាយហ្វាយ។"
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "តែម"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "ត្រូវ​បាន​ប្រើ ដើម្បី​កំណត់​ថា​តើ​គួរតែ​ប្ដូរ​ការ​កំណត់​ទៅ​ជា​កំណែ​ថ្មី​ដែរ​ឬ​ទេ។"
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "បិទ​ការ​បង្កើត​វ៉ាយហ្វាយ"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr "កំណត់​ទៅ​ពិត​ដើម្បី​បិទ​ការ​បង្កើត​បណ្ដាញ adhoc នៅ​ពេល​ប្រើ​អាប់ភ្លេត។"
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "បង្ហាញ​អាប់ភ្លេត​នៅ​ក្នុង​តំបន់​ជូន​ដំណឹង"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "កំណត់​ទៅ​មិន​ពិត ដើម្បី​បិទ​ការ​បង្ហាញ​អាប់ភ្លេត​នៅ​ក្នុង​តំបន់​ជូន​ដំណឹង។"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "មិន​អើពើ​វិញ្ញាបនបត្រ CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ព្រមាន​អំពី​វិញ្ញាបនបត្រ CA នៅ​ក្នុង​ការ​ផ្ទៀងផ្ទាត់ EAP ។"
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ព្រមាន​អំពី​វិញ្ញាបនបត្រ CA នៅ​ក្នុង​ដំណាក់កាល​ទី ២ នៃ​ការ​ផ្ទៀងផ្ទាត់ EAP ។"
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -67,44 +146,75 @@ msgstr "ពាក្យសម្ងាត់៖"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(គ្មាន)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "វិញ្ញាបនបត្រ CA ៖"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "មិនស្គាល់"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "ជ្រើស​វិញ្ញាបនបត្រ CA"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "សោ​ឯកជន៖"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "ពាក្យសម្ងាត់​សោ​ឯកជន៖"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "ជ្រើស​វិញ្ញាបនបត្រ CA"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "វិញ្ញាបនបត្រ​អ្នកប្រើ៖"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
 
@@ -116,36 +226,36 @@ msgstr "លំនាំដើម"
 msgid "My country is not listed"
 msgstr "ប្រទេស​របស់​ខ្ញុំ​មិន​ត្រូវ​បាន​រាយ"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "មិន​បាន​រាយ"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "គម្រោង​របស់​ខ្ញុំ​​មិន​ត្រូវ​បាន​រាយ..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "ក្រុមហ៊ុន​ផ្ដល់"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "ឧបករណ៍ GSM ដែល​បាន​ដំឡើង"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "ឧបករណ៍ CDMA ដែល​បាន​ដំឡើង"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "ឧបករណ៍​ណាមួយ"
 
@@ -275,52 +385,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "បញ្ចាក់​ការ​កំណត់​រលកអាកាស​ចល័ត"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(គ្មាន)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "វិញ្ញាបនបត្រ CA ៖"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "មិនស្គាល់"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "ជ្រើស​វិញ្ញាបនបត្រ CA"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "វិញ្ញាបនបត្រ​អ្នកប្រើ៖"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -343,13 +407,27 @@ msgstr "ឈ្មោះ"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "ជ្រើស​វិញ្ញាបនបត្រ CA"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "វិញ្ញាបនបត្រ​អ្នកប្រើ៖"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -402,540 +480,461 @@ msgstr "ពាក្យសម្ងាត់៖"
 msgid "_Password:"
 msgstr "ពាក្យសម្ងាត់៖"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "ផ្ដាច់"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "គ្មាន"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Key (Hex ឬ ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "ឃ្លា​សម្ងាត់ WEP 128-bit"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP (802.1X) ថាមវន្ត"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ផ្ទាល់ខ្លួន"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ក្រុមហ៊ុន"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 ផ្ទាល់ខ្លួន"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "បង្កើត"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 #, fuzzy
 msgid "C_onnect"
 msgstr "បាន​តភ្ជាប់"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "បាន​ទាមទារ​ពាក្យសម្ងាត់ ឬ​សោ​ការ​ដាក់​លេខកូដ ដើម្បី​ចូល​ដំណើរការ​បណ្ដាញ​វ៉ាយហ្វាយ '%s' ។"
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​បណ្ដាញ​វ៉ាយហ្វាយ"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​តាម​បណ្ដាញ​វ៉ាយហ្វាយ"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "បង្កើត​បណ្ដាញ​វ៉ាយហ្វាយ​ថ្មី"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "បណ្ដាញ​វ៉ាយហ្វាយ​ថ្មី"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "បញ្ចូល​ឈ្មោះ​សម្រាប់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​អ្នក​ចង់​បង្កើត។"
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "តភ្ជាប់​ទៅកាន់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​លាក់"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​លាក់"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "បញ្ចូល​ព័ត៌មាន​លម្អិត​អំពី​ឈ្មោះ និង​សុវត្ថិភាព​របស់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​អ្នក​ចង់​តភ្ជាប់។"
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "សុវត្ថិភាព​វ៉ាយហ្វាយ៖"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "ឈ្មោះ​បណ្ដាញ៖"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "ការ​តភ្ជាប់៖"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "អាដាប់ទ័រ​វ៉ាយហ្វាយ៖"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "ការ​តភ្ជាប់ %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "វិញ្ញាបនបត្រ DER ឬ PEM  (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ជ្រើស​ឯកសារ PAC..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "ឯកសារ PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "ឯកសារ​ទាំងអស់"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "អនាមិក"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "បាន​​ផ្ទៀងផ្ទាត់"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "ទាំងពីរ"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "អត្តសញ្ញាណ​អនាមិក៖"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "ឯកសារ PAC៖"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "ការ​ផ្ទៀងផ្ទាត់​ខាងក្នុង៖"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "អនុញ្ញាត​ការ​ផ្ដល់ PAC ដោយ​ស្វ័យប្រវត្តិ"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "ឈ្មោះ​អ្នកប្រើ៖"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "ពាក្យសម្ងាត់៖"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "ស្វ័យប្រវត្តិ"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "កំណែ ០"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "កំណែ ១"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "កំណែ PEAP ៖"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "ឃ្លា​សម្ងាត់ WEP 128-bit"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "អត្តសញ្ញាណ៖"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "មិនស្គាល់"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "ផ្ទៀងផ្ទាត់៖"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "ពាក្យសម្ងាត់​សោ​ឯកជន៖"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "ប្រភេទ៖"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "បើក​ប្រព័ន្ធ"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "សោ​ដែល​បាន​ចែករំលែក"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "១ (លំនាំដើម)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "សោ៖"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "បង្ហាញ​សោ"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "លិបិក្រម WEP៖"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "គ្រប់គ្រង​ការ​តភ្ជាប់បណ្ដាញ​របស់​អ្នក"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "ការ​តភ្ជាប់​បណ្ដាញ​សកម្ម"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "គ្រប់គ្រង និង​ផ្លាស់ប្ដូរ​ការ​កំណត់​ការ​ភ្ជាប់​បណ្ដាញ​របស់​អ្នក"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "បិទ​ការ​ជូនដំណឹង​ដែល​បាន​តភ្ជាប់"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ជូនដំណឹង​នៅ​ពេល​ភ្ជាប់​បណ្ដាញ។"
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "បិទ​ការ​ជូនដំណឹង​ដែល​បាន​ផ្ដាច់"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ជូនដំណឹង​នៅ​ពេល​ផ្ដាច់​ពី​បណ្ដាញ។"
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "បិទ​ការ​ជូនដំណឹង VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ជូនដំណឹង​នៅ​ពេល​ភ្ជាប់ ឬ​ផ្ដាច់​ពី VPN ។"
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "លាក់​​​ការ​ជូនដំណឹង​បណ្ដាញ​ដែល​មាន"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ជូនដំណឹង នៅ​ពេល​មាន​បណ្ដាញ​វ៉ាយហ្វាយ។"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "ការ​តភ្ជាប់ %s"
 
-#~ msgid "Stamp"
-#~ msgstr "តែម"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "វិញ្ញាបនបត្រ DER ឬ PEM  (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "ត្រូវ​បាន​ប្រើ ដើម្បី​កំណត់​ថា​តើ​គួរតែ​ប្ដូរ​ការ​កំណត់​ទៅ​ជា​កំណែ​ថ្មី​ដែរ​ឬ​ទេ។"
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, ឬ​ពាក្យ​គន្លឹះ​សម្ងាត់ PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "បិទ​ការ​បង្កើត​វ៉ាយហ្វាយ"
+msgid "Wi-Fi _security"
+msgstr "សុវត្ថិភាព​វ៉ាយហ្វាយ៖"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr "កំណត់​ទៅ​ពិត​ដើម្បី​បិទ​ការ​បង្កើត​បណ្ដាញ adhoc នៅ​ពេល​ប្រើ​អាប់ភ្លេត។"
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "ឈ្មោះ​បណ្ដាញ៖"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "បង្ហាញ​អាប់ភ្លេត​នៅ​ក្នុង​តំបន់​ជូន​ដំណឹង"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "ការ​តភ្ជាប់៖"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr "កំណត់​ទៅ​មិន​ពិត ដើម្បី​បិទ​ការ​បង្ហាញ​អាប់ភ្លេត​នៅ​ក្នុង​តំបន់​ជូន​ដំណឹង។"
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "អាដាប់ទ័រ​វ៉ាយហ្វាយ៖"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "មិន​អើពើ​វិញ្ញាបនបត្រ CA"
+#~ msgid "Manage your network connections"
+#~ msgstr "គ្រប់គ្រង​ការ​តភ្ជាប់បណ្ដាញ​របស់​អ្នក"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ព្រមាន​អំពី​វិញ្ញាបនបត្រ CA នៅ​ក្នុង​ការ​ផ្ទៀងផ្ទាត់ EAP ។"
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "ការ​តភ្ជាប់​បណ្ដាញ​សកម្ម"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ព្រមាន​អំពី​វិញ្ញាបនបត្រ CA នៅ​ក្នុង​ដំណាក់កាល​ទី ២ នៃ​ការ​ផ្ទៀងផ្ទាត់ 
EAP ។"
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "គ្រប់គ្រង និង​ផ្លាស់ប្ដូរ​ការ​កំណត់​ការ​ភ្ជាប់​បណ្ដាញ​របស់​អ្នក"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/kn.po b/po/kn.po
index 3474dfc8..67fa7415 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2014-12-02 05:10-0500\n"
 "Last-Translator: Shankar <svenkate redhat com>\n"
 "Language-Team: kn_IN <kde-i18n-doc kde org>\n"
@@ -20,6 +20,106 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 3.5.1\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "ಸಂಪರ್ಕಗೊಂಡ ಸೂಚನೆಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"ಒಂದು ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಸಾಧಿಸುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಗೆ "
+"ಬದಲಾಯಿಸಿ."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕಲಾದ ಸೂಚನೆಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"ಒಂದು ಜಾಲಬಂಧದಿಂದ ಸಂಪರ್ಕ ಕಡಿದುಹಾಕುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಗೆ "
+"ಬದಲಾಯಿಸಿ."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "ಸಂಪರ್ಕಗೊಂಡ ಸೂಚನೆಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"ಒಂದು ಜಾಲಬಂಧದಿಂದ ಸಂಪರ್ಕ ಕಡಿದುಹಾಕುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಗೆ "
+"ಬದಲಾಯಿಸಿ."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು ಲಭ್ಯವಿವೆ ಎಂಬ ಸೂಚನೆಗಳನ್ನು ತಡೆಹಿಡಿ"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು ಲಭ್ಯವಿರುವುದನ್ನು ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಬದಲಾಯಿಸಿ."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "ಮುದ್ರೆ"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "ಸಿದ್ಧತೆಗಳನ್ನು ಹೊಸ ಆವೃತ್ತಿಗೆ ವರ್ಗಾಯಿಸಬೇಕೆ ಎಂದು ನಿರ್ಧರಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ"
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Wi-Fi ನಿರ್ಮಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"ಆಪ್ಲೆಟ್‌ ಅನ್ನು ಬಳಸುವಾಗ ಒಂದು ತಾತ್ಕಾಲಿಕ ಜಾಲಬಂಧವನ್ನು ರಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು "
+"TRUE ಗೆ ಬದಲಾಯಿಸಿ."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "C_A ಪ್ರಮಾಣಪತ್ರ:"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"ಒಂದು ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಸಾಧಿಸುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಗೆ "
+"ಬದಲಾಯಿಸಿ."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"ಒಂದು ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಸಾಧಿಸುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಗೆ "
+"ಬದಲಾಯಿಸಿ."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -67,44 +167,75 @@ msgstr "ಗುಪ್ತಪದ:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ಯಾವುದೂ ಇಲ್ಲ)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A ಪ್ರಮಾಣಪತ್ರ:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "ಅಜ್ಞಾತ"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ:"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "ಖಾಸಗಿ ಕೀಲಿ(_k):"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "ಖಾಸಗಿ ಕೀಲಿ ಗುಪ್ತಪದ(_P):"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "ಬಳಕೆದಾರ ಪ್ರಮಾಣಪತ್ರ(_U):"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "ಗುಪ್ತಪದವನ್ನು ತೋರಿಸು(_w)"
 
@@ -116,36 +247,36 @@ msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
 msgid "My country is not listed"
 msgstr "ನನ್ನ ದೇಶವನ್ನು ಪಟ್ಟಿ ಮಾಡಲಾಗಿಲ್ಲ"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "ಪಟ್ಟಿ ಮಾಡದೆ ಇರುವ"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "ನನ್ನ ಯೋಜನೆ(ಪ್ಲಾನ್) ಅನ್ನು ಪಟ್ಟಿ ಮಾಡಲಾಗಿಲ್ಲ..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "ಒದಗಿಸುವವರು"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "ಅನುಸ್ಥಾಪಿಸಲಾದ GSM ಸಾಧನ"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "ಅನುಸ್ಥಾಪಿಸಲಾದ CDMA ಸಾಧನ"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "ಯಾವುದೆ ಸಾಧನ"
 
@@ -282,52 +413,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಿದ್ಧತೆಗಳನ್ನು ಖಚಿತಪಡಿಸಿ"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(ಯಾವುದೂ ಇಲ್ಲ)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "C_A ಪ್ರಮಾಣಪತ್ರ:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "ಅಜ್ಞಾತ"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "ಬಳಕೆದಾರ ಪ್ರಮಾಣಪತ್ರ(_U):"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "ಗುಪ್ತಪದಗಳನ್ನು ತೋರಿಸು(_w)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -350,13 +435,27 @@ msgstr "ಹೆಸರು"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "ಬಳಕೆದಾರ ಪ್ರಮಾಣಪತ್ರ(_U):"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "ಗುಪ್ತಪದಗಳನ್ನು ತೋರಿಸು(_w)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -409,60 +508,60 @@ msgstr "ಗುಪ್ತಪದ(_P):"
 msgid "_Password:"
 msgstr "ಗುಪ್ತಪದ(_P):"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕು"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ಯಾವುದೂ ಇಲ್ಲ"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-ಬಿಟ್ ಕೀಲಿ (ಹೆಕ್ಸ್ ಅಥವ ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit ಗುಪ್ತವಾಕ್ಯ"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ಡೈನಮಿಕ್ WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ವೈಯಕ್ತಿಕ"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ಎಂಟರ್ಪ್ರೈಸ್"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 ವೈಯಕ್ತಿಕ"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "ರಚಿಸು(_r)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "ಸಂಪರ್ಕ ಜೋಡಿಸು(_o)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -470,42 +569,42 @@ msgstr ""
 "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ '%s' ಅನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಗುಪ್ತಪದ ಅಥವ ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಯ "
 "ಅಗತ್ಯವಿರುತ್ತದೆ."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕಾಗಿ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "ಹೊಸ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧವನ್ನು ರಚಿಸಿ"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "ಹೊಸ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ನೀವು ನಿರ್ಮಿಸಲು ಬಯಸುವ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧದ ಹೆಸರನ್ನು ನಮೂದಿಸಿ."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -513,353 +612,301 @@ msgid ""
 msgstr ""
 "ನೀವು ಸಂಪರ್ಕ ಹೊಂದಲು ಬಯಸುವ ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಸಂಪರ್ಕದ ಸುರಕ್ಷತಾ ವಿವರಗಳನ್ನು ನಮೂದಿಸಿ."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "ಸುರಕ್ಷತೆ(_S):"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "ಜಾಲಬಂಧದ ಹೆಸರು(_N):"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "ಸಂಪರ್ಕ(_n):"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "ವೈರ್ಲೆಸ್ ಅಡಾಪ್ಟರ್(_a):"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "DSL ಸಂಪರ್ಕ %d"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER ಅಥವ PEM ಪ್ರಮಾಣಪತ್ರಗಳು (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ:"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ಒಂದು PAC ಕಡತವನ್ನು ಆರಿಸು..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ಕಡತಗಳು (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "ಎಲ್ಲಾ ಕಡತಗಳು"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "ಅನಾಮಧೇಯ ಗುರುತು(_m):"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "ದೃಢೀಕರಣ(_A):"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "ಅನಾಮಧೇಯ ಗುರುತು(_m):"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "_PAC ಕಡತ:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "ಆಂತರಿಕ ದೃಢೀಕರಣ(_n):"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 #, fuzzy
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ಸ್ವಯಂಚಾಲಿತ P_AC ಪ್ರಾವಿಶನಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸು"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "ಬಳಕೆದಾರಹೆಸರು(_U):"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "ಗುಪ್ತಪದ(_P):"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "ಸ್ವಯಂಚಾಲಿತ"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "_PEAP ಆವೃತ್ತಿ:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit ಗುಪ್ತವಾಕ್ಯ"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "ಗುಪ್ತಪದಗಳನ್ನು ತೋರಿಸು(_w)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ:"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "ಗುರುತು(_d):"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ:"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "ಟನಲ್‌ ಮಾಡಲಾದ TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "ಸಂರಕ್ಷಿತ EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "ಅಜ್ಞಾತ"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "ದೃಢೀಕರಣ(_A):"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "ಖಾಸಗಿ ಕೀಲಿ ಗುಪ್ತಪದ(_P):"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "ಬಗೆ(_T):"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 #, fuzzy
 msgid "Open System"
 msgstr ""
 "ಮುಕ್ತ ವ್ಯವಸ್ಥೆ\n"
 "ಹಂಚಲಾದ ಕೀಲಿ"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 #, fuzzy
 msgid "Shared Key"
 msgstr ""
 "ಮುಕ್ತ ವ್ಯವಸ್ಥೆ\n"
 "ಹಂಚಲಾದ ಕೀಲಿ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 #, fuzzy
 msgid "1 (Default)"
 msgstr ""
@@ -868,107 +915,81 @@ msgstr ""
 "3\n"
 "4"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "ಕೀಲಿ(_K):"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "ಕೀಲಿಯನ್ನು ತೋರಿಸು(_w)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP ಸೂಚಿ(_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Manage your network connections"
-#~ msgstr "ನಿಮ್ಮ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸಿ"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "ನಿಮ್ಮ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿರ್ವಹಿಸಿ ಹಾಗು ಬದಲಾಯಿಸಿ"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "ಸಂಪರ್ಕಗೊಂಡ ಸೂಚನೆಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "DSL ಸಂಪರ್ಕ %d"
 
+#: src/utils/utils.c:535
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "ಒಂದು ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಸಾಧಿಸುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಗೆ "
-#~ "ಬದಲಾಯಿಸಿ."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕಲಾದ ಸೂಚನೆಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER ಅಥವ PEM ಪ್ರಮಾಣಪತ್ರಗಳು (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "ಒಂದು ಜಾಲಬಂಧದಿಂದ ಸಂಪರ್ಕ ಕಡಿದುಹಾಕುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಗೆ "
-#~ "ಬದಲಾಯಿಸಿ."
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, ಅಥವ PKCS#12 ಖಾಸಗಿ ಕೀಲಿಗಳು (*.der, *.pem, *.p12)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "ಸಂಪರ್ಕಗೊಂಡ ಸೂಚನೆಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
+msgid "Wi-Fi _security"
+msgstr "ಸುರಕ್ಷತೆ(_S):"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "ಒಂದು ಜಾಲಬಂಧದಿಂದ ಸಂಪರ್ಕ ಕಡಿದುಹಾಕುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಗೆ "
-#~ "ಬದಲಾಯಿಸಿ."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು ಲಭ್ಯವಿವೆ ಎಂಬ ಸೂಚನೆಗಳನ್ನು ತಡೆಹಿಡಿ"
+msgid "_Network name"
+msgstr "ಜಾಲಬಂಧದ ಹೆಸರು(_N):"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು ಲಭ್ಯವಿರುವುದನ್ನು ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE "
-#~ "ಬದಲಾಯಿಸಿ."
-
-#~ msgid "Stamp"
-#~ msgstr "ಮುದ್ರೆ"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "ಸಿದ್ಧತೆಗಳನ್ನು ಹೊಸ ಆವೃತ್ತಿಗೆ ವರ್ಗಾಯಿಸಬೇಕೆ ಎಂದು ನಿರ್ಧರಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ"
+msgid "C_onnection"
+msgstr "ಸಂಪರ್ಕ(_n):"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wi-Fi ನಿರ್ಮಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
+msgid "Wi-Fi _adapter"
+msgstr "ವೈರ್ಲೆಸ್ ಅಡಾಪ್ಟರ್(_a):"
 
 #, fuzzy
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "ಆಪ್ಲೆಟ್‌ ಅನ್ನು ಬಳಸುವಾಗ ಒಂದು ತಾತ್ಕಾಲಿಕ ಜಾಲಬಂಧವನ್ನು ರಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು "
-#~ "TRUE ಗೆ ಬದಲಾಯಿಸಿ."
+#~ msgid "Manage your network connections"
+#~ msgstr "ನಿಮ್ಮ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸಿ"
 
 #, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "C_A ಪ್ರಮಾಣಪತ್ರ:"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು"
+
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "ನಿಮ್ಮ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿರ್ವಹಿಸಿ ಹಾಗು ಬದಲಾಯಿಸಿ"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/ko.po b/po/ko.po
index b562edf4..ee02686e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet 1.8.22\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-08-13 10:26+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata zanata org>\n"
 "Language-Team: GNOME Korea <gnome-kr googlegroups com>\n"
@@ -33,6 +33,84 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "연결이 되면 알려주지 않음"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "참이면 네트워크에 연결되었을 때 알려주지 않습니다."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "연결이 끊기면 알려주지 않음"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "참이면 네트워크가 끊어졌을 때 알려주지 않습니다."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "가상 사설망 알려주지 않음"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "참이면 가상 사설망에 연결하거나 연결이 끊어졌을 때 알려주지 않습니다."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "네트워크에서 사용 가능한 통지를 무시합니다"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "참이면 와이파이 네트워크가 사용 가능할 때 알려주지 않습니다."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "스탬프"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "설정을 새로운 버전으로 옮겨야 할지를 결정하려고 사용합니다."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "와이파이 만들기 사용하지 않음"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr "참이면 애플릿 사용할 때 애드혹 네트워크를 만들지 않습니다."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "알림 영역에 애플릿 표시"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "거짓으로 설정하면 알림 영역에 애플릿 표시를 하지 않습니다."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA 인증서 무시"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "참이면 CA 인증서가 EAP 인증이 되었는지 경고를 하지 않습니다."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "참이면 CA 인증서가 EAP 2차 인증이 되었는지 경고를 하지 않습니다."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -83,44 +161,73 @@ msgstr "암호:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(없음)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "열쇠 입력 %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA 인증서(_A):"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(알 수 없음)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "선택 "
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "취소 "
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "파일에서 선택 ..."
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA 인증서 불필요(_R)"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "키가 설정되지 않았습니다."
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "개인 인증서 선택..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "비밀키(_K):"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "비밀키 암호(_P):"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "개인 인증서 선택..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "사용자 인증서(_U):"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "암호 표시(_W)"
 
@@ -132,36 +239,36 @@ msgstr "기본"
 msgid "My country is not listed"
 msgstr "내 나라가 목록에 없습니다"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "목록에없음"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "내 요금제가 목록에 없습니다..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "통신사"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "설치된 GSM 장치"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "설치된 CDMA 장치"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "모든 장치"
 
@@ -293,50 +400,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "모바일 광대역 설정 확인"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(없음)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "열쇠 입력 %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "CA 인증서(_A):"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(알 수 없음)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "선택 "
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "취소 "
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "파일에서 선택 ..."
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "개인 인증서 선택..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "사용자 인증서(_U):"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "암호 보이기(_W)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "로그인 오류 : "
@@ -359,13 +422,27 @@ msgstr "이름"
 msgid "Issued By"
 msgstr "발급자"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "개인 인증서 선택..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "사용자 인증서(_U):"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "암호 보이기(_W)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "들어가다 %s 핀"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "취소(_C)"
 
@@ -417,413 +494,362 @@ msgstr "보조 암호(_S):"
 msgid "_Password:"
 msgstr "암호(_P):"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "연결 끊김"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "새로운…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "없음"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128비트 키(Hex 또는 ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128비트 열쇠글"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "동적 WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "개인용 WPA 또는 WPA2"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "기업용 WPA 또는 WPA2"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "개인용 WPA 또는 WPA2"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "만들기(_R)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "연결(_O)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "와이파이 네트워크 '%s'에 연결하려면 암호 또는 암호화 키가 있어야 합니다."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "와이파이 네트워크 인증이 필요합니다"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "와이파이 네트워크에 인증이 필요합니다"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "새 와이파이 네트워크 만들기"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "새 와이파이 네트워크"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "연결하려는 와이파이 네트워크의 이름을 입력하십시오."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "감춰진 와이파이 네트워크에 연결"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "숨겨진 와이파이 네트워크"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "연결하려는 숨겨진 와이파이 네트워크의 이름과 보안 설정을 입력하십시오."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "와이파이 보안(_S):"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "네트워크 이름(_N):"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "연결 이름(_O):"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "와이파이 어댑터(_A):"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s 연결"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DEP 혹은 PEM 인증서(*.det, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "802.1X 보안에서 정의되지 않은 오류 (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA 인증서 불필요(_R)"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "선택한 CA 인증서 파일이 존재하지 않습니다."
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC 파일이 누락되었습니다."
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC 파일 선택..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC 파일(*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "모든 파일"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "익명"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "인증함"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "둘 다"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "익명 사용(_M):"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC 파일(_F):"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "내부 인증(_I):"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "자동 PAC 인증 허용(_V)"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP 사용자 이름 누락"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "누락 된 EAP-LEAP 암호"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "사용자 이름(_U):"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "암호(_P):"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "자동"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "버전 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "버전 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA 인증서 불필요(_R)"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP 버전(_V):"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "서버 인증서 이름의 접미사입니다."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "EAP 사용자 이름 누락"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "누락 된 EAP 암호"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128비트 열쇠글"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "암호 보이기(_O)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS 신원 누락"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA 인증서 불필요(_R)"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "선택한 사용자 인증서 파일이 존재하지 않습니다."
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "선택된 키 없음"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "선택한 키 파일이 존재하지 않습니다."
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "인증 정보(_D):"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "802.1X 보안을 확인하는 알 수없는 오류"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "802.1X 보안에서 정의되지 않은 오류 (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA 인증서 불필요(_R)"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "선택한 CA 인증서 파일이 존재하지 않습니다."
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
 # NOTE: 무선랜 인증방식. '빠르게' 라고 번역하지 말것.
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "터널링을 사용하는 TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "보호되는 EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "인증(_T):"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "누락 된 사용자 이름"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "누락 된 도약 - 암호"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "누락 된 EAP 암호"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "형식(_T):"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "wep-key 누락"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "잘못된 wep-key : 길이가있는 키 %zu 16 진수 만 포함해야합니다."
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "잘못된 wep-key : 길이가있는 키 %zu ASCII 문자 만 포함해야합니다."
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -832,41 +858,41 @@ msgstr ""
 "잘못된 wep-key : 잘못된 키 길이 %zu. 키는 길이 5/13 (ascii) 또는 10/26 (hex) "
 "중 하나 여야합니다."
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "잘못된 wep-key : 암호가 비어 있어야합니다."
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "잘못된 wep-key : 암호는 64 자보다 짧아야합니다."
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "열린 시스템"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "공유 키"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (기본값)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "키(_K):"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "키 표시(_W)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP 인덱스(_X):"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -875,87 +901,59 @@ msgstr ""
 "잘못된 wpa-psk : 잘못된 키 길이 %zu. [8,63] 바이트 또는 64 자리 16 진수 여야"
 "합니다."
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "유효하지 않은 wpa-psk : 16 진수로 64 바이트의 키를 해석 할 수 없습니다."
 
-#~ msgid "Manage your network connections"
-#~ msgstr "네트워크 연결을 관리합니다"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "사용 중인 네트워크 연결"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "네트워크 연결 설정을 관리하고 설정을 바꿉니다"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "연결이 되면 알려주지 않음"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "참이면 네트워크에 연결되었을 때 알려주지 않습니다."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "연결이 끊기면 알려주지 않음"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr "참이면 네트워크가 끊어졌을 때 알려주지 않습니다."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "가상 사설망 알려주지 않음"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "참이면 가상 사설망에 연결하거나 연결이 끊어졌을 때 알려주지 않습니다."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "네트워크에서 사용 가능한 통지를 무시합니다"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "802.1X 보안을 확인하는 알 수없는 오류"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "참이면 와이파이 네트워크가 사용 가능할 때 알려주지 않습니다."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s 연결"
 
-#~ msgid "Stamp"
-#~ msgstr "스탬프"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DEP 혹은 PEM 인증서(*.det, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "설정을 새로운 버전으로 옮겨야 할지를 결정하려고 사용합니다."
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, 또는 PKCS#12 비밀 키(*.der, *.pem, *.p12, *.key)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "와이파이 만들기 사용하지 않음"
+msgid "Wi-Fi _security"
+msgstr "와이파이 보안(_S):"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr "참이면 애플릿 사용할 때 애드혹 네트워크를 만들지 않습니다."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "네트워크 이름(_N):"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "알림 영역에 애플릿 표시"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "연결 이름(_O):"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr "거짓으로 설정하면 알림 영역에 애플릿 표시를 하지 않습니다."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "와이파이 어댑터(_A):"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA 인증서 무시"
+#~ msgid "Manage your network connections"
+#~ msgstr "네트워크 연결을 관리합니다"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr "참이면 CA 인증서가 EAP 인증이 되었는지 경고를 하지 않습니다."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "사용 중인 네트워크 연결"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr "참이면 CA 인증서가 EAP 2차 인증이 되었는지 경고를 하지 않습니다."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "네트워크 연결 설정을 관리하고 설정을 바꿉니다"
 
 # Tag: title
 #~ msgid "NetworkManager"
diff --git a/po/ku.po b/po/ku.po
index fde5aedd..3d910b56 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: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\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,6 +19,85 @@ msgstr ""
 "X-Generator: Virtaal 0.6.1\n"
 "X-Launchpad-Export-Date: 2011-10-17 13:00+0000\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+#, fuzzy
+msgid "Disable disconnected notifications"
+msgstr "negirêdayî"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Damxe"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Sertîfikaya _bikarhêner:"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -65,44 +144,74 @@ msgstr "Şîfre:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(tune)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Sertîfikaya _bikarhêner:"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Mifteya _taybet:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Şî_freya mifteya taybet:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Sertîfikaya _bikarhêner:"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Sertîfikaya _bikarhêner:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Şîfreyê _nîşan bide"
 
@@ -114,35 +223,35 @@ msgstr "Standard"
 msgid "My country is not listed"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr ""
 
@@ -258,51 +367,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(tune)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Sertîfikaya _bikarhêner:"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Sertîfikaya _bikarhêner:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Şîfreyan _nîşan bide"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -325,13 +389,27 @@ msgstr "Nav"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Sertîfikaya _bikarhêner:"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Sertîfikaya _bikarhêner:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Şîfreyan _nîşan bide"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -382,462 +460,450 @@ msgstr "Şî_fre:"
 msgid "_Password:"
 msgstr "Şî_fre:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Veqetîne"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Tune"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Mifteya WEP a 40/128-bit (Hex an ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Şîfreya WEP a 128-bit"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP a dînamîk (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Afirandin"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Girêdan"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Niha bi tora bêqablo '%s' re girêdayî yî."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Mifteya tora bêqablo pêwîst e"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Tora bêqablo ya nû biafirîne"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Tora bêqablo ya nû biafirîne"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Tora bêqablo ya nû"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Li tora bêqablo ya veşartî girê bide..."
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Tora bêqablo ya veşartî"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Ewlehiya bêqablo:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Navê torê:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "_Girêdan:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "_Ewlehiya bêqablo:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "Girêdanên VPN"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr ""
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Sertîfikaya _bikarhêner:"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Navê Bikarhêner:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "Şî_fre:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Bixweber"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Şîfreya WEP a 128-bit"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Şîfreyan _nîşan bide"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Sertîfikaya _bikarhêner:"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "_Nasname:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Sertîfikaya _bikarhêner:"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Şî_freya mifteya taybet:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Cure:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Pergalê vekirî"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Mifteya parvekirî"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Standard)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Mifte:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Mifteyê _nîşan bide"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "Ende_ksa WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Girêdanên VPN"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr ""
+
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Ewlehiya bêqablo:"
+
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Navê torê:"
+
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "_Girêdan:"
+
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Ewlehiya bêqablo:"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Girêdanên torê yên xwe birêve bike"
 
@@ -848,13 +914,6 @@ msgstr ""
 #~ msgid "Manage and change your network connection settings"
 #~ msgstr "Girêdanên torê yên xwe birêve û sererast bike"
 
-#~ msgid "Stamp"
-#~ msgstr "Damxe"
-
-#, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Sertîfikaya _bikarhêner:"
-
 #, fuzzy
 #~ msgid "NetworkManager"
 #~ msgstr "Sepanoka NetworkManager"
@@ -875,10 +934,6 @@ msgstr ""
 #~ msgid "Connection failure"
 #~ msgstr "Lêzêdekirina girêdanê biserneket"
 
-#, fuzzy
-#~ msgid "Device disconnect failed"
-#~ msgstr "negirêdayî"
-
 #, fuzzy
 #~ msgid "Disconnect failure"
 #~ msgstr "Negirêdayî"
diff --git a/po/lt.po b/po/lt.po
index b0a9ef20..89ce0def 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2018-12-08 14:39+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4 gmail com>\n"
 "Language-Team: Lietuvių <gnome-lt lists akl lt>\n"
@@ -24,6 +24,99 @@ msgstr ""
 "X-Generator: Gtranslator 3.30.1\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Išjungti pranešimus apie prisijungimą"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Nustatykite į teigiamą, jei nepageidaujate, kad būtų rodomi pranešimai "
+"jungiantis prie tinklo."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Išjungti pranešimus apie atsijungimą"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Nustatykite į teigiamą, jei nepageidaujate, kad būtų rodomi pranešimai "
+"atsijungus nuo tinklo."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Išjungti VPN pranešimus"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Nustatykite teigiamą, jei norite išjungti pranešimus atsijungiant nuo VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Slėpti „yra atvirų tinklų“ pranešimus"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Nustatykite į teigiamą, jei norite išjungti pranešimus, rodomus esant "
+"prieinamų belaidžio ryšio tinklų."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Antspaudas"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Naudojama norint nustatyti, ar nustatymai turėtų būti perkelti į naują "
+"versiją."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Išjungti belaidžių tinklų kūrimo galimybę"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Nustatykite į teigiamą, jei norite išjungti „adhoc“ tinklų kūrimo galimybę "
+"naudojant šį įtaisą."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Rodyti įtaisą pranešimų vietoje"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "Nustatykite NEIGIAMĄ įtaiso rodymui pranešimų vietoje išjungti."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Nepaisyti LĮ liudijimo"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Nustatykite teigiamą, norėdami išjungti įspėjimus apie LĮ liudijimus EAP "
+"tapatybės nustatyme."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Nustatykite teigiamą, norėdami išjungti įspėjimus apei LĮ liudijimus antroje "
+"EAP tapatybės nustatymo fazėje."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -76,43 +169,72 @@ msgstr "Slaptažodis:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Nėra)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Raktas, esantis %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Liudijimas, esantis %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Nežinoma)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Pasirinkti"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Atsisakyti"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Pasirinkti iš failo…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Nenustatytas joks liudijimas"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Nenustatytas joks raktas"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Pasirinkite raktą, skirtą %s liudijimui"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "%s privatusis ra_ktas"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "%s rakto sla_ptažodis"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Pasirinkite %s liudijimą"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "%s _liudijimas"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "R_odyti slaptažodį"
 
@@ -124,35 +246,35 @@ msgstr "Numatytasis"
 msgid "My country is not listed"
 msgstr "Mano šalies nėra sąraše"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Nėra sąraše"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Mano plano sąraše nėra…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Tiekėjas"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Įdiegtas GSM įrenginys"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Įdiegtas CDMA įrenginys"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Bet koks įrenginys"
 
@@ -284,50 +406,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Patvirtinkite mobiliojo plačiajuosčio ryšio nustatymus"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Nėra)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Raktas, esantis %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Liudijimas, esantis %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Nežinoma)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Pasirinkti"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Atsisakyti"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Pasirinkti iš failo…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Pasirinkite %s liudijimą"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "%s liudijimo sla_ptažodis"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "R_odyti slaptažodžius"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Klaida jungiantis į: "
@@ -348,13 +426,27 @@ msgstr "Pavadinimas"
 msgid "Issued By"
 msgstr "Išdavė"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Pasirinkite %s liudijimą"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s liudijimo sla_ptažodis"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "R_odyti slaptažodžius"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Įveskite %s PIN"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
@@ -402,57 +494,57 @@ msgstr "_Antrinis slaptažodis:"
 msgid "_Password:"
 msgstr "_Slaptažodis:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Spustelėkite, norėdami prisijungti"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Naujas…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nėra"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 bitų raktas (šešioliktainis arba ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bitų slaptafrazė"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinaminis WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ir WPA2 asmeninis"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ir WPA2 industrinis"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA ir WPA2 asmeninis"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "Suku_rti"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "Prisi_jungti"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -460,35 +552,35 @@ msgstr ""
 "Norint gauti prieigą prie belaidžio tinklo „%s“ reikalingi slaptažodžiai ar "
 "šifravimo raktai."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Reikia nustatyti jūsų tapatybę belaidžiame tinkle"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Belaidis tinklas prašo nustatyti jūsų tapatybę"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Sukurti naują belaidį tinklą"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Naujas belaidis tinklas"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Įveskite pageidaujamo sukurti belaidžio tinklo pavadinimą."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Prisijungti prie paslėpto belaidžio tinklo"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Paslėptas belaidis tinklas"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -496,302 +588,256 @@ msgstr ""
 "Įveskite paslėpto belaidžio tinklo, prie kurio norite jungtis, pavadinimą ir "
 "saugos informaciją."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Belaidžio ryšio _sauga"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Tinklo pavadinimas"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "_Ryšys"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "Belaidis _adapteris"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s ryšys"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM liudijimai (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr "DER, PEM ar PKCS#12 privatieji raktai (*.der, *.pem, *.p12, *.key)"
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "neapibrėžta 802.1X saugumo klaida (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "nepasirinktas joks LĮ liudijimas"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "pasirinkto LĮ liudijimo failo nėra"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "trūksta EAP-FAST PAC failo"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Pasirinkite PAC failą"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC failai (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Visi failai"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anoniminis"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Tapatybė nustatyta"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Abu"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Anoni_minė tapatybė"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "PAC _failas"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "_Vidinis tapatybės nustatymas"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Leisti automatinį PAC _teikimą"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "trūksta EAP-LEAP naudotojo vardo"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "trūksta EAP-LEAP slaptažodžio"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "_Naudotojo vardas"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Slaptažodis"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "0-ė versija"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "1-oji versija"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "LĮ liudijimas ne_būtinas"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "PEAP _versija"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Serverio liudijimo pavadinimo priesaga."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Sritis"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "trūksta EAP naudotojo vardo"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "trūksta EAP slaptažodžio"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "trūksta EAP kliento privataus rakto slaptafrazės"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "P_rivataus rakto slaptafrazė"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "R_odyti slaptafrazę"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "trūksta EAP-TLS identiteto"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "nepasirinktas naudotojo liudijimas"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "pasirinkto naudotojo liudijimo failo nėra"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "nepasirinktas raktas"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "pasirinkto rakto failo nėra"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "_Tapatybė"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (be EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Nežinoma klaida tikrinant 802.1X saugumą"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "neapibrėžta 802.1X saugumo klaida (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "nepasirinktas joks LĮ liudijimas"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "pasirinkto LĮ liudijimo failo nėra"
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tuneliuojamas TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Apsaugotas EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Sukonfigūruota išorėje"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "_Tapatybės nustatymas"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "trūksta leap-username"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "trūksta leap-password"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "trūksta EAP slaptažodžio"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Tipas"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "trūksta wep-key"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "netinkamas wep-key: %zu ilgio raktas turi turėti tik šešioliktainius "
 "skaitmenis"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "netinkamas wep-key: %zu ilgio raktas turi turėti tik ascii simbolius"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -800,39 +846,39 @@ msgstr ""
 "netinkamas wep-key: blogas %zu ilgio raktas. Raktas turi būti 5/13 (ascii) "
 "arba 10/26 (šešioliktainis) ilgio"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "netinkamas wep-key: slaptafrazė negali būti tuščia"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "netinkamas wep-key: slaptafrazė turi būti trumpesnė nei 64 simboliai"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Atviroji sistema"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Bendrasis raktas"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (numatytasis)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Raktas"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "R_odyti raktą"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP inde_ksas"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -841,101 +887,54 @@ 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "netinkamas wpa-psk: negalima interpretuoti 64 baitų kaip šešioliktainio "
 "skaičiaus"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Tvarkyti tinklo ryšius"
-
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Sudėtingesnė tinklo konfigūracija"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Tvarkykite ir keiskite savo tinklo ryšių nustatymus"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Išjungti pranešimus apie prisijungimą"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Nustatykite į teigiamą, jei nepageidaujate, kad būtų rodomi pranešimai "
-#~ "jungiantis prie tinklo."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Išjungti pranešimus apie atsijungimą"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Nustatykite į teigiamą, jei nepageidaujate, kad būtų rodomi pranešimai "
-#~ "atsijungus nuo tinklo."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Išjungti VPN pranešimus"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Nustatykite teigiamą, jei norite išjungti pranešimus atsijungiant nuo VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Slėpti „yra atvirų tinklų“ pranešimus"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Nežinoma klaida tikrinant 802.1X saugumą"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Nustatykite į teigiamą, jei norite išjungti pranešimus, rodomus esant "
-#~ "prieinamų belaidžio ryšio tinklų."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s ryšys"
 
-#~ msgid "Stamp"
-#~ msgstr "Antspaudas"
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM liudijimai (*.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Naudojama norint nustatyti, ar nustatymai turėtų būti perkelti į naują "
-#~ "versiją."
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM ar PKCS#12 privatieji raktai (*.der, *.pem, *.p12, *.key)"
 
-#, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Išjungti belaidžių tinklų kūrimo galimybę"
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Belaidžio ryšio _sauga"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Nustatykite į teigiamą, jei norite išjungti „adhoc“ tinklų kūrimo "
-#~ "galimybę naudojant šį įtaisą."
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Tinklo pavadinimas"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Rodyti įtaisą pranešimų vietoje"
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "_Ryšys"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr "Nustatykite NEIGIAMĄ įtaiso rodymui pranešimų vietoje išjungti."
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Belaidis _adapteris"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Nepaisyti LĮ liudijimo"
+#~ msgid "Manage your network connections"
+#~ msgstr "Tvarkyti tinklo ryšius"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Nustatykite teigiamą, norėdami išjungti įspėjimus apie LĮ liudijimus EAP "
-#~ "tapatybės nustatyme."
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Sudėtingesnė tinklo konfigūracija"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Nustatykite teigiamą, norėdami išjungti įspėjimus apei LĮ liudijimus "
-#~ "antroje EAP tapatybės nustatymo fazėje."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Tvarkykite ir keiskite savo tinklo ryšių nustatymus"
 
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
diff --git a/po/lv.po b/po/lv.po
index a895bf8e..9d7fc779 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD2\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2018-03-23 22:08+0200\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs mazurs gmail com>\n"
 "Language-Team: Latvian <lata-l10n googlegroups com>\n"
@@ -23,6 +23,98 @@ msgstr ""
 "2);\n"
 "X-Generator: Lokalize 2.0\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Izslēgt paziņojumus par savienošanos"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Iestatiet to kā “patiess”, lai izslēgtu paziņojumus, kad savienojas ar tīklu."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Izslēgt paziņojumus par atvienošanos"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Iestatiet to kā “patiess”, lai izslēgtu paziņojumus, kad atvienojas no tīkla."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Izslēgt VPN paziņojumus"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Iestatiet to kā “patiess”, lai izslēgtu paziņojumus, kad savienojas vai "
+"atvienojas no VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Noklusēt tīklu pieejamības paziņojumus"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Iestatiet šo kā “patiess”, lai izslēgtu paziņojumus, kad ir pieejams bezvadu "
+"tīkls."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Spiedogs"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Izmanto, lai noteiktu, vai iestatījumus vajadzētu pārnest uz jauno versiju."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Izslēgt Wi-Fi izveidošanu"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Iestatiet to kā “patiess”, lai izslēgtu ekspromta tīklu veidošanu, kad "
+"izmanot šo sīklietotni."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Rādīt sīklietotni paziņojumu laukā"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Iestatiet uz APLAMS, lai izslēgtu sīklietotnes rādīšanu paziņojumu laukā."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignorēt CA sertifikātu"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Iestatiet šo kā “patiess”, lai izslēgtu brīdinājumus par CA sertifikātiem "
+"EAP autentifikācijā."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Iestatiet šo kā “patiess”, lai izslēgtu brīdinājumus par CA sertifikātiem "
+"EAP 2. fāzes autentifikācijā."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -73,43 +165,72 @@ msgstr "Parole:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(nav)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "%s atslēga"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "%s sertifikāts"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Nezināms)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Izvēlēties"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Atcelt"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Izvēlieties no datnes…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Nav iestatīts sertifikāts"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Nav iestatītas atslēgas"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Izvēlieties atslēgu %s sertifikātam"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "%s privātā _atslēga:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "%s atslēgas _parole:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Izvēlieties %s sertifikātu"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "%s _sertifikāts:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Rādīt paroli"
 
@@ -121,35 +242,35 @@ msgstr "Noklusējuma"
 msgid "My country is not listed"
 msgstr "Mana valsts nav sarakstā"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Nav sarakstā"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Mans plāns nav sarakstā…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Operators"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Uzstādītā GSM ierīce"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Uzstādītā CDMA ierīce"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Jebkura ierīce"
 
@@ -282,50 +403,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Apstiprināt mobilās platjoslas iestatījumus"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(nav)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "%s atslēga"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "%s sertifikāts"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Nezināms)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Izvēlēties"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Atcelt"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Izvēlieties no datnes…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Izvēlieties %s sertifikātu"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "%s sertifikāta _parole:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Rādīt paroles"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Kļūda ierakstoties: "
@@ -346,13 +423,27 @@ msgstr "Nosaukums"
 msgid "Issued By"
 msgstr "Izdevējs"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Izvēlieties %s sertifikātu"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "%s sertifikāta _parole:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Rādīt paroles"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Ievadiet %s PIN"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "At_celt"
 
@@ -400,57 +491,57 @@ msgstr "_Sekundārā parole:"
 msgid "_Password:"
 msgstr "_Parole:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Spiediet, lai savienotos"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Jauns…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nav"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 bitu atslēga (Hex vai ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bitu parole"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamiskais WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA un WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA un WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA un WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "Iz_veidot"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "Savien_oties"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -458,35 +549,35 @@ msgstr ""
 "Lai piekļūtu bezvadu tīklam “%s”, ir nepieciešamas paroles vai šifrēšanas "
 "atslēgas."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Nepieciešama bezvadu tīkla autentifikācija"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Bezvadu tīklam ir nepieciešama autentifikācija"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Izveidot jaunu bezvadu tīklu"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Jauns bezvadu tīklu"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Ievadiet izveidojamā bezvadu tīkla nosaukumu."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Savienoties ar slēptu bezvadu tīklu"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Slēpts bezvadu tīkls"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -494,302 +585,252 @@ msgstr ""
 "Ievadiet nosaukumu un drošības iestatījums bezvadu tīklam, ar kuru vēlaties "
 "savienoties."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Bez_vadu drošība:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "Tīkla _nosaukums:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Savien_ojums:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Bezv_adu tīkla ierīce:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s savienojums"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM sertifikāti (*pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "nedefinēta kļūda 802.1X drošībā (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "nav izvēlēts CA sertifikāts"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "izvēlētā CA sertifikāta datne neeksistē"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "trūkst EAP-FAST PAC datnes"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Izvēlieties PAC datni"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC datne (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Visas datnes"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonīmi"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Ar autentifikāciju"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Abi"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Anonī_ma identitāte"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "PAC _datne"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "_Iekšējā autentifikācija"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Atļaut automātisku PAC _nodrošinājumu"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "trūkst EAP-LEAP lietotājvārds"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "trūkst EAP-LEAP paroles"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "_Lietotājvārds"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Parole"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automātiski"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versija 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versija 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Nav nepieciešams CA se_rtifikāts"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "PEAP _versija"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Servera sertifikāta nosaukuma sufikss."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Domēns"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "trūkst EAP lietotājvārds"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "trūkst EAP paroles"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128 bitu parole"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Rādīt paroli"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "trūkst EAP-TLS identitātes"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "nav izvēlēts lietotāja sertifikāts"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "izvēlētā lietotāja sertifikāta datne neeksistē"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "nav izvēlētu atslēgu"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "izvēlētā atslēgas datne neeksistē"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "I_dentitāte"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Nezināma kļūda validējot 802.1X drošību"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "nedefinēta kļūda 802.1X drošībā (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "nav izvēlēts CA sertifikāts"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "izvēlētā CA sertifikāta datne neeksistē"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunelēts TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Aizsargāts EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "Au_tentifikācija"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "trūkst leap lietotāja"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "trūkst leap paroles"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "trūkst EAP paroles"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Tips"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "trūkst wep atslēgas"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "nederīga wep atslēga: atslēga ar garumu %zu var saturēt tikai heksadecimālus "
 "skaitļus"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -797,7 +838,7 @@ msgstr ""
 "nederīga wep atslēga: atslēga ar garumu %zu var saturēt tikai ascii "
 "rakstzīmes"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -806,39 +847,39 @@ msgstr ""
 "nederīga wep atslēga: nepareizs atslēgas garums %zu. Atslēgas garumam ir "
 "jābūt vai nu 5/13 (ascii) vai 10/26 (hex)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "nederīga wep atslēga: parole nevar būt tukša"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "nederīga wep atslēga: parolei ir jābūt īsākai kā 64 rakstzīmes"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Atvērta sistēma"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Koplietošanas atslēga"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (noklusētais)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Atslēga"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "_Rādīt atslēgu"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP inde_kss"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -847,103 +888,58 @@ msgstr ""
 "nederīgs wpa-psk: nederīgs atslēgas garums %zu. Jābūt [8,63] baiti vai 64 "
 "heksadecimālie cipari"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "nederīgs wpa-psk: nevar interpretēt atslēgu ar 64 baitiem kā heksadecimālu"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Pārvaldiet savus tīkla savienojumus"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Neapstrādāta konfigurācija"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Pārvaldiet un mainiet tīkla savienojumu iestatījumus"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Izslēgt paziņojumus par savienošanos"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Iestatiet to kā “patiess”, lai izslēgtu paziņojumus, kad savienojas ar "
-#~ "tīklu."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Izslēgt paziņojumus par atvienošanos"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Iestatiet to kā “patiess”, lai izslēgtu paziņojumus, kad atvienojas no "
-#~ "tīkla."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Izslēgt VPN paziņojumus"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Iestatiet to kā “patiess”, lai izslēgtu paziņojumus, kad savienojas vai "
-#~ "atvienojas no VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Noklusēt tīklu pieejamības paziņojumus"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Nezināma kļūda validējot 802.1X drošību"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Iestatiet šo kā “patiess”, lai izslēgtu paziņojumus, kad ir pieejams "
-#~ "bezvadu tīkls."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s savienojums"
 
-#~ msgid "Stamp"
-#~ msgstr "Spiedogs"
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM sertifikāti (*pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Izmanto, lai noteiktu, vai iestatījumus vajadzētu pārnest uz jauno "
-#~ "versiju."
+#: src/utils/utils.c:547
+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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Izslēgt Wi-Fi izveidošanu"
+msgid "Wi-Fi _security"
+msgstr "Bez_vadu drošība:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Iestatiet to kā “patiess”, lai izslēgtu ekspromta tīklu veidošanu, kad "
-#~ "izmanot šo sīklietotni."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "Tīkla _nosaukums:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Rādīt sīklietotni paziņojumu laukā"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Savien_ojums:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Iestatiet uz APLAMS, lai izslēgtu sīklietotnes rādīšanu paziņojumu laukā."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Bezv_adu tīkla ierīce:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignorēt CA sertifikātu"
+#~ msgid "Manage your network connections"
+#~ msgstr "Pārvaldiet savus tīkla savienojumus"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Iestatiet šo kā “patiess”, lai izslēgtu brīdinājumus par CA sertifikātiem "
-#~ "EAP autentifikācijā."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Neapstrādāta konfigurācija"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Iestatiet šo kā “patiess”, lai izslēgtu brīdinājumus par CA sertifikātiem "
-#~ "EAP 2. fāzes autentifikācijā."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Pārvaldiet un mainiet tīkla savienojumu iestatījumus"
 
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
diff --git a/po/mk.po b/po/mk.po
index 59d8a50d..6e254ba4 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2011-12-24 21:35+0100\n"
 "Last-Translator: Jovan N\n"
 "Language-Team: Macedonian <ossm-members hedona on net mk>\n"
@@ -22,6 +22,109 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Оневозможи ги сите известувања за поврзување"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Поставете го ова на TRUE за да ги оневозможите известувањата при поврзување "
+"на мрежа."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Оневозможи ги сите известувања за исклучување"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Поставете го ова на TRUE за да ги оневозможите известувањата при исклучување "
+"од мрежа."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Оневозможи ги сите известувања за поврзување"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Поставете го ова на TRUE за да ги оневозможите известувањата при исклучување "
+"од мрежа."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Скриј ги известувањата за достапни мрежи"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Поставете го ова на TRUE за да ги оневозможите известувањата кога се "
+"достапни безжични мрежи."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Марка"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Се користи за да се одреди дали поставувањата ќе се мигрираат на понова "
+"верзија."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Оневозможи креирање на Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Поставете го ова на TRUE за да го оневозможите креирањето на adhoc мрежи "
+"кога се користи овој аплет."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Изберете CA сертификат"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Поставете го ова на TRUE за да ги оневозможите известувањата при поврзување "
+"на мрежа."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Поставете го ова на TRUE за да ги оневозможите известувањата при поврзување "
+"на мрежа."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -68,44 +171,77 @@ msgstr "Лозинка:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ништо)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Сертификат на C_A:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Непознато"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Изберете датотека"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Изберете датотека"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Сертификат на C_A:"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Изберете личен сертификат..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Приватен _клуч:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Лозинка на _приватниот клуч:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Изберете личен сертификат..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_Кориснички сертификат:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "П_окажи лозинка"
 
@@ -117,36 +253,36 @@ msgstr "Стандардно"
 msgid "My country is not listed"
 msgstr "Мојата земја не е во листата"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Не е во листата"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Мојата тарифа не е во листата..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Оператор"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Инсталиран GSM уред"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Инсталиран CDMA уред"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Било кој уред"
 
@@ -281,54 +417,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Потврдете ги поставувањата за мобилна широкопојасна врска"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(ништо)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Сертификат на C_A:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Непознато"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-#, fuzzy
-msgid "Select"
-msgstr "Изберете датотека"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-#, fuzzy
-msgid "Select from file…"
-msgstr "Изберете датотека"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Изберете личен сертификат..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Кориснички сертификат:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Покажи ги лозин_ките"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -351,13 +439,27 @@ msgstr "Име"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Изберете личен сертификат..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Кориснички сертификат:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Покажи ги лозин_ките"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -410,59 +512,59 @@ msgstr "_Лозинка:"
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Исклучи се"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ништо"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit клуч (Хексадецимален или ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit фраза за лозинка"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Динамичен WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "К_реирај"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "В_рзи се"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -470,42 +572,42 @@ msgstr ""
 "За да и пристапите на оваа безжична мрежа потребен е енкриптиран клуч или "
 "лозинка '%s'."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Потребна е автентикација за безжична мрежа"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Потребна е автентикација за безжичната мрежа"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Креирај нова безжична мрежа"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Нова безжична мрежа"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Внесете име на безжичната мрежа на која што сакате да се врзете."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Поврзи се со скриена безжична мрежа"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Скриена безжична мрежа"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -514,450 +616,370 @@ msgstr ""
 "Внесете име и безбедносни податоци за безжичната мрежа на која што сакате да "
 "се врзете."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Безжична безбедност:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "Име на _мрежа:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Вр_ска:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Безжичен _адаптер:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "CDMA врска"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Сертификати за DER или PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Сертификат на C_A:"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "Анони_мен идентитет:"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "Автентикација"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Анони_мен идентитет:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "В_натрешна автентикација:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Корисничко име:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Лозинка:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Автоматски"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Верзија 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Верзија 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Сертификат на C_A:"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "Верзија на _PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit фраза за лозинка"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Покажи ја фразата за лозинка"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Сертификат на C_A:"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "И_дентитет:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Сертификат на C_A:"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Тунелиран TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Заштитен EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Непознато"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_Автентикација:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Лозинка на _приватниот клуч:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Тип:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Open System"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Споделен клуч"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (стандардно)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Клуч:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Пок_ажи го клучот"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP инде_кс:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Менаџирајте со Вашите мрежни врски"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "_Рачна конфигурација"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Управувајте и променувајте ги поставувањата на Вашата мрежна врска"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Оневозможи ги сите известувања за поврзување"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "CDMA врска"
 
+#: src/utils/utils.c:535
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Поставете го ова на TRUE за да ги оневозможите известувањата при "
-#~ "поврзување на мрежа."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Оневозможи ги сите известувања за исклучување"
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Сертификати за DER или PEM (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Поставете го ова на TRUE за да ги оневозможите известувањата при "
-#~ "исклучување од мрежа."
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "Приватни клучеви за DER, PEM или PKCS#12 (*.der, *.pem, *.p12)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Оневозможи ги сите известувања за поврзување"
+msgid "Wi-Fi _security"
+msgstr "_Безжична безбедност:"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Поставете го ова на TRUE за да ги оневозможите известувањата при "
-#~ "исклучување од мрежа."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Скриј ги известувањата за достапни мрежи"
+msgid "_Network name"
+msgstr "Име на _мрежа:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Поставете го ова на TRUE за да ги оневозможите известувањата кога се "
-#~ "достапни безжични мрежи."
-
-#~ msgid "Stamp"
-#~ msgstr "Марка"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Се користи за да се одреди дали поставувањата ќе се мигрираат на понова "
-#~ "верзија."
+msgid "C_onnection"
+msgstr "Вр_ска:"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Оневозможи креирање на Wi-Fi"
+msgid "Wi-Fi _adapter"
+msgstr "Безжичен _адаптер:"
 
-#, fuzzy
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Поставете го ова на TRUE за да го оневозможите креирањето на adhoc мрежи "
-#~ "кога се користи овој аплет."
+#~ msgid "Manage your network connections"
+#~ msgstr "Менаџирајте со Вашите мрежни врски"
 
 #, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Изберете CA сертификат"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "_Рачна конфигурација"
+
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Управувајте и променувајте ги поставувањата на Вашата мрежна врска"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/ml.po b/po/ml.po
index f4dc4d09..85b60b4c 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.master.ml\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2013-04-21 23:43+0530\n"
 "Last-Translator: Balasankar C <c balasankar gmail com>\n"
 "Language-Team: Swatantra Malayalam Computing\n"
@@ -21,6 +21,96 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "ബന്ധപ്പെടുമ്പോളുള്ള അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"ഒരു ശൃംഖലയുമായി ബന്ധപ്പെടുമ്പോള്‍, അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true ആക്കുക."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "ബന്ധം വേര്‍പ്പെടുമ്പോളുള്ള അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"ഒരു ശൃംഖലയില്‍ നിന്നും ബന്ധം വിഛേദിക്കുമ്പോള്‍, അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് "
+"true ആക്കുക."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "വിപിഎന്‍ അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"ഒരു വിപിഎനില്‍ നിന്നും ബന്ധം വിഛേദിക്കുമ്പോള്‍ അല്ലെങ്കില്‍ തയ്യാറാക്കുമ്പോള്‍, അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന "
+"രഹിതമാക്കുന്നതിനായി ഇതു് true ആക്കുക."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "ശൃംഖലകള്‍ ലഭ്യമാണെന്ന അറിയിപ്പ് കാണിയ്ക്കേണ്ട"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"വയര്‍ലെസ് ശൃംഖലകള്‍ ലഭ്യമാകുമ്പോള്‍, അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true ആക്കുക."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "സ്റ്റാമ്പ്"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "സജ്ജീകരണങ്ങള്‍ പുതിയ പതിപ്പില്‍ നീക്കേണ്ടതുണ്ടോ എന്നു് നിശ്ചയിക്കുന്നതിനായി ഉപയോഗിക്കുന്നു."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "വൈഫൈ ഉണ്ടാക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുക"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"ലഘുപ്രയോഗം ഉപയോഗിച്ചു് അഡ്ഹോക് ശൃംഖലകള്‍ തയ്യാറാക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true "
+"ആക്കുക."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "ലഘുപ്രയോഗം അറിയിപ്പുകളുടെ സ്ഥാനത്ത് കാണിക്കുക"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "ലഘുപ്രയോഗം അറിയിപ്പുകളുടെ സ്ഥാനത്ത് കാണിക്കാതിരിക്കാൻ FALSE എന്ന് ആക്കുക"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് വേണ്ടെന്നു്വയ്ക്കുക"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"ഇഎപി ആധികാരികത ഉറപ്പാക്കലിലുള്ള സിഎ സര്‍ട്ടിഫിക്കേറ്റുകളെപ്പറ്റിയുള്ള മുന്നറിയിപ്പുകള്‍ പ്രവര്‍ത്തന "
+"രഹിതമാക്കുന്നതിനായി ഇതു് true ആയി സജ്ജമാക്കുക."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"ഇഎപി ആധികാരികത ഉറപ്പാക്കലിന്റെ രണ്ടാം ഘട്ടത്തിലുള്ള സിഎ സര്‍ട്ടിഫിക്കേറ്റുകളെപ്പറ്റിയുള്ള "
+"മുന്നറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true ആയി സജ്ജമാക്കുക."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -67,44 +157,75 @@ msgstr "അടയാളവാക്ക്:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ഒന്നുമില്ല)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A സര്‍ട്ടിഫീക്കേറ്റ്:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "അപരിചിതം"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്:"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "സ്വകാര്യ _കീ:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_സ്വകാര്യ കീ അടയാളവാക്ക്:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_ഉപയോക്താവിന്റെ സര്‍ട്ടിഫീക്കേറ്റ്:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "അടയാളവാക്ക് കാ_ണിക്കുക"
 
@@ -116,36 +237,36 @@ msgstr "സ്വതവേയുള്ള"
 msgid "My country is not listed"
 msgstr "എന്റെ രാജ്യം ലഭ്യമല്ല"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "ജിഎസ്എം"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "സിഡിഎംഎ"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "പട്ടികയിലില്ലാത്ത"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "എന്റെ പ്ലാന്‍ പട്ടികയിലില്ല..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "പ്രൊവൈഡര്‍"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്തിരിക്കുന്ന GSM ഡിവൈസ്"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്തിരിക്കുന്ന CDMA ഡിവൈസ്"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "ഏതെങ്കിലും ഡിവൈസ്"
 
@@ -278,52 +399,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് സജ്ജീകരണങ്ങള്‍ ഉറപ്പാക്കുക"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(ഒന്നുമില്ല)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "C_A സര്‍ട്ടിഫീക്കേറ്റ്:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "അപരിചിതം"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_ഉപയോക്താവിന്റെ സര്‍ട്ടിഫീക്കേറ്റ്:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "അടയാളവാക്കുകള്‍ _കാണിക്കുക"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -346,13 +421,27 @@ msgstr "പേര്"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_ഉപയോക്താവിന്റെ സര്‍ട്ടിഫീക്കേറ്റ്:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "അടയാളവാക്കുകള്‍ _കാണിക്കുക"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -403,59 +492,59 @@ msgstr "_ദ്വിതീയ തലത്തിലുള്ള അടയാള
 msgid "_Password:"
 msgstr "_അടയാളവാക്ക്:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "ബന്ധം വിഛേദിക്കുക"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ഒന്നുമില്ല"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "ഡബ്ലിയുഇപി 40/128-bit കീ (ഹെക്സോ ആസ്കിയോ)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit പാസ്‌ഫ്രെയിസ്"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "എല്‍ഇഎപി"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ഡൈനമിക് WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 പേഴ്സണല്‍"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 എന്റര്‍പ്രൈസ്"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 പേഴ്സണല്‍"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_ഉണ്ടാക്കുക"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_കണക്ട് ചെയ്യുക"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -463,35 +552,35 @@ msgstr ""
 "വയര്‍ലെസ് ശൃംഖല '%s'-ലേക്ക് പ്രവേശിക്കുന്നതിനായി അടയാളവാക്കുകള്‍ അല്ലെങ്കില്‍ എന്‍ക്രിപ്ഷന്‍ കീകള്‍ "
 "ആവശ്യമുണ്ടു്."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "വയര്‍ലെസ് ശൃംഖല ആധികാരികത ആവശ്യമുണ്ടു്"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "വയര്‍ലെസ് ശൃംഖല ആധികാരികത ഉറപ്പിക്കുന്നതിനായി ആവശ്യപ്പെട്ടിരിക്കുന്നു"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "പുതിയ വയര്‍ലെസ് ശൃംഖല ഉണ്ടാക്കുക"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "പുതിയ വയര്‍ലെസ് ശൃംഖല"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "നിങ്ങള്‍ ഉണ്ടാക്കുവാന്‍ ആഗ്രഹിക്കുന്ന വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിന്റെ പേരു് നല്‍കുക."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "അദൃശ്യമായ വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിലേക്ക് കണക്ട് ചെയ്യുക"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "അദൃശ്യമായ വയര്‍ലെസ് ശൃംഖല"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -499,460 +588,369 @@ msgstr ""
 "നിങ്ങള്‍ കണക്ട് ചെയ്യുവാന്‍ ആഗ്രഹിക്കുന്ന അദൃശ്യമായ വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിന്റ് പേരും സുരക്ഷാ "
 "വിശദാംശങ്ങളും നല്‍കുക"
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_വയര്‍ലെസ് സുരക്ഷ:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_ശൃംഖലയുടെ പേരു്:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "ക_ണക്ഷന്‍:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "വയര്‍ലെസ് _അഡാപ്ടര്‍:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s കണക്ഷന്‍"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER അല്ലെങ്കില്‍ PEM സര്‍ട്ടിഫീക്കേറ്റുകള്‍ (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്:"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ഒരു പിഎസി ഫയല്‍ തിരഞ്ഞെടുക്കുക..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "പിഎസി ഫയലുകള്‍ (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "എല്ലാ ഫയലുകളും"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "വെളിപ്പെടുത്താതെ"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "തിരിച്ചറിഞ്ഞിരിയ്ക്കുന്നു"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "രണ്ടും"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "_അ‍ജ്ഞാതം:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "പിഎസി _ഫയല്‍:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_ആന്തരിക ആധികാരികത ഉറപ്പാക്കല്‍"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ഓട്ടോമാറ്റിക് പിഎസി അനുവദിയ്ക്കുക"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_ഉപയോക്താവിന്റെ പേരു്:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_അടയാളവാക്ക്:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "സ്വയം"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "പതിപ്പ് 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "പതിപ്പ് 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "പിഇഎപി _പതിപ്പ്:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit പാസ്‌ഫ്രെയിസ്"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "അടയാളവാക്കുക _കാണിക്കുക"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്:"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "_തിരിച്ചറിയല്‍:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്:"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "എഫ്എഎസ്‌ടി"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "ടണ്‍ല്ഡ് TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "സുരക്ഷിതമായ EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "അപരിചിതം"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_തിരിച്ചറിയല്‍:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "_സ്വകാര്യ കീ അടയാളവാക്ക്:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_തരം:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "തുറന്ന സിസ്റ്റം"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "പങ്കുവച്ച കീ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (സഹജം)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_കീ:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "കീ കാ_ണിക്കുക"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP _സൂചിക:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "നിങ്ങളുടെ ശൃംഖല ബന്ധങ്ങള്‍ കൈകാര്യം ചെയ്യുക"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "സജീവ ശൃംഖല ബന്ധങ്ങള്‍"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr ""
-#~ "നിങ്ങളുടെ ശൃംഖല ബന്ധങ്ങള്‍ സജ്ജീകരണങ്ങള്‍ കൈകാര്യം ചെയ്യുകയും മാറ്റങ്ങള്‍ വരുത്തുകയും ചെയ്യുക."
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "ബന്ധപ്പെടുമ്പോളുള്ള അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "ഒരു ശൃംഖലയുമായി ബന്ധപ്പെടുമ്പോള്‍, അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true ആക്കുക."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "ബന്ധം വേര്‍പ്പെടുമ്പോളുള്ള അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "ഒരു ശൃംഖലയില്‍ നിന്നും ബന്ധം വിഛേദിക്കുമ്പോള്‍, അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് "
-#~ "true ആക്കുക."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "വിപിഎന്‍ അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "ഒരു വിപിഎനില്‍ നിന്നും ബന്ധം വിഛേദിക്കുമ്പോള്‍ അല്ലെങ്കില്‍ തയ്യാറാക്കുമ്പോള്‍, അറിയിപ്പുകള്‍ പ്രവര്‍"
-#~ "ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true ആക്കുക."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "ശൃംഖലകള്‍ ലഭ്യമാണെന്ന അറിയിപ്പ് കാണിയ്ക്കേണ്ട"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "വയര്‍ലെസ് ശൃംഖലകള്‍ ലഭ്യമാകുമ്പോള്‍, അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true ആക്കുക."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s കണക്ഷന്‍"
 
-#~ msgid "Stamp"
-#~ msgstr "സ്റ്റാമ്പ്"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER അല്ലെങ്കില്‍ PEM സര്‍ട്ടിഫീക്കേറ്റുകള്‍ (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "സജ്ജീകരണങ്ങള്‍ പുതിയ പതിപ്പില്‍ നീക്കേണ്ടതുണ്ടോ എന്നു് നിശ്ചയിക്കുന്നതിനായി ഉപയോഗിക്കുന്നു."
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, അല്ലെങ്കില്‍ PKCS#12 സ്വകാര്യ കീകള്‍ (*.der, *.pem, *.p12)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "വൈഫൈ ഉണ്ടാക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുക"
+msgid "Wi-Fi _security"
+msgstr "_വയര്‍ലെസ് സുരക്ഷ:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "ലഘുപ്രയോഗം ഉപയോഗിച്ചു് അഡ്ഹോക് ശൃംഖലകള്‍ തയ്യാറാക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് "
-#~ "true ആക്കുക."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_ശൃംഖലയുടെ പേരു്:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "ലഘുപ്രയോഗം അറിയിപ്പുകളുടെ സ്ഥാനത്ത് കാണിക്കുക"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "ക_ണക്ഷന്‍:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr "ലഘുപ്രയോഗം അറിയിപ്പുകളുടെ സ്ഥാനത്ത് കാണിക്കാതിരിക്കാൻ FALSE എന്ന് ആക്കുക"
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "വയര്‍ലെസ് _അഡാപ്ടര്‍:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് വേണ്ടെന്നു്വയ്ക്കുക"
+#~ msgid "Manage your network connections"
+#~ msgstr "നിങ്ങളുടെ ശൃംഖല ബന്ധങ്ങള്‍ കൈകാര്യം ചെയ്യുക"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "ഇഎപി ആധികാരികത ഉറപ്പാക്കലിലുള്ള സിഎ സര്‍ട്ടിഫിക്കേറ്റുകളെപ്പറ്റിയുള്ള മുന്നറിയിപ്പുകള്‍ പ്രവര്‍"
-#~ "ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true ആയി സജ്ജമാക്കുക."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "സജീവ ശൃംഖല ബന്ധങ്ങള്‍"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
+#~ msgid "Manage and change your network connection settings"
 #~ msgstr ""
-#~ "ഇഎപി ആധികാരികത ഉറപ്പാക്കലിന്റെ രണ്ടാം ഘട്ടത്തിലുള്ള സിഎ സര്‍ട്ടിഫിക്കേറ്റുകളെപ്പറ്റിയുള്ള "
-#~ "മുന്നറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true ആയി സജ്ജമാക്കുക."
+#~ "നിങ്ങളുടെ ശൃംഖല ബന്ധങ്ങള്‍ സജ്ജീകരണങ്ങള്‍ കൈകാര്യം ചെയ്യുകയും മാറ്റങ്ങള്‍ വരുത്തുകയും ചെയ്യുക."
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/mr.po b/po/mr.po
index 810c612f..5fa3ec31 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mr\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2011-03-28 16:06+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak redhat com>\n"
 "Language-Team: Marathi <fedora-trans-mr redhat com>\n"
@@ -19,6 +19,94 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "जोडलेले सूचना बंद करा"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "नेटवर्कशी जोडणी करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "खंडीत सूचना बंद करा"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "नेटवर्कशी खंडन करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "जोडलेले सूचना बंद करा"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "नेटवर्कशी खंडन करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "नेटवर्क्स् उपलब्धता सूचना दाखवू नका"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "वायरलेस नेटवर्क्स् उपलब्ध झाल्यावर यांस TRUE असे सेट करा."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "स्टॅम्प"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "सेटिंग्स्ला नवीन आवृत्तीकरीता स्थानांतरीत करायचे, हे ओळखण्यासाठी वापर केला जातो."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Wi-Fi निर्माण बंद करा"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"ऍप्लेटचा वापर करतेवेळी ऍडहॉक नेटवर्क्स्चे निर्माण बंद करण्यासाठी यांस TRUE असे सेट करा."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "CA प्रमाणपत्र नीवडा"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "नेटवर्कशी जोडणी करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "नेटवर्कशी जोडणी करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -65,44 +153,75 @@ msgstr "पासवर्ड:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(काहिच नाही)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA प्रमाणपत्र (_A):"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "अपरिचीत"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "प्राइव्हेट कि (_k):"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "प्राइव्हेट कि पासवर्ड (_P):"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "वापरकर्त्याचे प्रमाणपत्र (_U):"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "पासवर्ड दाखवा (_w)"
 
@@ -114,36 +233,36 @@ msgstr "पूर्वनिर्धारीत"
 msgid "My country is not listed"
 msgstr "माझे देश सूचीत नाही"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "सूचीत नाही"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "माजे प्लॅन सूचीत नाही..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "प्रोव्हाइडर"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "प्रतिष्ठापीत GSM साधन"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "प्रतिष्ठापीत CDMA साधन"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "कुठलेही साधण"
 
@@ -275,52 +394,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "मोबाइल ब्रॉडबँड सेटिंग्स्ची खात्री करा"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(काहिच नाही)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "CA प्रमाणपत्र (_A):"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "अपरिचीत"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "वापरकर्त्याचे प्रमाणपत्र (_U):"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "पासवर्डस् दाखवा (_w)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -343,13 +416,27 @@ msgstr "नाव"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "वापरकर्त्याचे प्रमाणपत्र (_U):"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "पासवर्डस् दाखवा (_w)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -402,59 +489,59 @@ msgstr "पासवर्ड (_P):"
 msgid "_Password:"
 msgstr "पासवर्ड (_P):"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "जोडणी मोडा"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "काहीच नाही"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-बीट कि (Hex किंवा ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit गोपनीयता"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "गतिक WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 खाजगी"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 एन्टरप्राइज"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 खाजगी"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "बनवा (_r)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "जुळवा (_o)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -462,42 +549,42 @@ msgstr ""
 "वायरलेस नेटवर्क '%s' करीता प्रवेश प्राप्त करण्यासाठी पासवर्ड किंवा एनक्रीपसन कि आवश्यक "
 "आहे."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "वायरलेस नेटवर्क ओळख पटवणे आवश्यक"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "वायरलेस नेटवर्क द्वारे ओळख पटवणे आवश्यक आहे"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "नवीन वायरलेस नेटवर्क बनवा"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "नवीन वायरलेस नेटवर्क"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "पसंतीचे वायरलेस नेटवर्क करीता नाव प्रविष्ट करा."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "लपवलेले वायरलेस नेटवर्कशी जुळवा"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "लपविलेले वायरलेस नेटवर्क"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -506,441 +593,371 @@ msgstr ""
 "पसंतीचे लपविलेले वायरलेस नेटवर्कशी जोडणी स्थापीत करण्याकरीता नाव व सुरक्षा तपशील प्रविष्ट "
 "करा."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "वायरलेस सुरक्षा (_W):"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "नेटवर्कचे नाव (_N):"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "जोडणी (_n):"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "वायरलेस अडॅप्टर (_a):"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "DSL जोडणी %d"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER किंवा PEM प्रमाणपत्र (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC फाइल पसंत करा..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC फाइल्स (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "सर्व फाइल्स"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "निनावी ओळख (_m):"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "ओळख पटवा"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "निनावी ओळख (_m):"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "सर्व फाइल्स"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "आंतरीक ओळख पटवा (_n):"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "वापरकर्त्याचे नाव (_U):"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "पासवर्ड (_P):"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "स्वयं"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "आवृत्ती 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "आवृत्ती 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP आवृत्ती (_P):"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit गोपनीयता"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "पासवर्डस् दाखवा (_w)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "ओळख (_d):"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "टनल्ड् TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "प्रोटेक्टेड EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "अपरिचीत"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "ओळख पटवा (_A):"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "प्राइव्हेट कि पासवर्ड (_P):"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "प्रकार (_T):"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "ओपन प्रणाली"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "शेअर्ड् कि"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (पूर्वनिर्धारीत)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "कि (_K):"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "कि दाखवा (_w)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP इंडेक्स् (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "नेटवर्क जोडणी नियंत्रीत करा"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "सक्रीय नेटवर्क जोडणी"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "नेटवर्क संयोजना व्यवस्थापीत करा व बदला"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "जोडलेले सूचना बंद करा"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "DSL जोडणी %d"
 
+#: src/utils/utils.c:535
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "नेटवर्कशी जोडणी करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "खंडीत सूचना बंद करा"
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER किंवा PEM प्रमाणपत्र (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr "नेटवर्कशी खंडन करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, किंवा PKCS#12 वैयक्तिक किज् (*.der, *.pem, *.p12)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "जोडलेले सूचना बंद करा"
+msgid "Wi-Fi _security"
+msgstr "वायरलेस सुरक्षा (_W):"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr "नेटवर्कशी खंडन करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "नेटवर्क्स् उपलब्धता सूचना दाखवू नका"
+msgid "_Network name"
+msgstr "नेटवर्कचे नाव (_N):"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "वायरलेस नेटवर्क्स् उपलब्ध झाल्यावर यांस TRUE असे सेट करा."
-
-#~ msgid "Stamp"
-#~ msgstr "स्टॅम्प"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "सेटिंग्स्ला नवीन आवृत्तीकरीता स्थानांतरीत करायचे, हे ओळखण्यासाठी वापर केला जातो."
+msgid "C_onnection"
+msgstr "जोडणी (_n):"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wi-Fi निर्माण बंद करा"
+msgid "Wi-Fi _adapter"
+msgstr "वायरलेस अडॅप्टर (_a):"
 
-#, fuzzy
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "ऍप्लेटचा वापर करतेवेळी ऍडहॉक नेटवर्क्स्चे निर्माण बंद करण्यासाठी यांस TRUE असे सेट करा."
+#~ msgid "Manage your network connections"
+#~ msgstr "नेटवर्क जोडणी नियंत्रीत करा"
 
 #, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA प्रमाणपत्र नीवडा"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "सक्रीय नेटवर्क जोडणी"
+
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "नेटवर्क संयोजना व्यवस्थापीत करा व बदला"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/ms.po b/po/ms.po
index 681e229d..ad1f1d87 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2011-11-14 13:25+0730\n"
 "Last-Translator: Umarzuki Bin Mochlis Moktar <umarzuki gmail com>\n"
 "Language-Team: Malay <gnome-ms googlegroups com>\n"
@@ -19,6 +19,109 @@ msgstr ""
 "X-Poedit-Language: Malay\n"
 "X-Poedit-Country: MALAYSIA\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Lumpuhkan pemberitahuan apabila telah tersambung"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Set ini ke TRUE untuk mematikan pemberitahuan apabila menyambung kepada "
+"rangkaian"
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Lumpuhkan pemberitahuan apabila telah terputus"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Set ini ke TRUE untuk mematikan pemberitahuan apabila memutuskan dari "
+"rangkaian."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Lumpuhkan pemberitahuan apabila telah tersambung"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"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."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Redam notifikasi rangkaian tersedia"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"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."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Cop"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Diguna untuk menentukan sama ada tetapan sedia ada patut dipindahkan ke "
+"versi baharu."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Lumpuhkan Cipta Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"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."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Pilih sijil CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Set ini ke TRUE untuk mematikan pemberitahuan apabila menyambung kepada "
+"rangkaian"
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Set ini ke TRUE untuk mematikan pemberitahuan apabila menyambung kepada "
+"rangkaian"
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -65,44 +168,75 @@ msgstr "Katalaluan:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(tiada)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Sijil C_A"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Tidak diketahui"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Sijil C_A"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Pilih sijil peribadi anda..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "_Kekunci peribadi"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_Katalaluan Kunci Persendirian:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Pilih sijil peribadi anda..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_Sijil pengesahan pengguna:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Tunjuk katalaluan"
 
@@ -114,36 +248,36 @@ msgstr "Piawai"
 msgid "My country is not listed"
 msgstr "Negara saya tidak tersenarai"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Tidak tersenarai"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Plan saya tidak disenaraikan..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Pengendali"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Terpasang peranti GSM"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Terpasang peranti CDMA"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Mana-mana peranti"
 
@@ -281,52 +415,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Sahkan Tetapan Jalurlebar Mudahalih"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(tiada)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Sijil C_A"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Tidak diketahui"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Pilih sijil peribadi anda..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Sijil pengesahan pengguna:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Tunjuk katalaluan"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -349,13 +437,27 @@ msgstr "Nama"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Pilih sijil peribadi anda..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Sijil pengesahan pengguna:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Tunjuk katalaluan"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -408,59 +510,59 @@ msgstr "_Katalaluan:"
 msgid "_Password:"
 msgstr "_Katalaluan:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Putuskan"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Tiada"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Kunci WEP 40/128-bit (Hex atau ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Frasalaluan WEP 128-bit"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP (802.1X) Dinamik"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Peribadi"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Perusahaan"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Peribadi"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_ipta"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "S_ambung"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -468,42 +570,42 @@ msgstr ""
 "Kata laluan atau kunci penyulitan diperlukan untuk mengakses rangkaian tanpa "
 "wayar '% s'."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Pengesahan Rangkaian Wayarles Diperlukan"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Pengesahan diperlukan oleh rangkaian wayarles"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Cipta Sambungan Wayarles Baharu"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Rangkaian wayarles baharu"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Sambung ke Rangkaian Wayarles Tersembunyi"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Rangkaian wayarles tersembunyi"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -512,450 +614,370 @@ msgstr ""
 "Masukkan nama dan perincian keselamatan rangkaian tanpa wayar yang "
 "tersembunyi yang anda ingin sambungkan ke."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Sekuriti _wayarles"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Nama Rangkain:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "S_ambungan:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Penyesuai w_ayarles:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "Sambungan Asas:"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Sijil-sijil DER atau PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Sijil C_A"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "_Identiti tidak diketahui:"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "Pengesahan"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "_Identiti tidak diketahui:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Pengesahan Dalaman:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Namapengguna:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Katalaluan:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatik"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versi 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versi 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Sijil C_A"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "_PEAP versi:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Frasalaluan WEP 128-bit"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "_Tunjuk katalaluan"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Sijil C_A"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_dentiti:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Sijil C_A"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Terowong TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP Terlindung (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_Pengesahan:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "_Katalaluan Kunci Persendirian:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Jenis:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistem Terbuka"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Kunci Dikongsi"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Piawai)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Kekunci"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "T_unjuk Kunci"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "Inde_x WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Urus sambungan-sambungan rangkaian anda"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Sambungan-sangbungan Rangkaian Aktif"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Urus dan pinda tetapan sambungan rangkaian anda"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Lumpuhkan pemberitahuan apabila telah tersambung"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Sambungan Asas:"
 
+#: src/utils/utils.c:535
 #, 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"
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Lumpuhkan pemberitahuan apabila telah terputus"
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Sijil-sijil DER atau PEM (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Set ini ke TRUE untuk mematikan pemberitahuan apabila memutuskan dari "
-#~ "rangkaian."
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "Kekunci peribadi DER, PEM, atau PKCS#12 (*.der, *.pem, *.p12)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Lumpuhkan pemberitahuan apabila telah tersambung"
+msgid "Wi-Fi _security"
+msgstr "Sekuriti _wayarles"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "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."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Redam notifikasi rangkaian tersedia"
+msgid "_Network name"
+msgstr "_Nama Rangkain:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "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."
-
-#~ msgid "Stamp"
-#~ msgstr "Cop"
-
-#~ 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."
+msgid "C_onnection"
+msgstr "S_ambungan:"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Lumpuhkan Cipta Wi-Fi"
+msgid "Wi-Fi _adapter"
+msgstr "Penyesuai w_ayarles:"
 
-#, fuzzy
-#~ msgid ""
-#~ "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."
+#~ msgid "Manage your network connections"
+#~ msgstr "Urus sambungan-sambungan rangkaian anda"
 
 #, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Pilih sijil CA"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Sambungan-sangbungan Rangkaian Aktif"
+
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Urus dan pinda tetapan sambungan rangkaian anda"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/nb.po b/po/nb.po
index db69d582..8c2c89f3 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: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\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,6 +18,98 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Slå av varsling om tilkobling"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Sett denne til «true» For å slå av varsling ved tilkobling til et nettverk."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Slå av varsling om frakobling"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Sett denne til «true» for å slå av varsling ved frakobling fra et nettverk."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Slå av varsling om VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Sett denne til true for å slå av varsling ved til- eller frakobling fra et "
+"VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Slå av varsling om tilgjengelige nettverk"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Sett denne til true for å slå av varsling når Wi-Fi-nettverk er "
+"tilgjengelige."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Stempel"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Brukes til å bestemme om innstillingene skal migreres til en ny versjon."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Slå av oppretting av Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Sett til true for å slå av oppretting av ad-hoc nettverk når panelprogrammet "
+"brukes."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Vis panelprogrammet i varslingsområdet"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Sett til FALSE for å slå av visning av panelprogrammet i varslingsområdet."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Overse CA-sertifikat"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Sett denne til «true» for å slå av advarsler om CA-sertifikater med EAP-"
+"autentisering."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Sett denne til «true» for å slå av advarsler om CA-sertifikater i fase 2 av "
+"EAP-autentisering."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -64,44 +156,75 @@ msgstr "Passord:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ingen)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A-sertifikat:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Ukjent"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA-sertifikat k_reves ikke"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Velg ditt personlige sertifikat …"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Privat nø_kkel:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Passord for _privat nøkkel:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Velg ditt personlige sertifikat …"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Br_ukersertifikat:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Vis passord"
 
@@ -113,36 +236,36 @@ msgstr "Forvalg"
 msgid "My country is not listed"
 msgstr "Landet mitt er ikke på listen"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Ikke listet"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Min plan er ikke på listen …"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Tilbyder"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Installert GSM-enhet"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Installert CDMA-enhet"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Enhver enhet"
 
@@ -278,52 +401,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Bekreft innstillinger for mobilt bredbånd"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(ingen)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "C_A-sertifikat:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Ukjent"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Velg ditt personlige sertifikat …"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Br_ukersertifikat:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Vis passord"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -346,13 +423,27 @@ msgstr "Navn"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Velg ditt personlige sertifikat …"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Br_ukersertifikat:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Vis passord"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -405,59 +496,59 @@ msgstr "_Sekundært passord:"
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Koble fra"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ingen"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit nøkkel (Heksadesimal eller ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit passord"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisk WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 personlig"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 personlig"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Lag"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "K_oble til"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -465,497 +556,403 @@ msgstr ""
 "Passord eller krypteringsnøkler er nødvendig for å koble til Wi-Fi-nettverk "
 "«%s»."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentisering for Wi-Fi-nettverk kreves"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentisering kreves av Wi-Fi-nettverk"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Lag et nytt Wi-Fi-nettverk"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nytt Wi-Fi-nettverk"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Koble til skjult Wi-Fi-nettverk"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Skjult Wi-Fi-nettverk"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 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/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Wi-Fi-_sikkerhet:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Nettverksnavn:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Tilkobli_ng:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Wi-Fi-_kort:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s-tilkobling"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER eller PEM-sertifikater (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA-sertifikat k_reves ikke"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Velg en PAC-fil …"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Alle filer"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autentisert"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Begge"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Anony_m identitet:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC-_fil:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_Indre autentisering:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillat automatisk PAC-pro_visjonering"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "Br_ukernavn:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Passord:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versjon 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versjon 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA-sertifikat k_reves ikke"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP-_versjon:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit passord"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Vis pass_ord"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA-sertifikat k_reves ikke"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_dentitet:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA-sertifikat k_reves ikke"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunnelert TLS (TTLS)"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Beskyttet EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Au_tentisering:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Passord for _privat nøkkel:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Type:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Åpent system"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Delt nøkkel"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (forvalg)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "Nø_kkel:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "_Vis nøkkel"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP-inde_ks:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Håndter dine nettverksforbindelser"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Aktive nettverkstilkoblinger"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Håndter og endre innstillinger for nettverksforbindelser"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Slå av varsling om tilkobling"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Sett denne til «true» For å slå av varsling ved tilkobling til et "
-#~ "nettverk."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Slå av varsling om frakobling"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Sett denne til «true» for å slå av varsling ved frakobling fra et "
-#~ "nettverk."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Slå av varsling om VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Sett denne til true for å slå av varsling ved til- eller frakobling fra "
-#~ "et VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Slå av varsling om tilgjengelige nettverk"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Sett denne til true for å slå av varsling når Wi-Fi-nettverk er "
-#~ "tilgjengelige."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s-tilkobling"
 
-#~ msgid "Stamp"
-#~ msgstr "Stempel"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER eller PEM-sertifikater (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Brukes til å bestemme om innstillingene skal migreres til en ny versjon."
+#: src/utils/utils.c:547
+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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Slå av oppretting av Wi-Fi"
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi-_sikkerhet:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Sett til true for å slå av oppretting av ad-hoc nettverk når "
-#~ "panelprogrammet brukes."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Nettverksnavn:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Vis panelprogrammet i varslingsområdet"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Tilkobli_ng:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Sett til FALSE for å slå av visning av panelprogrammet i varslingsområdet."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi-_kort:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Overse CA-sertifikat"
+#~ msgid "Manage your network connections"
+#~ msgstr "Håndter dine nettverksforbindelser"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Sett denne til «true» for å slå av advarsler om CA-sertifikater med EAP-"
-#~ "autentisering."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Aktive nettverkstilkoblinger"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Sett denne til «true» for å slå av advarsler om CA-sertifikater i fase 2 "
-#~ "av EAP-autentisering."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Håndter og endre innstillinger for nettverksforbindelser"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/ne.po b/po/ne.po
index 9f413380..f7ef8a17 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.network-manager-applet-0-6.ne\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2007-11-13 20:36+0545\n"
 "Last-Translator: Shyam Krishna Bal <shyamkrishna_bal yahoo com>\n"
 "Language-Team: Nepali <info mpp org np>\n"
@@ -19,6 +19,85 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n !=1\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+#, fuzzy
+msgid "Disable disconnected notifications"
+msgstr "जडान विच्छेदन भयो"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "सीए प्रमाणपत्र फाइल:"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -66,44 +145,74 @@ msgstr "पासवर्ड:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "कुनै पनि होइन"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "सीए प्रमाणपत्र फाइल:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "निजी कुञ्जी फाइल:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "निजी कुञ्जी पासवर्ड:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 #, fuzzy
 msgid "Sho_w password"
 msgstr "पासवर्ड देखाउनुहोस्"
@@ -117,35 +226,35 @@ msgstr "पूर्वनिर्धारित राउट:"
 msgid "My country is not listed"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr ""
 
@@ -261,35 +370,25 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "कुनै पनि होइन"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
+#: src/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "सीए प्रमाणपत्र फाइल:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr ""
+#: src/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "जडान जानकारी प्रदर्शन गर्दा त्रुटि:"
 
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:116
+msgid "Name"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
 msgstr ""
 
 #: src/nma-pkcs11-cert-chooser.c:381
@@ -307,34 +406,13 @@ msgstr "सीए प्रमाणपत्र फाइल:"
 msgid "Sho_w passwords"
 msgstr "पासवर्ड देखाउनुहोस्"
 
-#: src/nma-pkcs11-cert-chooser-dialog.c:241
-msgid "Error logging in: "
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.c:263
-#, fuzzy
-msgid "Error opening a session: "
-msgstr "जडान जानकारी प्रदर्शन गर्दा त्रुटि:"
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:20
-msgid "_Unlock token"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:116
-msgid "Name"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:126
-msgid "Issued By"
-msgstr ""
-
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -386,101 +464,101 @@ msgstr "गौण डीएनएस:"
 msgid "_Password:"
 msgstr "पासवर्ड:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "तारसहित सञ्जाल जडान"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "कुनै पनि होइन"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 64/128-bit ASCII"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit पासफ्रेज"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "गतिशील WEP"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 #, fuzzy
 msgid "WPA & WPA2 Personal"
 msgstr "WPA2 व्यक्तिगत"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 #, fuzzy
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA2 उद्यमशिलता"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA व्यक्तिगत"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "जडान गर्नुहोस्"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ताररहित सञ्जाल कुञ्जी चाहियो"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "तपाईँले जडान गर्न चाहनुभएको ताररहित सञ्जालको नाम प्रविष्ट गर्नुहोस् ।"
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "अन्य ताररहित सञ्जालमा जडान गर्नुहोस्"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -488,375 +566,363 @@ msgid ""
 msgstr ""
 "तपाईँले सिर्जना गर्न चाहनुभएको ताररहित सञ्जालको नाम र सुरक्षा सेटिङ प्रविष्ट गर्नुहोस् ।"
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "ताररहित सुरक्षा:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "सञ्जाल नाम:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "जडान गर्नुहोस्"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "ताररहित एडप्टर:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "भीपीएन जडान"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr ""
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "सीए प्रमाणपत्र फाइल:"
-
-#: src/wireless-security/eap-method.c:356
-#, fuzzy
-msgid "selected CA certificate file does not exist"
-msgstr "सीए प्रमाणपत्र फाइल चयन गर्नुहोस्"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 #, fuzzy
 msgid "MSCHAPv2"
 msgstr "MSCHAPV2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "बेनामी पहिचान:"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "प्रमाणीकरण:"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "बेनामी पहिचान:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "प्रमाणीकरण:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "प्रयोगकर्ता नाम:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "पासवर्ड:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 #, fuzzy
 msgid "Automatic"
 msgstr "स्वचालित (पूर्वानिर्धारण)"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit पासफ्रेज"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "पासफ्रेज देखाउनुहोस्"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "पहिचान:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPV2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 #, fuzzy
 msgid "CHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "सीए प्रमाणपत्र फाइल:"
+
+#: src/nma-ws/nma-eap.c:353
+#, fuzzy
+msgid "selected CA certificate file does not exist"
+msgstr "सीए प्रमाणपत्र फाइल चयन गर्नुहोस्"
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "प्रमाणीकरण:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "निजी कुञ्जी पासवर्ड:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "प्रकार:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "खुल्ला प्रणाली"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "साझेदार गरिएको कुञ्जी"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 #, fuzzy
 msgid "1 (Default)"
 msgstr "कुनै पनि होइन (पूर्वानिर्धारित)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "कुञ्जी:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 #, fuzzy
 msgid "Sho_w key"
 msgstr "कुञ्जी देखाउनुहोस्"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "भीपीएन जडान"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr ""
+
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "ताररहित सुरक्षा:"
+
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "सञ्जाल नाम:"
+
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "जडान गर्नुहोस्"
+
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "ताररहित एडप्टर:"
+
 #, fuzzy
 #~ msgid "Manage your network connections"
 #~ msgstr "सञ्जाल जडान छैन"
@@ -865,10 +931,6 @@ msgstr ""
 #~ msgid "Advanced Network Configuration"
 #~ msgstr "भीपीएन कन्फिगरेसन त्रुटि"
 
-#, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "सीए प्रमाणपत्र फाइल:"
-
 #, fuzzy
 #~ msgid "NetworkManager"
 #~ msgstr "सञ्जालप्रबन्धक एप्लेट"
@@ -893,10 +955,6 @@ msgstr ""
 #~ msgid "Connection failure"
 #~ msgstr "भीपीएन जडान असफलता"
 
-#, fuzzy
-#~ msgid "Device disconnect failed"
-#~ msgstr "जडान विच्छेदन भयो"
-
 #, fuzzy
 #~ msgid "Disconnect failure"
 #~ msgstr "जडान विच्छेदन भयो"
diff --git a/po/nl.po b/po/nl.po
index 7ee9ee16..94ee0303 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-03-04 16:37+0100\n"
 "Last-Translator: Nathan Follens <nthn unseen is>\n"
 "Language-Team: Dutch <gnome-nl-list gnome org>\n"
@@ -26,6 +26,101 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-05-18 08:04+0000\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Geen meldingen tonen bij verbinding"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Stel dit in op ‘true’ om geen meldingen te krijgen bij het verbinden met een "
+"netwerk."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Geen meldingen tonen bij verbroken verbinding"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+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."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "VPN-meldingen uitschakelen"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Stel dit in op ‘true’ om geen meldingen te krijgen bij het maken of "
+"verbreken van een verbinding met een VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Meldingen over beschikbare draadloze netwerken onderdrukken"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+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 wifi-netwerken "
+"beschikbaar zijn."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Stempel"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Gebruikt om te bepalen of instellingen moeten worden overgezet naar een "
+"nieuwe versie."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Wifi-aanmaken uitschakelen"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Stel dit in op ‘true’ om te zorgen dat er geen ad-hocnetwerken aangemaakt "
+"kunnen worden bij gebruik van de toepassing."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Toon het programmaatje in het mededelingengebied"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+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:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA-certificaat negeren"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+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."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Stel dit in op ‘true’ om waarschuwingen over CA-certificaten in fase 2 van "
+"EAP-authenticatie uit te schakelen."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -78,43 +173,73 @@ msgstr "Wachtwoord:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+# niets/geen
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Geen)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Sleutel in %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificaat in %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Onbekend)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Selecteren"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Uit bestand selecteren…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Geen certificaat ingesteld"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Geen sleutel ingesteld"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Kies een sleutel voor certificaat %s"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "%s privé_sleutel"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "Wa _chtwoord %s sleutel"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Kies een %s certificaat"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "%s _certificaat"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Wachtwoord _tonen"
 
@@ -126,36 +251,36 @@ msgstr "Standaard"
 msgid "My country is not listed"
 msgstr "Mijn land komt niet in de lijst voor"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
 # komt niet in de lijst voor/onbekend/niet in de lijst
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Niet in de lijst"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Mijn abonnement komt niet in de lijst voor…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Provider"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "GSM-apparaat geïnstalleerd"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "CDMA-apparaat geïnstalleerd"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Elk apparaat"
 
@@ -292,51 +417,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Mobiele breedbandinstellingen bevestigen"
 
-# niets/geen
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Geen)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Sleutel in %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Certificaat in %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Onbekend)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Selecteren"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Uit bestand selecteren…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Kies een %s certificaat"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "Wa_chtwoord %s certificaat"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Wachtwoorden _tonen"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Fout bij het aanmelden: "
@@ -358,13 +438,27 @@ msgstr "Naam"
 msgid "Issued By"
 msgstr "Uitgegeven door"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Kies een %s certificaat"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "Wa_chtwoord %s certificaat"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Wachtwoorden _tonen"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Voer pincode in voor %s"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Annuleren"
 
@@ -413,58 +507,58 @@ msgstr "_Tweede wachtwoord:"
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Klikken om te verbinden"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Nieuw…"
 
 # zonder/geen
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Geen"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit sleutel (Hex or ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit wachtwoordzin"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisch WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 persoonlijk"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 zakelijk"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 persoonlijk"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Aanmaken"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -472,35 +566,35 @@ msgstr ""
 "Wachtwoorden of encryptiesleutels zijn vereist om toegang te krijgen tot het "
 "wifi-netwerk ‘%s’."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Authenticatie wifi-netwerk vereist"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Het wifi-netwerk vereist authenticatie"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Nieuw wifi-netwerk aanmaken"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nieuw wifi-netwerk"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Voer een naam in voor het wifi-netwerk dat u wilt aanmaken."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Verbinden met verborgen wifi-netwerk"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Verborgen wifi-netwerk"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -508,297 +602,251 @@ msgstr ""
 "Voer de naam en de beveiligingsgegevens in van het verborgen wifi-netwerk "
 "waarmee u wilt verbinden."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Wifi-_beveiliging"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Netwerknaam"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "_Verbinding"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "Wifi-_adapter"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s-verbinding"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM-certificaten (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "ongedefinieerde fout in 802.1X-beveiliging (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "geen CA-certificaat geselecteerd"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "het geselecteerde CA-certificaatbestand bestaat niet"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "ontbrekend EAP-FAST PAC-bestand"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Kies een PAC-bestand"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-bestanden (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anoniem"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Authenticatie gelukt"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Beide"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Anonie_me identiteit"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "PAC-_bestand"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "_Interne authenticatie"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Automatische PAC-aanlevering _toestaan"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "ontbrekende EAP-LEAP-gebruikersnaam"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "ontbrekend EAP-LEAP-wachtwoord"
 
 # inlognaam/gebruikersnaam
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "Gebr_uikersnaam"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Wachtwoord"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versie 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versie 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Geen CA-certificaat _vereist"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "PEAP-_versie"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Suffix van de naam van het servercertificaat."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Domein"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "ontbrekende EAP-gebruikersnaam"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "ontbrekend EAP-wachtwoord"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "wachtwoord voor privésleutel van EAP-cliënt ontbreekt"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "Wachtwoord van privésleutel"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "Wachtwoord _tonen"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "ontbrekende EAP-TLS-identiteit"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "geen gebruikerscertificaat geselecteerd"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "geselecteerd gebruikerscertificaatbestand bestaat niet"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "geen sleutel geselecteerd"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "geselecteerde sleutelbestand bestaat niet"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "I_dentiteit"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (geen EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Onbekende fout bij het valideren van de 802.1X-beveiliging"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "ongedefinieerde fout in 802.1X-beveiliging (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "geen CA-certificaat geselecteerd"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "het geselecteerde CA-certificaatbestand bestaat niet"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Getunnelde TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Beschermde EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Extern ingesteld"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "Au_thenticatie"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "ontbrekende leap-gebruikersnaam"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "ontbrekend leap-wachtwoord"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "ontbrekend EAP-wachtwoord"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Type"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "ontbrekende wep-sleutel"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -806,7 +854,7 @@ msgstr ""
 "ongeldige wep-sleutel: sleutel met een lengte van %zu mag alleen ascii-"
 "tekens bevatten"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -815,39 +863,39 @@ 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 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:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 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:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Open systeem"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Gedeelde sleutel"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Standaard)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Sleutel"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Sleutel _tonen"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP-inde_x"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -856,12 +904,46 @@ msgstr ""
 "ongeldige wpa-psk: ongeldige sleutellengte %zu. Moet [8,63] bytes of 64 hex-"
 "cijfers zijn"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 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/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Onbekende fout bij het valideren van de 802.1X-beveiliging"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s-verbinding"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM-certificaten (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+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/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Wifi-_beveiliging"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Netwerknaam"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "_Verbinding"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Wifi-_adapter"
+
 # geen netwerk/netwerkverbinding
 #~ msgid "Manage your network connections"
 #~ msgstr "Uw netwerkverbindingen beheren"
@@ -878,89 +960,6 @@ msgstr ""
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Geen meldingen tonen bij verbinding"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Stel dit in op ‘true’ om geen meldingen te krijgen bij het verbinden met "
-#~ "een netwerk."
-
-#~ msgid "Disable disconnected notifications"
-#~ 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."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "VPN-meldingen uitschakelen"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Stel dit in op ‘true’ om geen meldingen te krijgen bij het maken of "
-#~ "verbreken van een verbinding met een VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ 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 wifi-"
-#~ "netwerken beschikbaar zijn."
-
-#~ msgid "Stamp"
-#~ msgstr "Stempel"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Gebruikt om te bepalen of instellingen moeten worden overgezet naar een "
-#~ "nieuwe versie."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wifi-aanmaken uitschakelen"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Stel dit in op ‘true’ om te zorgen dat er geen ad-hocnetwerken aangemaakt "
-#~ "kunnen worden bij gebruik van de toepassing."
-
-#~ 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 "Ignore CA certificate"
-#~ msgstr "CA-certificaat negeren"
-
-#~ 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."
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Stel dit in op ‘true’ om waarschuwingen over CA-certificaten in fase 2 "
-#~ "van EAP-authenticatie uit te schakelen."
-
 #~ msgid "NetworkManager"
 #~ msgstr "Netwerkbeheer"
 
diff --git a/po/nn.po b/po/nn.po
index c5206d70..e0f91039 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.1.x\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2012-05-08 10:24+0200\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds ulrik uio no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-no lister ping uio no>\n"
@@ -21,6 +21,97 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Lokalize 1.4\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Slå av varsel om tilkopling"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "Set til TRUE for å slå av varsel når du koplar til eit nettverk."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Slå av varsel om fråkopling"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "Set til TRUE for å slå av varsel når du koplar frå eit nettverk."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Slå av varsel om tilkopling"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "Set til TRUE for å slå av varsel når du koplar frå eit nettverk."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Hindra varsel om tilgjengelege nettverk"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Set til TRUE for å slå av varsel når trådlause nettverk er tilgjengelege."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Stempel"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Brukt til å fastslå om innstillingar skal verta migrert til ein ny versjon."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Slå av laging av trådlaust nettverk"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"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."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Vel CA-sertifikat"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "Set til TRUE for å slå av varsel når du koplar til eit nettverk."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "Set til TRUE for å slå av varsel når du koplar til eit nettverk."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -67,44 +158,75 @@ msgstr "Passord:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ingen)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A-sertifikat:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Ukjend"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "C_A-sertifikat:"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Vel ditt personlege sertifikat …"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Privat nø_kkel:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_Passord for privat nøkkel:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Vel ditt personlege sertifikat …"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Br_ukarsertifikat:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "V_is passord"
 
@@ -116,36 +238,36 @@ msgstr "Standard"
 msgid "My country is not listed"
 msgstr "Mitt land er ikkje oppgjeve"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Ikkje lista"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Min plan er ikkje oppgjeven …"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Tilbydar"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Innstallert GSM-eining"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Installert CDMA-eining"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Eikvar eining"
 
@@ -281,52 +403,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Stadfest innstillingar for mobilt breiband"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(ingen)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "C_A-sertifikat:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Ukjend"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Vel ditt personlege sertifikat …"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Br_ukarsertifikat:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Vis passord"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -349,13 +425,27 @@ msgstr "Namn"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Vel ditt personlege sertifikat …"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Br_ukarsertifikat:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Vis passord"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -408,59 +498,59 @@ msgstr "_Passord:"
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Kopla frå"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ingen"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-nøkkel (Heksadesimal eller ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit passfrase"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisk WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 personleg"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 personleg"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "L_ag"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "K_oble til"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -468,42 +558,42 @@ msgstr ""
 "Passord eller krypteringsnøklar er nødvendig for å kopla til det trådlause "
 "nettverket «%s»."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentisering for trådlaust nettverk påkravd"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentisering er påkravd av det trådlause nettverket"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Opprett nytt trådlaust nettverk"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Nytt trådlaust nettverk"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Kopla til eit gøymt trådlaust nettverk"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Gøymt trådlaust nettverk"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -512,443 +602,370 @@ msgstr ""
 "Oppgje namnet og tryggleiksdetaljane til det gøymde trådlause nettverket du "
 "ynskjer å kopla til."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Tr_ådlaus tryggleik:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Nettverksnamn:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Tilkopli_ng:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Trådlaust _kort:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "Grunntilkopling:"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER- eller PEM-sertifikat (*.der, *.pem, *.crt, *cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "C_A-sertifikat:"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Vel PAC-fil …"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Alle filer"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autentisert"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Begge"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Anony_m identitet:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC-_fil:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "I_ndre autentisering:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillat automatisk PAC-_tildeling"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Brukarnamn:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Passord:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versjon 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versjon 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "C_A-sertifikat:"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP-_versjon:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit passfrase"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "_Vis passord"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "C_A-sertifikat:"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_dentitet:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "C_A-sertifikat:"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunnelert TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Verna EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Au_tentisering:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "_Passord for privat nøkkel:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Type:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Ope system"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Delt nøkkel"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Forval)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "Nø_kkel:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "_Vis nøkkel"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP-indek_s:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Handsam nettverkstilkoplingane"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Aktive nettverkstilkoplingar"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Handter og endra innstillingar for nettverkstilkopling"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Slå av varsel om tilkopling"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Grunntilkopling:"
 
+#: src/utils/utils.c:535
 #, 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."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Slå av varsel om fråkopling"
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER- eller PEM-sertifikat (*.der, *.pem, *.crt, *cer)"
 
+#: src/utils/utils.c:547
 #, 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."
+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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Slå av varsel om tilkopling"
+msgid "Wi-Fi _security"
+msgstr "Tr_ådlaus tryggleik:"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr "Set til TRUE for å slå av varsel når du koplar frå eit nettverk."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Hindra varsel om tilgjengelege nettverk"
+msgid "_Network name"
+msgstr "_Nettverksnamn:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Set til TRUE for å slå av varsel når trådlause nettverk er tilgjengelege."
-
-#~ msgid "Stamp"
-#~ msgstr "Stempel"
-
-#~ 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."
+msgid "C_onnection"
+msgstr "Tilkopli_ng:"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Slå av laging av trådlaust nettverk"
+msgid "Wi-Fi _adapter"
+msgstr "Trådlaust _kort:"
 
-#, fuzzy
-#~ msgid ""
-#~ "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."
+#~ msgid "Manage your network connections"
+#~ msgstr "Handsam nettverkstilkoplingane"
 
 #, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Vel CA-sertifikat"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Aktive nettverkstilkoplingar"
+
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Handter og endra innstillingar for nettverkstilkopling"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/oc.po b/po/oc.po
index 7eb866a5..7a9f6d76 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: oc\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2016-03-10 21:49+0200\n"
 "Last-Translator: Cédric Valmary (totenoc.eu) <cvalmary yahoo fr>\n"
 "Language-Team: Tot En Òc\n"
@@ -21,6 +21,102 @@ msgstr ""
 "X-Launchpad-Export-Date: 2015-05-20 17:00+0000\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Desactivar las notificacions de connexion"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Definir aqueste paramètre a verai (true) per desactivar las notificacions al "
+"moment de la connexion a una ret."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Desactivar las notificacions de desconnexion"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Definir aqueste paramètre a verai (true) per desactivar las notificacions al "
+"moment de la desconnexion a una ret."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Desactivar las notificacions VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Definir aqueste paramètre a verai (true) per desactivar las notificacions al "
+"moment de la connexion o de la desconnexion a un VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Desactivar las notificacions de disponibilitat de rets sens fial"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Definir aqueste paramètre a verai (true) per desactivar las notificacions al "
+"moment de la disponibilitat de rets Wi-Fi."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Tampon"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Servís a determinar se los paramètres devon èsser migrats dins una version "
+"novèla."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Desactivar la creacion Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Definir aqueste paramètre a verai (true) per desactivar la creacion d'una "
+"ret adhoc al moment de l'utilizacion de l'applet."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Afichar l'applet dins la zòna de notificacion"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Definir a FALS (FALSE) per desactivar l'afichatge de l'applet dins la zòna "
+"de notificacion."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignorar lo certificat de CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Definir aqueste paramètre a verai (true) per desactivar los avertiments a "
+"prepaus dels certificats CA dins l'autentificacion EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Definir aqueste paramètre a verai (true) per desactivar los avertiments a "
+"prepaus dels certificats CA dins la fasa 2 de l'autentificacion EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -67,44 +163,76 @@ msgstr "Mot de pas :"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(pas cap)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Certificat del C_A :"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Desconegut"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Aucun certificat de CA n'est _requis"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Causissètz lo certificat de CA :"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "_Clau privada :"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_Senhal de la clau privada :"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Causissètz lo certificat de CA :"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Certificat de l'_utilizaire :"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "A_fichar lo senhal"
 
@@ -116,36 +244,36 @@ msgstr "Per defaut"
 msgid "My country is not listed"
 msgstr "Mon país es pas dins la lista"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Pas dins la lista"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Mon plan figura pas dins la lista..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Provesidor"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Periferic GSM installat"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Periferic CDMA installat"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Un aparelh quin que siá"
 
@@ -283,53 +411,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmacion dels paramètres de connexion mobila de benda larga"
 
-#
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(pas cap)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Certificat del C_A :"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Desconegut"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Causissètz lo certificat de CA :"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Certificat de l'_utilizaire :"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "A_fichar los senhals"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -352,13 +433,27 @@ msgstr "Nom"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Causissètz lo certificat de CA :"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Certificat de l'_utilizaire :"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "A_fichar los senhals"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -406,58 +501,58 @@ msgstr "Senhal _segondari :"
 msgid "_Password:"
 msgstr "Sen_hal :"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Clicar per se connectar"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Pas cap"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clau WEP 40/128-bit (Hex o ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Frasa secreta WEP 128-bit"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinamic (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA e WPA2 personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA e WPA2 entrepresa"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA e WPA2 personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_rear"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "C_onnectat"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -465,35 +560,35 @@ msgstr ""
 "De senhals o de claus de chiframent son necessaris per l'accès a la ret Wi-"
 "Fi « %s »."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentificacion necessària per la ret Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentificacion demandada per la ret Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Creacion d'una novèla ret Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Novèla ret Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connexion a la ret Wi-Fi invisibla"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Ret Wi-Fi amagada"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -501,464 +596,368 @@ msgstr ""
 "Picatz lo nom e los detalhs de seguretat de la ret Wi-Fi invisibla a la "
 "quala vos volètz connectar."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Seguretat Wi-Fi :"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Nom de la ret :"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Co_nnexion :"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Ad_aptador Wi-Fi :"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Connexion %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certificats DER o PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Aucun certificat de CA n'est _requis"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Causir un fichièr PAC..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Fichièr PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Totes los fichièrs"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonim"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autentificat"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Los dos"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Identitat anoni_ma :"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "Fichièr _PAC :"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Autentificacion i_ntèrna :"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "P_ermetre lo provisionament PAC automatic"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "Nom d'_utilizaire :"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "Sen_hal :"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Version 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Version 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Aucun certificat de CA n'est _requis"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "Version de _PEAP :"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Frasa secreta WEP 128-bit"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "A_fichar los senhals"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Aucun certificat de CA n'est _requis"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_dentitat :"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Aucun certificat de CA n'est _requis"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegit (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Au_tentificacion :"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "_Senhal de la clau privada :"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Tipe :"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistèma dobèrt"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Clau partejada"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (per defaut)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Clau :"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "A_fichar la clau"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "Indè_x WEP :"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Gerissètz vòstras connexions a la ret"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Connexions de ret activas"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Gerir e modificar los paramètres de las connexions de ret"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Desactivar las notificacions de connexion"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Definir aqueste paramètre a verai (true) per desactivar las notificacions "
-#~ "al moment de la connexion a una ret."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Desactivar las notificacions de desconnexion"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Definir aqueste paramètre a verai (true) per desactivar las notificacions "
-#~ "al moment de la desconnexion a una ret."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Desactivar las notificacions VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Definir aqueste paramètre a verai (true) per desactivar las notificacions "
-#~ "al moment de la connexion o de la desconnexion a un VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Desactivar las notificacions de disponibilitat de rets sens fial"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Definir aqueste paramètre a verai (true) per desactivar las notificacions "
-#~ "al moment de la disponibilitat de rets Wi-Fi."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Connexion %s"
 
-#~ msgid "Stamp"
-#~ msgstr "Tampon"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certificats DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Servís a determinar se los paramètres devon èsser migrats dins una "
-#~ "version novèla."
+#: src/utils/utils.c:547
+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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Desactivar la creacion Wi-Fi"
+msgid "Wi-Fi _security"
+msgstr "_Seguretat Wi-Fi :"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Definir aqueste paramètre a verai (true) per desactivar la creacion d'una "
-#~ "ret adhoc al moment de l'utilizacion de l'applet."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Nom de la ret :"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Afichar l'applet dins la zòna de notificacion"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Co_nnexion :"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Definir a FALS (FALSE) per desactivar l'afichatge de l'applet dins la "
-#~ "zòna de notificacion."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Ad_aptador Wi-Fi :"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignorar lo certificat de CA"
+#~ msgid "Manage your network connections"
+#~ msgstr "Gerissètz vòstras connexions a la ret"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Definir aqueste paramètre a verai (true) per desactivar los avertiments a "
-#~ "prepaus dels certificats CA dins l'autentificacion EAP."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Connexions de ret activas"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Definir aqueste paramètre a verai (true) per desactivar los avertiments a "
-#~ "prepaus dels certificats CA dins la fasa 2 de l'autentificacion EAP."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Gerir e modificar los paramètres de las connexions de ret"
 
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
diff --git a/po/or.po b/po/or.po
index be444bcc..7250995c 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2014-12-02 05:43-0500\n"
 "Last-Translator: mgiri <mgiri redhat com>\n"
 "Language-Team: Oriya <Translation-team-or lists sourceforge net>\n"
@@ -20,6 +20,97 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Zanata 3.5.1\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "ସଂଯୁକ୍ତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ହେବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "ଅସଂଯୁକ୍ତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "ସଂଯୁକ୍ତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "ନେଟୱର୍କ ଉପଲବ୍ଧ ବିଜ୍ଞପ୍ତିକୁ ଲୁଚାଇ ଦିଅନ୍ତୁ"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "ବେତାର ନେଟୱର୍କ ଉପଲବ୍ଧ ଥିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "ଷ୍ଟାମ୍ପ"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "ବିନ୍ୟାସକୁ ଗୋଟିଏ ନୂତନ ସଂସ୍କରଣକୁ ସ୍ଥାନାନ୍ତରଣ କରିବା ଉଚିତ କି ନୁହଁ ତାହା ନିର୍ଦ୍ଧାରଣ କରୁଅଛି।"
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Wi-Fi ନିର୍ମାଣକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"ଆପଲେଟ ବ୍ୟବହାର କରୁଥିବା ସମୟରେ ଏଡହକ ନେଟୱର୍କଗୁଡ଼ିକର ନିର୍ମାଣକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ "
+"କରନ୍ତୁ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "CA ପ୍ରମାଣ ପତ୍ର (_A):"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ହେବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ହେବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -67,44 +158,75 @@ msgstr "ପ୍ରବେଶ ସଙ୍କେତ:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(କିଛି ନାହିଁ)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA ପ୍ରମାଣ ପତ୍ର (_A):"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "ଅଜଣା"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "ବ୍ୟକ୍ତିଗତ କି (_k):"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ (_P):"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "ଚାଳକ ପ୍ରମାଣପତ୍ର (_U):"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ ଦର୍ଶାନ୍ତୁ (_w)"
 
@@ -116,36 +238,36 @@ msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ"
 msgid "My country is not listed"
 msgstr "ମୋର ଦେଶ ତାଲିକାଭୁକ୍ତ ହୋଇନାହିଁ"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "ତାଲିକାଭୁକ୍ତ ହୋଇନଥିବା"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "ମୋର ଯୋଜନା ତାଲିକାଭୁକ୍ତ ହୋଇନାହିଁ..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "ପ୍ରଦାତା"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "ସ୍ଥାପିତ GSM ଉପକରଣ"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "ସ୍ଥାପିତ CDMA ଉପକରଣ"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "କୌଣସି ଉପଦେଶ ଅଛି କି"
 
@@ -279,52 +401,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂରଚନାକୁ ନିଶ୍ଚିତ କରନ୍ତୁ"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(କିଛି ନାହିଁ)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "CA ପ୍ରମାଣ ପତ୍ର (_A):"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "ଅଜଣା"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "ଚାଳକ ପ୍ରମାଣପତ୍ର (_U):"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "ପ୍ରବେଶ ସଂକେତ ଦର୍ଶାନ୍ତୁ (_w)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -347,13 +423,27 @@ msgstr "ନାମ"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "ଚାଳକ ପ୍ରମାଣପତ୍ର (_U):"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "ପ୍ରବେଶ ସଂକେତ ଦର୍ଶାନ୍ତୁ (_w)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -406,101 +496,101 @@ msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
 msgid "_Password:"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "କିଛି ନୁହେଁ"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-ବିଟ କି (Hex ଅଥବା ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-ବିଟ ପ୍ରବେଶ ସଂକେତ"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ଗତିଜ WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ବ୍ୟକ୍ତିଗତ"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ଉଦ୍ଦୋଗ"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 ବ୍ୟକ୍ତିଗତ"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "ସୃଷ୍ଟି କରନ୍ତୁ (_r)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "ସଂଯୋଗ କରନ୍ତୁ (_o)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "ବେତାର ନେଟୱର୍କ '%s' କୁ ଅଭିଗମ୍ୟ କରିବା ପାଇଁ ପ୍ରବେଶ ସଂକେତ କିମ୍ବା ସଂଗୁପ୍ତ କିଗୁଡ଼ିକ ଆବଶ୍ୟକ।"
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ବେତାର ନେଟୱର୍କ ବୈଧିକରଣ ଆବଶ୍ୟକ"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "ବେତାର ନେଟୱର୍କ ପାଇଁ ପ୍ରାଧିକରଣ ଆବଶ୍ୟକ"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "ନୂତନ ବେତାର ନେଟୱର୍କ ନିର୍ମାଣ କରନ୍ତୁ"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "ନୂତନ ବେତାର ନେଟୱର୍କ"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ଆପଣ ନିର୍ମାଣ କରିବାକୁ ଚାହୁଁଥିବା ବେତାର ନେଟୱର୍କ ପାଇଁ ଗୋଟିଏ ନାମ ଭରଣ କରନ୍ତୁ।"
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "ଲୁକ୍କାଇତ ବେତାର ନେଟୱର୍କ ସହିତ ସଂଯୋଗ କରନ୍ତୁ"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "ଲୁକ୍କାଇତ ବେତାର ନେଟୱର୍କ"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -509,353 +599,301 @@ msgstr ""
 "ଆପଣ ସଂଯୋଗ ସ୍ଥାପନ କରିବାକୁ ଚାହୁଁଥିବା ଲୁକ୍କାୟିତ ବେତାର ନେଟୱର୍କର ନାମ ଏବଂ ସୁରକ୍ଷା ବିବରଣୀଗୁଡ଼ିକୁ ଭରଣ "
 "କରନ୍ତୁ।"
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "ସୁରକ୍ଷା (_S):"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "ନେଟୱର୍କ ନାମ (_N):"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "ସଂଯୋଗ (_n):"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "ବେତାର ଏଡପ୍ଟର (_a):"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "DSL ସଂଯୋଗ %d"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER କିମ୍ବା PEM ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକ (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ଗୋଟିଏ PAC ଫାଇଲ ଚୟନ କରନ୍ତୁ..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ଫାଇଲଗୁଡ଼ିକ (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "ସମସ୍ତ ଫାଇଲଗୁଡ଼ିକ"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "ଅଜଣା ପରିଚୟ (_m):"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "ବୈଧିକରଣ (_A):"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "ଅଜଣା ପରିଚୟ (_m):"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC ଫାଇଲ (_P):"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "ଆଭ୍ୟନ୍ତରୀଣ ବୈଧିକରଣ (_n):"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 #, fuzzy
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ସ୍ୱୟଂଚାଳିତ PAC ସୁବିଧାକୁ ଅନୁମତି ଦିଅନ୍ତୁ (_A)"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "ଚାଳକ ନାମ (_U):"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "ସ୍ବୟଂଚାଳିତ"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP ସଂସ୍କରଣ (_P):"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-ବିଟ ପ୍ରବେଶ ସଂକେତ"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "ପ୍ରବେଶ ସଂକେତ ଦର୍ଶାନ୍ତୁ (_w)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "ପରିଚୟ (_d):"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "ତୀବ୍ର"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "ଟନେଲଯୁକ୍ତ TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "ସୁରକ୍ଷିତ EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "ଅଜଣା"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "ବୈଧିକରଣ (_A):"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ (_P):"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "ପ୍ରକାର (_T):"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 #, fuzzy
 msgid "Open System"
 msgstr ""
 "ଖୋଲା ତନ୍ତ୍ର\n"
 "ସହଭାଗୀ କି"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 #, fuzzy
 msgid "Shared Key"
 msgstr ""
 "ଖୋଲା ତନ୍ତ୍ର\n"
 "ସହଭାଗୀ କି"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 #, fuzzy
 msgid "1 (Default)"
 msgstr ""
@@ -864,105 +902,81 @@ msgstr ""
 "3\n"
 "4"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "କି (_K):"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "କି ଦର୍ଶାନ୍ତୁ (_w)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP ଅନୁକ୍ରମଣିକା (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Manage your network connections"
-#~ msgstr "ଆପଣଙ୍କର ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକୁ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକ"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "ଆପଣଙ୍କର ନେଟୱର୍କ ସଂଯୋଗ ସଂରଚନାକୁ ପରିଚାଳନା କରନ୍ତୁ ଏବଂ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "ସଂଯୁକ୍ତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "DSL ସଂଯୋଗ %d"
 
+#: src/utils/utils.c:535
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ହେବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "ଅସଂଯୁକ୍ତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER କିମ୍ବା PEM ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକ (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ "
-#~ "କରନ୍ତୁ।"
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, କିମ୍ବା PKCS#12 ବ୍ୟକ୍ତିଗତ କିଗୁଡ଼ିକ (*.der, *.pem, *.p12)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "ସଂଯୁକ୍ତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+msgid "Wi-Fi _security"
+msgstr "ସୁରକ୍ଷା (_S):"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ "
-#~ "କରନ୍ତୁ।"
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "ନେଟୱର୍କ ଉପଲବ୍ଧ ବିଜ୍ଞପ୍ତିକୁ ଲୁଚାଇ ଦିଅନ୍ତୁ"
+msgid "_Network name"
+msgstr "ନେଟୱର୍କ ନାମ (_N):"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "ବେତାର ନେଟୱର୍କ ଉପଲବ୍ଧ ଥିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
-
-#~ msgid "Stamp"
-#~ msgstr "ଷ୍ଟାମ୍ପ"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "ବିନ୍ୟାସକୁ ଗୋଟିଏ ନୂତନ ସଂସ୍କରଣକୁ ସ୍ଥାନାନ୍ତରଣ କରିବା ଉଚିତ କି ନୁହଁ ତାହା ନିର୍ଦ୍ଧାରଣ କରୁଅଛି।"
+msgid "C_onnection"
+msgstr "ସଂଯୋଗ (_n):"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wi-Fi ନିର୍ମାଣକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+msgid "Wi-Fi _adapter"
+msgstr "ବେତାର ଏଡପ୍ଟର (_a):"
 
 #, fuzzy
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "ଆପଲେଟ ବ୍ୟବହାର କରୁଥିବା ସମୟରେ ଏଡହକ ନେଟୱର୍କଗୁଡ଼ିକର ନିର୍ମାଣକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE "
-#~ "ସେଟ କରନ୍ତୁ।"
+#~ msgid "Manage your network connections"
+#~ msgstr "ଆପଣଙ୍କର ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକୁ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"
 
 #, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA ପ୍ରମାଣ ପତ୍ର (_A):"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକ"
+
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "ଆପଣଙ୍କର ନେଟୱର୍କ ସଂଯୋଗ ସଂରଚନାକୁ ପରିଚାଳନା କରନ୍ତୁ ଏବଂ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/pa.po b/po/pa.po
index 3005dc05..974f179f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2017-07-23 11:57-0600\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi <punjabi-users lists sf net>\n"
@@ -18,6 +18,90 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 2.0\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "ਕਨੈਕਟ ਹੋਣ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ ਅਸਮਰੱਥ ਕਰੋ"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "ਜੇ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ ਸੈਟ ਕਰੋ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "ਡਿਸ-ਕਨੈਕਟ ਹੋਣ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ ਅਸਮਰੱਥ ਕਰੋ"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "ਜੇ ਨੈੱਟਵਰਕ ਨਾਲ ਡਿਸ-ਕਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ ਸੈਟ ਕਰੋ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "VPN ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੰਦ ਕਰੋ"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"ਜੇ VPN ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਜਾਂ ਡਿਸ-ਕਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ "
+"(ture) ਸੈਟ ਕਰੋ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "ਨੈੱਟਵਰਕ ਉਪਲੱਬਧਤਾ ਸੂਚਨਾ ਨਾ ਦਿਓ"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "ਜੇ Wi-Fi ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ ਸੈਟ ਕਰੋ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "ਸਟੈਂਪ"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "ਪਤਾ ਕਰਨ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ ਕਿ ਸੈਟਿੰਗ ਨਵੇਂ ਵਰਜਨ ਲਈ ਮਾਈਗਰੇਟ ਕਰਨੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Wi-Fi ਬਣਾਉਣਾ ਅਸਮਰੱਥ ਕਰੋ"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr "ਜਦੋਂ ਐਪਲਿਟ ਵਰਤਣ ਦੌਰਾਨ ਐਡ-ਹਾਕ ਨੈੱਟਵਰਕ ਬਣਾਉਣ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨ ਲਈ ਸਹੀਂ ਸੈੱਟ ਕਰੋ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਐਪਲਿਟ ਵੇਖਾਓ"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਐਪਲਿਟ ਨਾ ਵੇਖਾਉਣ ਲਈ FALSE ਦਿਉ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA ਸਰਟੀਫਿਕੇਟ ਅਣਡਿੱਠਾ"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"ਇਸ ਨੂੰ ਸੱਚ (ture) ਕਰੋ, ਜੇ EAP ਪਰਮਾਣਕਿਤਾ ਵਿੱਚ CA ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ ਚੇਤਾਵਨੀਆਂ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ "
+"ਹੋ।"
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"ਇਸ ਨੂੰ ਸੱਚ (ture) ਕਰੋ, ਜੇ EAP ਪਰਮਾਣਕਿਤਾ ਦੇ ਦੂਜੇ ਪੜਾਅ ਵਿੱਚ CA ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ ਚੇਤਾਵਨੀਆਂ ਬੰਦ "
+"ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -64,43 +148,72 @@ msgstr "ਪਾਸਵਰਡ:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(ਕੋਈ ਨਹੀਂ)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "%s ਵਿੱਚ ਕੁੰਜੀ"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "%s ਵਿੱਚ ਸਰਟੀਫਿਕੇਟ"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(ਅਣਪਛਾਤਾ)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "ਚੁਣੋ"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "ਰੱਦ ਕਰੋ"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "ਫਾਇਲ ਤੋਂ ਚੁਣੋ…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "ਕੋਈ CA ਸਰਟੀਫਿਕੇਟ ਸੈੱਟ ਨਹੀਂ"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "ਕੋਈ ਕੁੰਜੀ ਸੈੱਟ ਨਹੀਂ ਹੈ"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "%s ਸਰਟੀਫਿਕੇਟ ਲਈ ਕੁੰਜੀ ਚੁਣੋ"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "%s ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ(_k):"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "%s ਕੁੰਜੀ ਪਾਸਵਰਡ(_p):"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "%s ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "%s ਸਰਟੀਫਿਕੇਟ(_c):"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_w)"
 
@@ -112,35 +225,35 @@ msgstr "ਡਿਫਾਲਟ"
 msgid "My country is not listed"
 msgstr "ਮੇਰਾ ਦੇਸ਼ ਲਿਸਟ ਵਿੱਚ ਨਹੀਂ ਹੈ"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "ਬਿਨ-ਲਿਸਟ"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "ਮੇਰਾ ਪਲੈਨ ਲਿਸਟ 'ਚ ਨਹੀਂ ਹੈ…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "ਪਰੋਵਾਇਡਰ"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "ਇੰਸਟਾਲ ਕੀਤਾ GSM ਜੰਤਰ"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "ਇੰਸਟਾਲ ਕੀਤਾ CDMA ਜੰਤਰ"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "ਕੋਈ ਵੀ ਜੰਤਰ"
 
@@ -266,50 +379,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਸੈਟਿੰਗ ਪੁਸ਼ਟੀ"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(ਕੋਈ ਨਹੀਂ)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "%s ਵਿੱਚ ਕੁੰਜੀ"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "%s ਵਿੱਚ ਸਰਟੀਫਿਕੇਟ"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(ਅਣਪਛਾਤਾ)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "ਚੁਣੋ"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "ਰੱਦ ਕਰੋ"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "ਫਾਇਲ ਤੋਂ ਚੁਣੋ…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "%s ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "%s ਸਰਟੀਫਿਕੇਟ ਪਾਸਵਰਡ(_p):"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_w)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: "
@@ -330,13 +399,27 @@ msgstr "ਨਾਂ"
 msgid "Issued By"
 msgstr "ਜਾਰੀ ਕੀਤਾ ਵਲੋਂ"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "%s ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "%s ਸਰਟੀਫਿਕੇਟ ਪਾਸਵਰਡ(_p):"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_w)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "%s ਪਿੰਨ ਦਿਓ"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "ਰੱਦ ਕਰੋ(_C)"
 
@@ -384,406 +467,356 @@ msgstr "ਸੈਕੰਡਰੀ ਪਾਸਵਰਡ(_S):"
 msgid "_Password:"
 msgstr "ਪਾਸਵਰਡ(_P):"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "ਕਨੈਕਟ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "ਨਵਾਂ…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-ਬਿੱਟ ਕੁੰਜੀ (Hex ਜਾਂ ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-ਬਿੱਟ ਸ਼ਬਦ"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "ਡਾਇਨੈਮਿਕ WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ਨਿੱਜੀ"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ਇੰਟਰਪ੍ਰਾਈਜ"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 ਨਿੱਜੀ"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "ਬਣਾਓ(_r)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "ਕਨੈਕਸ਼ਨ(_o)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ “%s“ ਵਰਤਣ ਲਈ ਪਾਸਵਰਡ ਜਾਂ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ ਦੀ ਲੋੜ ਹੈ।"
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ ਵਲੋਂ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "ਨਵਾਂ Wi-Fi ਨੈੱਟਵਰਕ ਬਣਾਓ"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "ਨਵਾਂ Wi-Fi ਨੈੱਟਵਰਕ"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ, ਜੋ ਤੁਸੀਂ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਲਈ ਨਾਂ ਦਿਓ।"
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "ਲੁਕਵੇਂ Wi-Fi ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "ਲੁਕਵਾਂ Wi-Fi ਨੈੱਟਵਰਕ"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "ਲੁਕਵੇਂ Wi-Fi ਨੈੱਟਵਰਕ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਕਨੈਕਟ ਹੋਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਲਈ ਨਾਂ ਅਤੇ ਸੁਰੱਖਿਆ ਵੇਰਵਾ ਦਿਓ।"
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Wi-Fi ਸੁਰੱਖਿਆ(_s):"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "ਨੈੱਟਵਰਕ ਨਾਂ(_N):"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "ਕਨੈਕਸ਼ਨ(_n):"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Wi-Fi ਅਡੈਪਟਰ(_a):"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s ਕਨੈਕਸ਼ਨ"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM ਸਰਟੀਫਿਕੇਟ (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "802.1x ਸੁਰੱਖਿਆ (wpa-eap) ਵਿੱਚ ਨਾ-ਪਰਿਭਾਸ਼ਿਤ ਗ਼ਲਤੀ"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "ਕੋਈ CA ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਚੁਣਿਆ"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "ਚੁਣੀ ਗਈ CA ਸਰਟੀਫਿਕੇਟ ਫਾਇਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "ਗੁੰਮ EAP-FAST PAC ਫਾਇਲ"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "PAC ਫਾਇਲ ਚੁਣੋ"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ਫਾਇਲਾਂ (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "ਅਗਿਆਤ"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "ਪਰਮਾਣਿਤ"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "ਦੋਵੇਂ"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "ਅਗਿਆਤ ਪਛਾਣ(_m):"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC ਫਾਇਲ(_f):"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_Inner ਪਰਮਾਣਕਿਤਾ:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ਆਟੋਮੈਟਿਕ PAC ਪਰੋਵਿਜ਼ਨਿੰਗ ਮਨਜ਼ੂਰ(_v)"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "ਗੁੰਮ EAP-LEAP ਵਰਤੋਂਕਾਰ-ਨਾਂ"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "ਗੁੰਮ EAP-LEAP ਪਾਸਵਰਡ"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "ਵਰਤੋਂਕਾਰ ਨਾਂ(_U):"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "ਪਾਸਵਰਡ(_P):"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "ਵਰਜਨ 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "ਵਰਜਨ 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "ਕੋਈ CA ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਚਾਹੀਦਾ(_r)"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP ਵਰਜਨ(_v):"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 #, fuzzy
 msgid "_Domain"
 msgstr "ਡੋਮੇਨ(_D):"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "ਗੁੰਮ EAP ਵਰਤੋਂਕਾਰ-ਨਾਂ"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "ਗਲਤ EAP ਪਾਸਵਰਡ"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-ਬਿੱਟ ਸ਼ਬਦ"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_o)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "ਗੁੰਮ EAP-TLS ਪਛਾਣ"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "ਕੋਈ ਵਰਤੋਂਕਾਰ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਚੁਣਿਆ"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "ਚੁਣੀ ਗਈ ਵਰਤੋਂਕਾਰ ਸਰਟੀਫਿਕੇਟ ਫਾਇਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "ਕੋਈ ਕੁੰਜੀ ਨਹੀਂ ਚੁਣੀ"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "ਚੁਣੀ ਗਈ ਕੁੰਜੀ ਫਾਇਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "ਪਛਾਣ(_d):"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (EAP ਨਹੀਂ)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "802.1x ਸੁਰੱਖਿਆ ਦੀ ਪ੍ਰਮਾਣਕਿਤ ਦੌਰਾਨ ਅਣਜਾਣ ਗਲਤੀ"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "802.1x ਸੁਰੱਖਿਆ (wpa-eap) ਵਿੱਚ ਨਾ-ਪਰਿਭਾਸ਼ਿਤ ਗ਼ਲਤੀ"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "ਕੋਈ CA ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਚੁਣਿਆ"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "ਚੁਣੀ ਗਈ CA ਸਰਟੀਫਿਕੇਟ ਫਾਇਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "ਟਨਲ TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "ਸੁਰੱਖਿਅਤ EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "ਪਰਮਾਣਕਿਤਾ(_t):"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "leap-ਵਰਤੋਂਕਾਰ ਗੁੰਮ"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "ਗੁੰਮ ਲੀਪ-ਪਾਸਵਰਡ"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "ਗਲਤ EAP ਪਾਸਵਰਡ"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "ਟਾਈਪ(_T):"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "wep-key ਗੁੰਮ"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "ਅਢੁੱਕਵੀਂ wep-key: %zu ਲੰਬਾਈ ਦੀ ਕੁੰਜੀ ਵਿੱਚ ਕੇਵਲ ਹੈਕਸਾ-ਅੰਕ ਹੀ ਹੋ ਸਕਦੇ ਹਨ"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "ਅਢੁੱਕਵੀਂ wep-key: %zu ਲੰਬਾਈ ਦੀ ਕੁੰਜੀ ਵਿੱਚ ਕੇਵਲ ASCII ਅੱਖਰ ਹੀ ਹੋ ਸਕਦੇ ਹਨ"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -792,41 +825,41 @@ msgstr ""
 "ਅਢੁੱਕਵੀਂ wep-key: ਗ਼ਲਤ %zu ਕੁੰਜੀ ਲੰਬਾਈ। ਕੁੰਜੀ ਦੀ ਲੰਬਾਈ ਜਾਂ ਤਾਂ 5/13 (ascii) ਜਾਂ 10/26 "
 "(ਹੈਕਸਾ) ਹੋ ਸਕਦੇ ਹਨ"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "ਅਢੁੱਕਵੀਂ wep-key: ਵਾਕ ਖਾਲੀ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "ਅਢੁੱਕਵੀਂ wep-key: ਵਾਕ 64-ਅੱਖਰਾਂ ਤੋਂ ਛੋਟਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "ਓਪਨ ਸਿਸਟਮ"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "ਸ਼ੇਅਰ ਕੁੰਜੀ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (ਡਿਫਾਲਟ)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "ਕੁੰਜੀ(_K):"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "ਕੁੰਜੀ ਵੇਖੋ(_w)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP ਇੰਡੈਕਸ(_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -835,93 +868,57 @@ msgstr ""
 "ਅਢੁੱਕਵੀਂ wpa-psk: ਕੁੰਜੀ-ਲੰਬਾਈ %zu ਅਵੈਧ ਹੈ। ਜਾਂ ਤਾਂ [8,63] ਬਾਈਟ ਜਾਂ 64 ਹੈਕਸਾ-ਅੰਕ ਹੋਣੀ "
 "ਚਾਹੀਦੀ ਹੈ।"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "ਅਢੁੱਕਵੀਂ wpa-psk: 64 ਬਾਈਟਾਂ ਨੂੰ ਹੈਕਸਾ ਨਾਲ ਅਰਥ ਕੱਢੇ ਨਹੀਂ ਜਾ ਸਕਦੇ"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨਾਂ ਦਾ ਪਰਬੰਧ ਕਰੋ"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "ਰਾਅ ਸੰਰਚਨਾ"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "ਆਪਣੀ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਸੈਟਿੰਗ ਦਾ ਪਰਬੰਧ ਕਰੋ ਅਤੇ ਬਦਲੋ"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "ਕਨੈਕਟ ਹੋਣ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ ਅਸਮਰੱਥ ਕਰੋ"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "ਜੇ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ ਸੈਟ ਕਰੋ।"
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "ਡਿਸ-ਕਨੈਕਟ ਹੋਣ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ ਅਸਮਰੱਥ ਕਰੋ"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "ਜੇ ਨੈੱਟਵਰਕ ਨਾਲ ਡਿਸ-ਕਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ ਸੈਟ ਕਰੋ।"
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "VPN ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੰਦ ਕਰੋ"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "ਜੇ VPN ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਜਾਂ ਡਿਸ-ਕਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ "
-#~ "(ture) ਸੈਟ ਕਰੋ।"
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "ਨੈੱਟਵਰਕ ਉਪਲੱਬਧਤਾ ਸੂਚਨਾ ਨਾ ਦਿਓ"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "802.1x ਸੁਰੱਖਿਆ ਦੀ ਪ੍ਰਮਾਣਕਿਤ ਦੌਰਾਨ ਅਣਜਾਣ ਗਲਤੀ"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "ਜੇ Wi-Fi ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ ਸੈਟ ਕਰੋ।"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s ਕਨੈਕਸ਼ਨ"
 
-#~ msgid "Stamp"
-#~ msgstr "ਸਟੈਂਪ"
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM ਸਰਟੀਫਿਕੇਟ (*.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "ਪਤਾ ਕਰਨ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ ਕਿ ਸੈਟਿੰਗ ਨਵੇਂ ਵਰਜਨ ਲਈ ਮਾਈਗਰੇਟ ਕਰਨੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ।"
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, ਜਾਂ PKCS#12 ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀਆਂ (*.der, *.pem, *.p12, *.key)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wi-Fi ਬਣਾਉਣਾ ਅਸਮਰੱਥ ਕਰੋ"
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi ਸੁਰੱਖਿਆ(_s):"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr "ਜਦੋਂ ਐਪਲਿਟ ਵਰਤਣ ਦੌਰਾਨ ਐਡ-ਹਾਕ ਨੈੱਟਵਰਕ ਬਣਾਉਣ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨ ਲਈ ਸਹੀਂ ਸੈੱਟ ਕਰੋ।"
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "ਨੈੱਟਵਰਕ ਨਾਂ(_N):"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਐਪਲਿਟ ਵੇਖਾਓ"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "ਕਨੈਕਸ਼ਨ(_n):"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਐਪਲਿਟ ਨਾ ਵੇਖਾਉਣ ਲਈ FALSE ਦਿਉ।"
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi ਅਡੈਪਟਰ(_a):"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA ਸਰਟੀਫਿਕੇਟ ਅਣਡਿੱਠਾ"
+#~ msgid "Manage your network connections"
+#~ msgstr "ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨਾਂ ਦਾ ਪਰਬੰਧ ਕਰੋ"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "ਇਸ ਨੂੰ ਸੱਚ (ture) ਕਰੋ, ਜੇ EAP ਪਰਮਾਣਕਿਤਾ ਵਿੱਚ CA ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ ਚੇਤਾਵਨੀਆਂ ਬੰਦ ਕਰਨਾ "
-#~ "ਚਾਹੁੰਦੇ ਹੋ।"
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "ਰਾਅ ਸੰਰਚਨਾ"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "ਇਸ ਨੂੰ ਸੱਚ (ture) ਕਰੋ, ਜੇ EAP ਪਰਮਾਣਕਿਤਾ ਦੇ ਦੂਜੇ ਪੜਾਅ ਵਿੱਚ CA ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ ਚੇਤਾਵਨੀਆਂ "
-#~ "ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "ਆਪਣੀ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਸੈਟਿੰਗ ਦਾ ਪਰਬੰਧ ਕਰੋ ਅਤੇ ਬਦਲੋ"
 
 #~ msgid "NetworkManager"
 #~ msgstr "ਨੈੱਟਵਰਕ-ਮੈਨੇਜਰ"
diff --git a/po/pl.po b/po/pl.po
index 6d18e5de..5194d837 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-10-10 13:25+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag gmail com>\n"
 "Language-Team: Polish <community-poland mozilla org>\n"
@@ -22,6 +22,94 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Wyłączenie powiadomień o połączeniu"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "Ustawienie na „true” wyłącza powiadomienia podczas łączenia z siecią."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Wyłączenie powiadomień o rozłączeniu"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Ustawienie na „true” wyłącza powiadomienia podczas rozłączania z sieci."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Wyłączenie powiadomień VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Ustawienie na „true” wyłącza powiadomienia podczas łączenia lub rozłączania "
+"z sieci VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Wyłączenie powiadomień o dostępnych sieciach"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "Ustawienie na „true” wyłącza powiadomienia o dostępności sieci Wi-Fi."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Czas"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Używane do określenia, czy ustawienia mają zostać migrowane do nowej wersji."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Wyłączenie tworzenia sieci Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Ustawienie na „true” wyłącza możliwość tworzenia sieci ad-hoc podczas "
+"używania apletu."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Wyświetlanie apletu w obszarze powiadamiania"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Ustawienie na „false” wyłącza wyświetlanie apletu w obszarze powiadamiania."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignorowanie certyfikatu CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Ustawienie na „true” wyłącza ostrzeżenia o certyfikatach CA podczas "
+"uwierzytelniania EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Ustawienie na „true” wyłącza ostrzeżenia o certyfikatach CA podczas drugiego "
+"etapu uwierzytelniania EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -74,44 +162,73 @@ msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 "Proszę zeskanować za pomocą telefonu lub <a href=\"nma:print\">wydrukować</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Brak)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Klucz w %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certyfikat w %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Nieznane)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Wybierz"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Wybierz z pliku…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Nie ustawiono certyfikatu"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Nie ustawiono klucza"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Wybór klucza dla certyfikatu %s"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "_Klucz prywatny %s"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "_Hasło klucza %s"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Wybór certyfikatu %s"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "_Certyfikat %s"
 
 # checkbox
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Wyświetlanie hasła"
 
@@ -123,35 +240,35 @@ msgstr "Domyślne"
 msgid "My country is not listed"
 msgstr "Kraju nie ma na liście"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Nie na liście"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Planu nie ma na liście…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Dostawca"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Zainstalowane urządzenie GSM"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Zainstalowane urządzenie CDMA"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Dowolne urządzenie"
 
@@ -279,50 +396,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Potwierdzenie ustawień połączenia komórkowego"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Brak)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Klucz w %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Certyfikat w %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Nieznane)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Wybierz"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Wybierz z pliku…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Wybór certyfikatu %s"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "_Hasło certyfikatu %s"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Wyświetlanie haseł"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Błąd podczas logowania: "
@@ -343,13 +416,27 @@ msgstr "Nazwa"
 msgid "Issued By"
 msgstr "Wystawiony przez"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Wybór certyfikatu %s"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Hasło certyfikatu %s"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Wyświetlanie haseł"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Kod PIN %s"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Anuluj"
 
@@ -397,394 +484,347 @@ msgstr "_Drugie hasło:"
 msgid "_Password:"
 msgstr "_Hasło:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Kliknięcie połączy"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Nowe…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Brak"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "40/128-bitowy klucz WEP (szesnastkowy lub ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "128-bitowe hasło WEP"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamiczny WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA i WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 msgid "WPA3 Personal"
 msgstr "WPA3 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Utwórz"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "P_ołącz"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, 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/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wymagane uwierzytelnienie w sieci Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wymagane uwierzytelnienie w sieci Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Tworzenie nowej sieci Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nowa sieć Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Połączenie z ukrytą siecią Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Ukryta sieć Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 "Proszę wprowadzić nazwę i ustawienia zabezpieczeń dla żądanej sieci Wi-Fi."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Zabezpieczenia sieci _Wi-Fi"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Nazwa sieci"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "Połącze_nie"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "_Adapter Wi-Fi"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Połączenie %s"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certyfikaty PEM (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-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:351
-msgid "no CA certificate selected"
-msgstr "nie wybrano certyfikatu CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "wybrany plik certyfikatu CA nie istnieje"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "brak pliku PAC EAP-FAST"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Wybór pliku PAC"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Pliki PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonimowo"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Uwierzytelnienie"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Oba"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Anoni_mowa tożsamość"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "_Plik PAC"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "Wewnętrzne uw_ierzytelnianie"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Automatyczne za_bezpieczanie PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "brak nazwy użytkownika EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "brak hasła EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "Nazwa _użytkownika"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Hasło"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Wersja 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Wersja 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Certyfikat CA nie jest _wymagany"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "_Wersja PEAP"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Przyrostek nazwy certyfikatu serwera."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Domena"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "brak nazwy użytkownika EAP"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "brak hasła EAP"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "brak hasła klucza prywatnego klienta EAP"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "Hasło klucza p_rywatnego"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "_Wyświetlanie hasła"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "brak tożsamości EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "nie wybrano certyfikatu użytkownika"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "wybrany plik certyfikatu użytkownika nie istnieje"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "nie wybrano klucza"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "wybrany plik klucza nie istnieje"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "_Tożsamość"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Nieznany błąd podczas sprawdzania poprawności zabezpieczeń 802.1X"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "nieokreślony błąd w zabezpieczeniach 802.1X (WPA-EAP)"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "nie wybrano certyfikatu CA"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "wybrany plik certyfikatu CA nie istnieje"
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunelowane TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Chronione EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Skonfigurowane zewnętrznie"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "Uwierzy_telnianie"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "brak „leap-username”"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "brak „leap-password”"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 msgid "missing password"
 msgstr "brak hasła"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Typ"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "brak „wep-key”"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "nieprawidłowe „wep-key”: klucz o długości %zu może zawierać tylko liczby "
 "szesnastkowe"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 "nieprawidłowe „wep-key”: klucz o długości %zu może zawierać tylko znaki ASCII"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -793,40 +833,40 @@ msgstr ""
 "nieprawidłowe „wep-key”: błędna długość klucza %zu. Klucz musi być długości "
 "5/13 (ASCII) lub 10/26 (szesnastkowy)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "nieprawidłowe „wep-key”: hasło nie może być puste"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "nieprawidłowe „wep-key”: hasło nie może być krótsze niż 64 znaki"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "System otwarty"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Klucz współdzielony"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (domyślnie)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Klucz"
 
 # checkbox
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "_Wyświetlanie klucza"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "Inde_ks WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -835,12 +875,47 @@ 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 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 "
 "szesnastkowy"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Nieznany błąd podczas sprawdzania poprawności zabezpieczeń 802.1X"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Połączenie %s"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certyfikaty PEM (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+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/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Zabezpieczenia sieci _Wi-Fi"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Nazwa sieci"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "Połącze_nie"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adapter Wi-Fi"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Zarządzanie połączeniami sieciowymi"
 
@@ -856,86 +931,6 @@ msgstr ""
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Wyłączenie powiadomień o połączeniu"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Ustawienie na „true” wyłącza powiadomienia podczas łączenia z siecią."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Wyłączenie powiadomień o rozłączeniu"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Ustawienie na „true” wyłącza powiadomienia podczas rozłączania z sieci."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Wyłączenie powiadomień VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Ustawienie na „true” wyłącza powiadomienia podczas łączenia lub "
-#~ "rozłączania z sieci VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Wyłączenie powiadomień o dostępnych sieciach"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Ustawienie na „true” wyłącza powiadomienia o dostępności sieci Wi-Fi."
-
-#~ msgid "Stamp"
-#~ msgstr "Czas"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Używane do określenia, czy ustawienia mają zostać migrowane do nowej "
-#~ "wersji."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wyłączenie tworzenia sieci Wi-Fi"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Ustawienie na „true” wyłącza możliwość tworzenia sieci ad-hoc podczas "
-#~ "używania apletu."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Wyświetlanie apletu w obszarze powiadamiania"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Ustawienie na „false” wyłącza wyświetlanie apletu w obszarze "
-#~ "powiadamiania."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignorowanie certyfikatu CA"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Ustawienie na „true” wyłącza ostrzeżenia o certyfikatach CA podczas "
-#~ "uwierzytelniania EAP."
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Ustawienie na „true” wyłącza ostrzeżenia o certyfikatach CA podczas "
-#~ "drugiego etapu uwierzytelniania EAP."
-
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
 
diff --git a/po/pt.po b/po/pt.po
index 6d29f50b..56722e41 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.8\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2015-12-19 08:19+0000\n"
 "Last-Translator: Pedro Albuquerque <palbuquerque73 gmail com>\n"
 "Language-Team: Português <palbuquerque73 gmail com>\n"
@@ -20,6 +20,100 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\\n\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Desativar as notificações de ligado"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Defina como verdadeiro para desativar notificações ao ligar a uma rede."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Desativar as notificações de desligado"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Defina como verdadeiro para desativar notificações ao desligar de uma rede."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Desativar as notificações de VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Defina como verdadeiro para desativar notificações ao ligar ou desligar de "
+"uma rede."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Não mostrar notificações de redes sem fios disponíveis"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Defina como verdadeiro para desativar notificações quando estão disponíveis "
+"redes Wi-Fi."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Carimbo"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Usado para determinar se as definições devem ser migradas para uma nova "
+"versão."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Desativar criação de Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Defina como verdadeiro para desativar a criação de redes adhoc ao usar a "
+"applet."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Mostrar a applet na área de notificação"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Definir como FALSO para desativar a exibição da applet na área de "
+"notificação."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignorar o certificado da AC"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Defina como verdadeiro para desativar avisos sobre os certificados das ACs "
+"(Autoridades de Certificação) na autenticação EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Defina como verdadeiro para desativar avisos sobre certificados de ACs na 2ª "
+"fase da autenticação EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -66,44 +160,78 @@ msgstr "Senha:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(nenhum)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Certificado C_A:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Desconhecido"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Selecione Um Ficheiro"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+#, fuzzy
+msgid "Cancel"
+msgstr "_Cancelar"
+
+#: src/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Selecione Um Ficheiro"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Não é necessá_Rio um certificado CA"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Escolha o Certificado CA"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "_Chave privada:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Senha da chave _Privada:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Escolha o Certificado CA"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Certificado do _Utilizador:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Mostrar senha"
 
@@ -115,36 +243,36 @@ msgstr "Predefinição"
 msgid "My country is not listed"
 msgstr "O meu país não está listado"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Não listado"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "O meu plano não está listado..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Fornecedor"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalado"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalado"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Qualquer dispositivo"
 
@@ -283,55 +411,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirme as definições da banda larga móvel"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(nenhum)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Certificado C_A:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Desconhecido"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-#, fuzzy
-msgid "Select"
-msgstr "Selecione Um Ficheiro"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-#, fuzzy
-msgid "Cancel"
-msgstr "_Cancelar"
-
-#: src/nma-cert-chooser-button.c:460
-#, fuzzy
-msgid "Select from file…"
-msgstr "Selecione Um Ficheiro"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Escolha o Certificado CA"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Certificado do _Utilizador:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Mostrar senhas"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -354,13 +433,27 @@ msgstr "Nome"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Escolha o Certificado CA"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Certificado do _Utilizador:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Mostrar senhas"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -408,58 +501,58 @@ msgstr "_Senha secundária:"
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Clique para ligar"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nenhum"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Chave WEP 40/128-bit (Hex ou ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase-passe WEP 128-bit"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP Dinâmico (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 pessoal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 empresarial"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 pessoal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_Riar"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Ligar"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -467,35 +560,35 @@ msgstr ""
 "Senhas ou chaves de encriptação são necessárias para aceder à rede Wi-Fi \"%s"
 "\"."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autenticação de rede Wi-Fi necessária"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autenticação pedida pela rede Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Criar uma nova rede Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nova rede Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Ligar a uma rede Wi-Fi oculta"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Rede Wi-Fi oculta"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -503,316 +596,265 @@ msgstr ""
 "Insira o nome e detalhes de segurança da rede Wi-Fi oculta a que se quer "
 "ligar."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Segurança Wi-Fi:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Nome da rede:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Ligaçã_O:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "_Dispositivo de rede Wi-Fi:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Ligação %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certificados DER ou PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-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:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Não é necessá_Rio um certificado CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "ficheiro EAP-FAST PAC em falta"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Escolha um ficheiro PAC..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Ficheiros PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenticado"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Ambos"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Identidade anóni_Ma:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "_Ficheiro PAC:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Autenticação _Interna:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir apro_Visionamento PAC automático"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "Utilizador EAP-LEAP em falta"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "Senha EAP-LEAP em falta"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Utilizador:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Senha:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versão 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versão 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Não é necessá_Rio um certificado CA"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "_Versão do PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "Utilizador EAP em falta"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "Senha EAP em falta"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Frase-passe WEP 128-bit"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Apresentar a frase-senha"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "Identidade EAP-TLS em falta"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Não é necessá_Rio um certificado CA"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_Dentidade:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Erro desconhecido ao validar segurança 802.1X"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "erro indefinido na segurança 802.1X (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Não é necessá_Rio um certificado CA"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "TLS encapsulado"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegido (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Au_Tenticação:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "leap-username em falta"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "leap-password em falta"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Senha EAP em falta"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Tipo:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "wep-key em falta"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "wep-key inválida: chave com comprimento de %zu só pode conter dígitos "
 "hexadecimais"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -820,7 +862,7 @@ msgstr ""
 "wep-key inválida: chave com comprimento de %zu só pode conter caracteres "
 "ascii"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -829,41 +871,41 @@ msgstr ""
 "wep-key inválida: comprimento %zu da chave errado. A chave tem de ter um "
 "comprimento de 5/13 (ascii) ou 10/26 (hex)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "wep-key inválida: a frase-passe não pode estar vazia"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "wep-key inválida: a frase-passe tem de ter menos de 64 caracteres"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema aberto"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Chave partilhada"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (predefinição)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "C_Have:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Mos_Trar chave"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "Índice _WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -872,104 +914,60 @@ 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk inválido: : impossível interpretar chave com 64 bytes como "
 "hexadecimal"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Controle as suas ligações de rede"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Configuração_manual"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Gerir e alterar as suas definições da ligação de rede"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Desativar as notificações de ligado"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Defina como verdadeiro para desativar notificações ao ligar a uma rede."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Desativar as notificações de desligado"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Defina como verdadeiro para desativar notificações ao desligar de uma "
-#~ "rede."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Desativar as notificações de VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Defina como verdadeiro para desativar notificações ao ligar ou desligar "
-#~ "de uma rede."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Não mostrar notificações de redes sem fios disponíveis"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Erro desconhecido ao validar segurança 802.1X"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Defina como verdadeiro para desativar notificações quando estão "
-#~ "disponíveis redes Wi-Fi."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Ligação %s"
 
-#~ msgid "Stamp"
-#~ msgstr "Carimbo"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certificados DER ou PEM (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Usado para determinar se as definições devem ser migradas para uma nova "
-#~ "versão."
+#: src/utils/utils.c:547
+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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Desativar criação de Wi-Fi"
+msgid "Wi-Fi _security"
+msgstr "_Segurança Wi-Fi:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Defina como verdadeiro para desativar a criação de redes adhoc ao usar a "
-#~ "applet."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Nome da rede:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Mostrar a applet na área de notificação"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Ligaçã_O:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Definir como FALSO para desativar a exibição da applet na área de "
-#~ "notificação."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Dispositivo de rede Wi-Fi:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignorar o certificado da AC"
+#~ msgid "Manage your network connections"
+#~ msgstr "Controle as suas ligações de rede"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Defina como verdadeiro para desativar avisos sobre os certificados das "
-#~ "ACs (Autoridades de Certificação) na autenticação EAP."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Configuração_manual"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Defina como verdadeiro para desativar avisos sobre certificados de ACs na "
-#~ "2ª fase da autenticação EAP."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Gerir e alterar as suas definições da ligação de rede"
 
 #~ msgid "NetworkManager"
 #~ msgstr "Gestor de rede"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 853aa0fa..74be3280 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-09-08 09:42-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff gnome org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
@@ -35,6 +35,101 @@ msgstr ""
 "X-Generator: Gtranslator 3.32.0\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Desabilitar notificações de conexão"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Defina como verdadeiro para desabilitar notificações ao conectar-se a uma "
+"rede."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Desabilitar notificações de desconexão"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Defina como verdadeiro para desabilitar notificações ao desconectar-se de "
+"uma rede."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Desabilitar notificações de VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Defina como verdadeiro para desabilitar notificações ao conectar-se ou "
+"desconectar-se de uma VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Não mostrar notificações de redes disponíveis"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Defina como verdadeiro para desabilitar notificações quando redes Wi-Fi "
+"estiverem disponíveis."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Selo"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Usado para determinar se as configurações devem ser migradas para uma nova "
+"versão."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Desabilitar criação de WiFi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Defina como verdade para desabilitar a criação de redes ad-hoc quando usar o "
+"miniaplicativo."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Mostrar o miniaplicativo na área de notificação"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+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."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignorar certificado CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Defina como verdadeiro para desabilitar avisos de certificados CA na "
+"autenticação EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Defina como verdadeiro para desabilitar avisos de certificados CA na fase 2 "
+"da autenticação EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -87,43 +182,72 @@ msgstr "Senha"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr "Leia com seu telefone ou <a href=\"nma:print\">imprima</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Nenhum)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Chave em %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificado em %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Desconhecido)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Selecionar"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Selecionar do arquivo…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Nenhum certificado definido"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Nenhuma chave definida"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Escolha uma chave para certificado de %s"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "Chave _privada de %s"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "_Senha da chave de %s"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Escolha o certificado de %s"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "_Certificado de %s"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Mostrar senha"
 
@@ -135,35 +259,35 @@ msgstr "Padrão"
 msgid "My country is not listed"
 msgstr "Meu país não está listado"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Não listado"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Meu plano não está listado…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Provedor"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalado"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalado"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Qualquer dispositivo"
 
@@ -292,50 +416,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmação das configurações de banda larga móvel"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Nenhum)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Chave em %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Certificado em %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Desconhecido)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Selecionar"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Selecionar do arquivo…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Escolha um certificado de %s"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "_Senha de certificado de %s"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Mostrar senhas"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Erro ao autenticar: "
@@ -356,13 +436,27 @@ msgstr "Nome"
 msgid "Issued By"
 msgstr "Emitido por"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Escolha um certificado de %s"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Senha de certificado de %s"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Mostrar senhas"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Digite PIN de %s"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -410,57 +504,57 @@ msgstr "_Senha secundária:"
 msgid "_Password:"
 msgstr "Se_nha:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Clique para conectar"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Nova…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nenhum"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Chave WEP de 40/128 bits ASCII (Hexadecimal ou ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase secreta do WEP de 128 bits"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinâmico (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 pessoal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 empresas"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 pessoal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_riar"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -468,35 +562,35 @@ msgstr ""
 "Senhas ou chaves de criptografia são necessárias para acessar a rede Wi-Fi "
 "“%s”."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autenticação necessária na rede Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autenticação necessária na rede Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Criar nova rede Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nova rede Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Conectar a rede Wi-Fi oculta"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Rede Wi-Fi oculta"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -504,296 +598,250 @@ msgstr ""
 "Digite o nome e os detalhes de segurança da rede Wi-Fi oculta a qual você "
 "deseja se conectar."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "_Segurança Wi-Fi"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Nome da rede"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "Co_nexão"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "_Adaptador Wi-Fi"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Conexão %s"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certificados PEM (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-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:351
-msgid "no CA certificate selected"
-msgstr "Nenhum certificado AC selecionado"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "arquivo de certificado AC selecionado não existe"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "faltando arquivo PAC EAP-FAST"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Escolha um arquivo PAC"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Arquivos PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anônimo"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenticado"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Ambos"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "I_dentidade anônima"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "Arqui_vo PAC"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "Autenticação _interna"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir pro_visionamento PAC automático"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "faltando nome de usuário EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "faltando senha EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "Nome de _usuário"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "Se_nha"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versão 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versão 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Nenhum certificado CA é necessá_rio"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "_Versão do PEAP"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Sufixo do nome do certificado de servidor."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Domínio"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "faltando nome de usuário EAP"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "faltando senha EAP"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "faltando frase secreta de chave privada de cliente EAP"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "Frase secreta da chave pr_ivada"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "M_ostrar frase secreta"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "faltando identidade EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "nenhum certificado de usuário selecionado"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "arquivo de certificado de usuário selecionado não existe"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "nenhuma chave selecionada"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "arquivo de chave selecionado não existe"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "Id_entidade"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (não EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Erro desconhecido ao validar a segurança 802.1X"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "erro indefinido na segurança 802.1X (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "Nenhum certificado AC selecionado"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "arquivo de certificado AC selecionado não existe"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "RÁPIDO"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "TLS encapsulado"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP Protegido (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Configurada externamente"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "Au_tenticação"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "faltando nome de usuário leap"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "faltando senha leap"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "faltando senha EAP"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Tipo"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "faltando chave wep"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "chave wep inválida: chave com um tamanho de %zu deve conter apenas dígitos "
 "hexadecimais"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -801,7 +849,7 @@ msgstr ""
 "chave wep inválida: chave com um tamanho de %zu deve conter apenas "
 "caracteres ascii"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -810,39 +858,39 @@ msgstr ""
 "chave wep inválida: tamanho de chave %zu inválido. Um chave deve estar entre "
 "o tamanho 5/13 (ascii) ou 10/26 (hexadecimal)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "chave wep inválida: frase secreta não pode estar vazia"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "chave wep inválida: frase secreta deve ser menor que 64 caracteres"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema aberto"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Chave compartilhada"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Padrão)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Chave"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Mostrar c_have"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "Índice _WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -851,12 +899,46 @@ 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 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 "
 "hexadecimal"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Erro desconhecido ao validar a segurança 802.1X"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Conexão %s"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certificados PEM (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+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/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "_Segurança Wi-Fi"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Nome da rede"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "Co_nexão"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptador Wi-Fi"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Controle suas conexões de rede"
 
@@ -872,89 +954,6 @@ msgstr ""
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Desabilitar notificações de conexão"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Defina como verdadeiro para desabilitar notificações ao conectar-se a uma "
-#~ "rede."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Desabilitar notificações de desconexão"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Defina como verdadeiro para desabilitar notificações ao desconectar-se de "
-#~ "uma rede."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Desabilitar notificações de VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Defina como verdadeiro para desabilitar notificações ao conectar-se ou "
-#~ "desconectar-se de uma VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Não mostrar notificações de redes disponíveis"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Defina como verdadeiro para desabilitar notificações quando redes Wi-Fi "
-#~ "estiverem disponíveis."
-
-#~ msgid "Stamp"
-#~ msgstr "Selo"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Usado para determinar se as configurações devem ser migradas para uma "
-#~ "nova versão."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Desabilitar criação de WiFi"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Defina como verdade para desabilitar a criação de redes ad-hoc quando "
-#~ "usar o miniaplicativo."
-
-#~ msgid "Show the applet in notification area"
-#~ 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."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignorar certificado CA"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Defina como verdadeiro para desabilitar avisos de certificados CA na "
-#~ "autenticação EAP."
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Defina como verdadeiro para desabilitar avisos de certificados CA na fase "
-#~ "2 da autenticação EAP."
-
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
 
diff --git a/po/ro.po b/po/ro.po
index 2d4bdf3c..b46599fb 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2016-05-04 21:50+0200\n"
 "Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
@@ -22,6 +22,102 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-08-15 10:41+0000\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Dezactivează notificările de conectare"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Definiți ca „TRUE” pentru a dezactiva notificările ce apar la conectarea la "
+"o rețea."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Dezactivează notificările de deconectare"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Definiți ca „TRUE” pentru a dezactiva notificările ce apar la deconectarea "
+"de la o rețea."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Dezactivează notificările VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Definiți ca „TRUE” pentru a dezactiva notificările ce apar la deconectarea "
+"de la un VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Suprimă notificările pentru rețele disponibile"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Definiți ca „TRUE” pentru a dezactiva notificările pentru rețelele fără fir "
+"disponibile."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Ștampilă"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Folosit pentru a determina dacă configurările ar trebui migrate la o nouă "
+"versiune."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Dezactivare creare Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Definiți ca „TRUE” pentru a dezactiva crearea de rețele ad-hoc când se "
+"folosește miniaplicația."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Arată miniaplicația în zona de notificări"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Definiți ca „FALSE” pentru a dezactiva afișarea miniaplicației în zona de "
+"notificări."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignoră certificatul CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Definiți aceasta ca „TRUE” pentru a dezactiva avertismentele despre "
+"certificatele CA în autentificarea EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Definiți ca „TRUE” pentru a dezactiva avertizările despre certificatele CA "
+"în faza a 2-a a autentificării EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -68,44 +164,78 @@ msgstr "Parolă:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(nici una)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Certific_at de la o autoritate de certificare:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Necunoscută"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Alegeți un fișier"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+#, fuzzy
+msgid "Cancel"
+msgstr "_Anulează"
+
+#: src/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Alegeți un fișier"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Certific_at de la o autoritate de certificare:"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Selectați certificatul personal..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "C_heie privată:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Parola pentru cheia _privată:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Selectați certificatul personal..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Certificat _utilizator:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Afișea_ză parola"
 
@@ -117,36 +247,36 @@ msgstr "Implicit"
 msgid "My country is not listed"
 msgstr "Țara mea nu este în listă"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Nelistat"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Planul meu nu este listat..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Furnizor"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Dispozitive GSM instalate"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Dispozitive CDMA instalate"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Orice dispozitiv"
 
@@ -285,55 +415,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmare configurații Internet mobil de bandă largă"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(nici una)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Certific_at de la o autoritate de certificare:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Necunoscută"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-#, fuzzy
-msgid "Select"
-msgstr "Alegeți un fișier"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-#, fuzzy
-msgid "Cancel"
-msgstr "_Anulează"
-
-#: src/nma-cert-chooser-button.c:460
-#, fuzzy
-msgid "Select from file…"
-msgstr "Alegeți un fișier"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Selectați certificatul personal..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Certificat _utilizator:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Afișea_ză parolele"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -356,13 +437,27 @@ msgstr "Nume"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Selectați certificatul personal..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Certificat _utilizator:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Afișea_ză parolele"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Anulează"
 
@@ -415,58 +510,58 @@ msgstr "_Parolă:"
 msgid "_Password:"
 msgstr "_Parolă:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Deconectează"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Niciuna"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Cheie WEP 40/128-biți (Hex sau ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Parolă WEP 128-bit"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinamic (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA și WPA2 personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA și WPA2"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA și WPA2 personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "C_reează"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "C_onectare"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -474,43 +569,43 @@ msgstr ""
 "Este necesară parola sau cheia de criptare pentru a accesa rețeaua fără fir "
 "„%s”."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Se cere autentificarea în rețeaua fără fir"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentificarea este necesară pentru rețeaua fără fir"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Creează rețea fără fir nouă"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Rețea fără fir nouă"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Conectare la rețea fără fir ascunsă"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Rețea fără fir ascunsă"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -519,466 +614,370 @@ msgstr ""
 "Introduceți numele și detaliile de securitate pentru rețeaua fără fir "
 "ascunsă la care doriți să vă conectați."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Secur_itatea rețelei fără fir:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Nume rețea:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Co_nexiune:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "_Adaptor rețea fără fir:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "Conexiune DSL %d"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certificate DER sau PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Certific_at de la o autoritate de certificare:"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "Identitate anoni_mă:"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "Autentificare"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Identitate anoni_mă:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Aute_ntificare internă:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "Nume _utilizator:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Parolă:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automat"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Versiunea 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Versiunea 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Certific_at de la o autoritate de certificare:"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "Versiune _PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Parola pentru cheia _privată:"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Afișea_ză parolele"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Certific_at de la o autoritate de certificare:"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "I_dentitate:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Certific_at de la o autoritate de certificare:"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "TLS tunelat"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protejat (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Necunoscută"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_Autentificare:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Parola pentru cheia _privată:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Tip:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistem deschis"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Cheie partajată"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Implicit)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "C_heie:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Afișea_ză cheia"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "Inde_x WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Gestionează conexiunile la rețea"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Conexiuni de rețea active"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Gestionează și modifică opțiunile conexiunilor de rețea"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Dezactivează notificările de conectare"
-
-#~ 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."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Dezactivează notificările de deconectare"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Definiți ca „TRUE” pentru a dezactiva notificările ce apar la "
-#~ "deconectarea de la o rețea."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Dezactivează notificările VPN"
-
-#~ msgid ""
-#~ "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 un VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Suprimă notificările pentru rețele disponibile"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Definiți ca „TRUE” pentru a dezactiva notificările pentru rețelele fără "
-#~ "fir disponibile."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Conexiune DSL %d"
 
-#~ msgid "Stamp"
-#~ msgstr "Ștampilă"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certificate DER sau PEM (*.der, *.pem, *.crt, *.cer)"
 
-#~ 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."
+#: src/utils/utils.c:547
+#, 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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Dezactivare creare Wi-Fi"
+msgid "Wi-Fi _security"
+msgstr "Secur_itatea rețelei fără fir:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Definiți ca „TRUE” pentru a dezactiva crearea de rețele ad-hoc când se "
-#~ "folosește miniaplicația."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Nume rețea:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Arată miniaplicația în zona de notificări"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Co_nexiune:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Definiți ca „FALSE” pentru a dezactiva afișarea miniaplicației în zona de "
-#~ "notificări."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptor rețea fără fir:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignoră certificatul CA"
+#~ msgid "Manage your network connections"
+#~ msgstr "Gestionează conexiunile la rețea"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Definiți aceasta ca „TRUE” pentru a dezactiva avertismentele despre "
-#~ "certificatele CA în autentificarea EAP."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Conexiuni de rețea active"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Definiți ca „TRUE” pentru a dezactiva avertizările despre certificatele "
-#~ "CA în faza a 2-a a autentificării EAP."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Gestionează și modifică opțiunile conexiunilor de rețea"
 
 #~ msgid "NetworkManager"
 #~ msgstr "Administrator de rețea"
diff --git a/po/ru.po b/po/ru.po
index 3662847b..4aba7f12 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-08-22 16:07MSK\n"
 "Last-Translator: Olesya Gerasimenko <gammaray basealt ru>\n"
 "Language-Team: Basealt Translation Team\n"
@@ -26,6 +26,96 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Отключить уведомления о подключении"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "Установите в TRUE, чтобы отключить уведомления при подключении к сети."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Отключить уведомления об отключении"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "Установите в TRUE, чтобы отключить уведомления при отключении от сети."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Отключить уведомления от VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Установите в TRUE, чтобы отключить уведомления при подключении или "
+"отключении от VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Не показывать уведомления о доступных сетях"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Установите в TRUE, чтобы отключить уведомления о доступных сетях Wi-Fi."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Штамп"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Используется для определения параметров, которые должны быть перенесены в "
+"новую версию."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Отключить создание соединений Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Установите в TRUE, чтобы отключить создание сетей ad-hoc при использовании "
+"апплета."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Показывать апплет в области уведомлений"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Установите в FALSE, чтобы отключить отображение апплета в области "
+"уведомлений."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Игнорировать сертификат CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Установите в TRUE, чтобы отключить предупреждения о сертификатах CA для "
+"аутентификации EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Установите в TRUE, чтобы отключить предупреждения о сертификатах CA для "
+"второго этапа аутентификации EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -78,43 +168,72 @@ msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 "Отсканировать с помощью телефона или <a href=\"nma:print\">Распечатать</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Нет)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Ключ в %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Сертификат в %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Неизвестно)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Выбрать"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Отменить"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Выбрать из файла…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Сертификатов не установлено"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Нет установленного ключа"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Выбрать ключ для сертификата %s"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "Приватный _ключ %s"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "_Пароль приватного ключа %s"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Выбрать сертификат %s"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "_Сертификат %s"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Пока_зывать пароль"
 
@@ -126,35 +245,35 @@ msgstr "По умолчанию"
 msgid "My country is not listed"
 msgstr "Моей страны нет в списке"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Нет в списке"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Моего тарифного плана нет в списке…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Оператор"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Установленное GSM-устройство"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Установленное CDMA-устройство"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Любое устройство"
 
@@ -282,50 +401,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Подтвердить параметры мобильной связи"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Нет)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Ключ в %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Сертификат в %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Неизвестно)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Выбрать"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Отменить"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Выбрать из файла…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Выбрать сертификат %s"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "Пароль сертификата %s"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "По_казывать пароли"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Ошибка авторизации: "
@@ -346,13 +421,27 @@ msgstr "Имя"
 msgid "Issued By"
 msgstr "Используется"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Выбрать сертификат %s"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "Пароль сертификата %s"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "По_казывать пароли"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Введите PIN %s"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Отменить"
 
@@ -400,91 +489,91 @@ msgstr "_Второй пароль:"
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Нажмите для подключения"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Создать…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Нет"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP (40/128-битный ключ (Hex или ASCII))"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP (128-битный ключ)"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Динамический WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA/WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA/WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "С_оздать"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "П_одключиться"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Для подключения к сети Wi-Fi «%s» требуется указать ключ или пароль."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Для сети Wi-Fi требуется аутентификация"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Сеть Wi-Fi требует аутентификацию"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Создать новую сеть Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Новая сеть Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Введите имя для создаваемой сети Wi-Fi."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Подключение к скрытой сети Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Скрытая сеть Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -492,297 +581,251 @@ msgstr ""
 "Введите имя и параметры безопасности скрытой сети Wi-Fi, к которой "
 "необходимо подключиться."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "_Безопасность Wi-Fi"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Имя сети"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "Сое_динение"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "_Адаптер Wi-Fi"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Подключение %s"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Сертификаты PEM (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "неизвестная ошибка в безопасности 802.1x (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "не выбран сертификат УЦ"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "выбранный файл сертификата УЦ не существует"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "отсутствует файл EAP-FAST PAC"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Выбрать файл PAC"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Файлы PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Все файлы"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Анонимная"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "С проверкой подлинности"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Обе"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "А_нонимная аутентификация"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "_Файл PAC"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "_Внутренняя аутентификация"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Разрешить автоматическую инициализацию PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "отсутствует имя пользователя EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "отсутствует пароль EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "_Имя пользователя"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Пароль"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Автоматический"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Версия 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Версия 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Сертификат УЦ не _требуется"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "_Версия PEAP"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Суффикс имени сертификата сервера."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Домен"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "отсутствует имя пользователя EAP"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "отсутствует пароль EAP"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "отсутствует парольная фраза закрытого ключа клиента EAP"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "П_арольная фраза закрытого ключа"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "По_казывать парольную фразу"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "отсутствует идентичность EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "не выбран сертификат пользователя"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "выбранный файл сертификата пользователя не существует"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "ключи не выбраны"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "выбранный файл ключа не существует"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "_Подлинность"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (без EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Неизвестная ошибка проверки безопасности 802.1x"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "неизвестная ошибка в безопасности 802.1x (wpa-eap)"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "не выбран сертификат УЦ"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "выбранный файл сертификата УЦ не существует"
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
 # Метод аутентификации
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Туннелированный TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Защищённый EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Внешняя конфигурация"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "А_утентификация"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "отсутствует leap-имя пользователя"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "отсутствует leap-пароль"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "отсутствует пароль EAP"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Тип"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "отсутствует wep-ключ"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "недействительный wep-ключ: ключ с длиной %zu должен содержать только "
 "шестнадцатеричные цифры"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -790,7 +833,7 @@ msgstr ""
 "недействительный wep-ключ: ключ с длиной %zu должен содержать только символы "
 "ASCII"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -799,40 +842,40 @@ msgstr ""
 "недействительный wep-ключ: ключ с неверной длиной %zu. Ключ должен быть "
 "длины 5/13 (ASCII) или 10/26 (HEX)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "недействительный wep-ключ: парольная фраза не может быть пустой"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "недействительный wep-ключ: парольная фраза должна быть короче 64 символов"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Открытая система"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Общий ключ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (по умолчанию)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Ключ"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Пока_зывать ключ"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "_Индекс WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -841,12 +884,46 @@ msgstr ""
 "недействительный wpa-psk: ключ неверной длины %zu. Должен быть [8,63] байт "
 "или 64 шестнадцатеричных цифр"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "недействительный wpa-psk: невозможно интерпретировать ключ с 64 байт как "
 "шестнадцатеричный"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Неизвестная ошибка проверки безопасности 802.1x"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Подключение %s"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Сертификаты PEM (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "Секретные ключи DER, PEM или PKCS#12 (*.der, *.pem, *.p12)"
+
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "_Безопасность Wi-Fi"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Имя сети"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "Сое_динение"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Адаптер Wi-Fi"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Управление сетевыми соединениями"
 
@@ -862,86 +939,6 @@ msgstr ""
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Отключить уведомления о подключении"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Установите в TRUE, чтобы отключить уведомления при подключении к сети."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Отключить уведомления об отключении"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Установите в TRUE, чтобы отключить уведомления при отключении от сети."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Отключить уведомления от VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Установите в TRUE, чтобы отключить уведомления при подключении или "
-#~ "отключении от VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Не показывать уведомления о доступных сетях"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Установите в TRUE, чтобы отключить уведомления о доступных сетях Wi-Fi."
-
-#~ msgid "Stamp"
-#~ msgstr "Штамп"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Используется для определения параметров, которые должны быть перенесены в "
-#~ "новую версию."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Отключить создание соединений Wi-Fi"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Установите в TRUE, чтобы отключить создание сетей ad-hoc при "
-#~ "использовании апплета."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Показывать апплет в области уведомлений"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Установите в FALSE, чтобы отключить отображение апплета в области "
-#~ "уведомлений."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Игнорировать сертификат CA"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Установите в TRUE, чтобы отключить предупреждения о сертификатах CA для "
-#~ "аутентификации EAP."
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Установите в TRUE, чтобы отключить предупреждения о сертификатах CA для "
-#~ "второго этапа аутентификации EAP."
-
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
 
diff --git a/po/rw.po b/po/rw.po
index 6a49f3a4..400e3480 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2005-03-31 20:55-0700\n"
 "Last-Translator: Steve Murphy <murf e-tools com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw lists sourceforge net>\n"
@@ -25,6 +25,83 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -70,43 +147,72 @@ msgstr ""
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr ""
 
@@ -118,35 +224,35 @@ msgstr ""
 msgid "My country is not listed"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr ""
 
@@ -262,34 +368,25 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
+#: src/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr ""
+#: src/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "urusobe Ukwihuza"
 
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:116
+msgid "Name"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
 msgstr ""
 
 #: src/nma-pkcs11-cert-chooser.c:381
@@ -306,34 +403,13 @@ msgstr ""
 msgid "Sho_w passwords"
 msgstr ""
 
-#: src/nma-pkcs11-cert-chooser-dialog.c:241
-msgid "Error logging in: "
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.c:263
-#, fuzzy
-msgid "Error opening a session: "
-msgstr "urusobe Ukwihuza"
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:20
-msgid "_Unlock token"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:116
-msgid "Name"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:126
-msgid "Issued By"
-msgstr ""
-
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -383,375 +459,327 @@ msgstr ""
 msgid "_Password:"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "urusobe Ukwihuza"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 msgid "WPA3 Personal"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 #, fuzzy
 msgid "C_onnect"
 msgstr "Kwihuza"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Gishya"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Kuri a urusobe"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, 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/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr ""
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "ni OYA"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Kwihuza"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr ""
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "urusobe Ukwihuza"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr ""
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Icyerekezo"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Icyerekezo"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 msgid "missing password"
 msgstr ""
 
@@ -759,76 +787,112 @@ msgstr ""
 # sw/source\ui\index\cnttab.src:TP_TOX_SELECT.FT_SORTALG.text
 # #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
 # sw/source\ui\misc\srtdlg.src:DLG_SORTING.FT_KEYTYP.text
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "Ubwoko bw'agakandisho"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "urusobe Ukwihuza"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr ""
+
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr ""
+
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "ni OYA"
+
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Kwihuza"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Manage your network connections"
 #~ msgstr "urusobe Ukwihuza"
diff --git a/po/sk.po b/po/sk.po
index 25fc0b1d..55579c4a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-09-08 11:23+0200\n"
 "Last-Translator: Dušan Kazik <prescott66 gmail com>\n"
 "Language-Team: Slovak <gnome-sk-list gnome org>\n"
@@ -21,6 +21,110 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 "X-Generator: Poedit 2.2.1\n"
 
+# gsettings summary
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Zakázať oznámenia o pripojení"
+
+# gsettings description
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Nastavte na true, keď chcete zakázať oznámenia počas pripájania k sieti."
+
+# gsettings summary
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Zakázať oznámenia o odpojení"
+
+# gsettings description
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Nastavte na true, keď chcete zakázať oznámenia počas odpájania zo siete."
+
+# gsettings summary
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Zakázať oznámenia o pripojení VPN"
+
+# gsettings description
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"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:21
+msgid "Suppress networks available notifications"
+msgstr "Potlačiť oznámenia dostupných sietí"
+
+# gsettings description
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Nastavte na true, keď chcete zakázať oznámenia na dostupné Wi-Fi siete."
+
+# gsettings summary
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Známka"
+
+# gsettings description
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "Použité na zistenie, či majú byť nastavenia migrované na novú verziu."
+
+# gsettings summary
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "Zakázať vytváranie WiFi"
+
+# gsettings description
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Nastavte na true, keď chcete zakázať vytváranie ad-hoc sietí pri používaní "
+"apletu."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Zobraziť aplet v oblasti oznámení"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Nastavte na false, keď nechcete aby sa zobrazoval aplet v oblasti oznámení."
+
+# gsettings summary
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignorovať certifikát CA"
+
+# gsettings description
+#: org.gnome.nm-applet.gschema.xml.in:44
+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:49
+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."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -68,43 +172,74 @@ msgstr "Heslo:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+# ssid
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Žiadne)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certifikát v %s"
+
+# base connection, device type
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Neznáme)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Vybrať zo súboru…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Nie je nastavený žiadny certifikát"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Zvoliť certifikát CA"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "%s súkromný _kľúč"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Heslo _súkromného kľúča:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Zvoliť certifikát CA"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Po_užívateľov certifikát:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Z_obraziť heslo"
 
@@ -116,35 +251,35 @@ msgstr "Predvolené"
 msgid "My country is not listed"
 msgstr "Moja krajina nie je uvedená"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Neuvedené"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Môj program nie je uvedený…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Poskytovateľ"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Nainštalované zariadenie pre GSM"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Nainštalované zariadenie pre CDMA"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Akékoľvek zariadenie"
 
@@ -279,52 +414,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Potvrďte nastavenia mobilného pripojenia"
 
-# ssid
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Žiadne)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Certifikát v %s"
-
-# base connection, device type
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Neznáme)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Vybrať zo súboru…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Zvoliť certifikát CA"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Po_užívateľov certifikát:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Z_obraziť heslá"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Chyba počas prihlasovania"
@@ -347,13 +436,27 @@ msgstr "Názov"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Zvoliť certifikát CA"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Po_užívateľov certifikát:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Z_obraziť heslá"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
@@ -402,57 +505,57 @@ msgid "_Password:"
 msgstr "_Heslo:"
 
 # tooltip
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Kliknutím pripojíte"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Nové…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Žiadne"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Kľúč pre WEP 40/128-bitový (šestnástkovo alebo ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Heslo pre WEP 128-bitové"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamické WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "Osobné WPA a WPA2"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "Podnikové WPA a WPA2"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Osobné WPA a WPA2"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "Vy_tvoriť"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "Prip_ojiť"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -460,38 +563,38 @@ msgstr ""
 "Na prístup do siete Wi-Fi „%s“ je vyžadované heslo alebo šifrovací kľúč."
 
 # window title
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Žiadosť o overenie totožnosti pre sieť Wi-Fi"
 
 # desc
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Vyžaduje sa overenie totožnosti pre sieť Wi-Fi"
 
 #  window title
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Vytvorenie novej siete Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nová sieť Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Zadajte názov siete Wi-Fi, ktorú chcete vytvoriť."
 
 # dialog title
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Pripojenie k skrytej sieti Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Skrytá sieť Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -499,306 +602,256 @@ msgstr ""
 "Zadajte názov a podrobnosti o zabezpečení skrytej siete W-Fi, ku ktorej sa "
 "chcete pripojiť."
 
-# GtkLabel label
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Zabezpečenie _Wi-Fi"
-
-# GtkLabel label
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Názov siete"
-
-# GtkLabel label
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "_Pripojenie"
-
-# GtkLabel label
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "_Adaptér Wi-Fi"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "pripojenie k sieti %s"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Certifikáty PEM (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "nedefinovaná chyba v zabezpečení 802.1X (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "N_ie je vyžadovaný žiadny certifikát CA"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "chýba súbor PAC protokolu EAP-FAST"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Zvoľiť súbor PAC"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Súbory PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Všetky súbory"
 
 # automatic PAC provisioning
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonymné"
 
 # automatic PAC provisioning
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Overená totožnosť"
 
 # automatic PAC provisioning
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Obe"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Anony_mná identita"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "_Súbor PAC"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "V_nútorné overenie totožnosti"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Umožniť automatické zao_bstarávanie súboru PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "chýba používateľské meno protokolu EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "chýba heslo protokolu EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "Po_užívateľské meno"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Heslo"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Verzia 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Verzia 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "N_ie je vyžadovaný žiadny certifikát CA"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "Verzia protokolu _PEAP"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Doména"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "chýba používateľské meno protokolu EAP"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "chýba heslo protokolu EAP"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "Heslo súk_romného kľúča"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "Z_obraziť heslo"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "chýba identita protokolu EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "nie je vybraný žiadny užívateľský certifikát"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "nie je vybraný žiadny kľúč"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "I_dentita"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Neznáma chyba pri overovaní bezpečnosti 802.1X"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "nedefinovaná chyba v zabezpečení 802.1X (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "N_ie je vyžadovaný žiadny certifikát CA"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
 # protocol
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunelované TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Chránený protokol EAP (PEAP)"
 
 # base connection, device type
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Nastavené externe"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "_Overenie totožnosti"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "chýba používateľské meno protokolu leap"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "chýba heslo protokolu leap"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "chýba heslo protokolu EAP"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Typ"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "chýba kľúč zabezpečenia wep"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "neplatný kľúč zabezpečenia wep: kľúč o dĺžke %zu musí obsahovať iba "
 "hexadecimálne čísla"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -806,7 +859,7 @@ msgstr ""
 "neplatný kľúč zabezpečenia wep: kľúč o dĺžke %zu musí obsahovať iba znaky v "
 "kódovaní ascii"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -815,39 +868,39 @@ msgstr ""
 "neplatný kľúč zabezpečenia wep: nesprávna dĺžka kľúča %zu. Kľúč musí byť o "
 "dĺžke buď 5/13 (ascii) alebo 10/26 (hexadecimálne)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "neplatný kľúč zabezpečenia wep: heslo nemôže byť prázdne"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "neplatný kľúč zabezpečenia wep: heslo musí byť kratšie ako 64 znakov"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Otvorený systém"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Zdieľaný kľúč"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Predvolené)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Kľúč"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Zo_braziť kľúč"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "Inde_x kľúča WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -856,116 +909,60 @@ msgstr ""
 "neplatné zabezpečenie wpa-psk: neplatná dĺžka kľúča %zu. Musí byť o dĺžke "
 "[8,63] bajtov alebo 64 hexadecimálnych čísel"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "neplatné zabezpečenie wpa-psk: nedá sa interpretovať 64 bajtový kľúč ako "
 "hexadecimálny"
 
-# dektop entry comment
-#~ msgid "Manage your network connections"
-#~ msgstr "Spravuje vaše sieťové pripojenia"
-
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Pokročilá konfigurácia siete"
-
-# dektop entry comment
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Spravuje a mení nastavenia vášho sieťového pripojenia"
-
-# gsettings summary
-#~ msgid "Disable connected notifications"
-#~ msgstr "Zakázať oznámenia o pripojení"
-
-# gsettings description
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Nastavte na true, keď chcete zakázať oznámenia počas pripájania k sieti."
-
-# gsettings summary
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Zakázať oznámenia o odpojení"
-
-# gsettings description
-#~ 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
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Zakázať oznámenia o pripojení VPN"
-
-# gsettings description
-#~ 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
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Potlačiť oznámenia dostupných sietí"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Neznáma chyba pri overovaní bezpečnosti 802.1X"
 
-# gsettings description
-#~ 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."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "pripojenie k sieti %s"
 
-# gsettings summary
-#~ msgid "Stamp"
-#~ msgstr "Známka"
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certifikáty PEM (*.pem, *.crt, *.cer)"
 
-# gsettings description
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Použité na zistenie, či majú byť nastavenia migrované na novú verziu."
+#: src/utils/utils.c:547
+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)"
 
-# gsettings summary
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Zakázať vytváranie WiFi"
+# GtkLabel label
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Zabezpečenie _Wi-Fi"
 
-# gsettings description
-#~ 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."
+# GtkLabel label
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Názov siete"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Zobraziť aplet v oblasti oznámení"
+# GtkLabel label
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "_Pripojenie"
 
-#~ 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í."
+# GtkLabel label
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptér Wi-Fi"
 
-# gsettings summary
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignorovať certifikát CA"
+# dektop entry comment
+#~ msgid "Manage your network connections"
+#~ msgstr "Spravuje vaše sieťové pripojenia"
 
-# gsettings description
-#~ 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 "Advanced Network Configuration"
+#~ msgstr "Pokročilá konfigurácia siete"
 
-# gsettings description
-#~ 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."
+# dektop entry comment
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Spravuje a mení nastavenia vášho sieťového pripojenia"
 
 #~ msgid "NetworkManager"
 #~ msgstr "NetworkManager"
diff --git a/po/sl.po b/po/sl.po
index 9b362057..0c9223cf 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2015-03-24 19:43+0100\n"
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
@@ -23,6 +23,93 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Onemogoči obvestila ob vzpostavitvi povezav"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Izbrana možnost onemogoča obvestila ob vzpostavitvi povezave z omrežjem."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Onemogoči obvestila ob prekinitvi povezav"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "Izbrana možnost onemogoča obvestila ob prekinitvi omrežne povezave."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Onemogoči obvestila VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Izbrana možnost onemogoča obvestila ob povezovanju ali prekinjanju omrežne "
+"povezave VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Prepreči obvestila o razpoložljivosti omrežij"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Izbrana možnost onemogoča obvestila o razpoložljivosti brezžičnih Wi-Fi "
+"omrežij."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Žig"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Uporabljeno za določanje ali naj bodo nastavitve preseljene v novo različico."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Onemogoči ustvarjanje Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Izbrana možnost onemogoči ustvarjanje omrežij adhoc med uporabo apleta. "
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Pokaži aplet v obvestilni vrstici"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "Neizbrana možnost onemogoči prikaz apleta v obvestilni vrstici."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Prezri potrdilo CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "Izbrana možnost onemogoča opozorila o potrdilih CA overitve EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Izbrana možnost onemogoča opozorila o potrdilih CA na drugem koraku overitve "
+"EAP."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -69,44 +156,75 @@ msgstr "Geslo:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(brez)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Potrdilo _CA:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Neznano"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Ni _zahtevano nobeno potrdilo"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Izbor potrdila CA"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Osebni _ključ:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_Geslo osebnega ključa:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Izbor potrdila CA"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_Uporabniško potrdilo:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Pokaži _geslo"
 
@@ -118,36 +236,36 @@ msgstr "Privzeto"
 msgid "My country is not listed"
 msgstr "Moje države ni na seznamu"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Nenavedeno"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Moj načrt ni na seznamu ..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Ponudnik"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Nameščena naprava GSM"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Nameščena naprava CDMA"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Katerakoli naprava"
 
@@ -285,52 +403,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Potrdite nastavitve mobilnega širokopasovnega omrežja"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(brez)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Potrdilo _CA:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Neznano"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Izbor potrdila CA"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Uporabniško potrdilo:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Pokaži _gesla"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -353,13 +425,27 @@ msgstr "Ime"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Izbor potrdila CA"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Uporabniško potrdilo:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Pokaži _gesla"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -412,59 +498,59 @@ msgstr "_Drugotno geslo:"
 msgid "_Password:"
 msgstr "_Geslo:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Prekini povezavo"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Brez"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Ključ WEP 40/128-bit (Šestnajstiški ali ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "128-bit šifrirno geslo WEP"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamični WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "Osebni WPA in WPA2"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "Podjetniški WPA in WPA2"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Osebni WPA in WPA2"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "Ustva_ri"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "Po_veži se"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -472,35 +558,35 @@ msgstr ""
 "Za povezavo v brezžično omrežje '%s' je zahtevana overitev ali nastavitev "
 "šifrirnega ključa."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Zahtevana je overitev za brezžično omrežje"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Brezžično omrežje zahteva overitev"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Ustvari novo brezžično omrežje"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Novo omrežje Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Poveži se s skritim omrežjem Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Skrito omrežje Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -508,456 +594,368 @@ msgstr ""
 "Vnesite ime in varnostne podrobnosti skritega omrežja Wi-Fi, s katerim se "
 "želite povezati."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Varnost Wi-Fi:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Ime omrežja:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "P_ovezava:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Vmeskin Wi-Fi:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Povezava %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER ali PEM potrdila (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Ni _zahtevano nobeno potrdilo"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Izbor datoteke PAC ..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Datoteke PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Vse datoteke"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Brezimno"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Overjeno"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Oba"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "_Brezimna istovetnost:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "Datoteka _PAC:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_Notranja overitev:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Dovoli samodejno odbiro PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Uporabniško ime:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Geslo:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Različica 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Različica 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Ni _zahtevano nobeno potrdilo"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "_Različica PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "128-bit šifrirno geslo WEP"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "_Pokaži gesla"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ni _zahtevano nobeno potrdilo"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "_Istovetnost:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Ni _zahtevano nobeno potrdilo"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "ges"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "Hitro"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tuneliran TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Varovani EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Neznano"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Overitev:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "_Geslo osebnega ključa:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "Vrs_ta:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Odpri sistem"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Souporabljen ključ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (privzeto)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Ključ:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "_Pokaži ključ"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "_Določilo WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Upravljanje omrežnih povezav"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Dejavne omrežne storitve"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Upravljanje in spreminjanje nastavitev omrežne povezave"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Onemogoči obvestila ob vzpostavitvi povezav"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Izbrana možnost onemogoča obvestila ob vzpostavitvi povezave z omrežjem."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Onemogoči obvestila ob prekinitvi povezav"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr "Izbrana možnost onemogoča obvestila ob prekinitvi omrežne povezave."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Onemogoči obvestila VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Izbrana možnost onemogoča obvestila ob povezovanju ali prekinjanju "
-#~ "omrežne povezave VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Prepreči obvestila o razpoložljivosti omrežij"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Izbrana možnost onemogoča obvestila o razpoložljivosti brezžičnih Wi-Fi "
-#~ "omrežij."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Povezava %s"
 
-#~ msgid "Stamp"
-#~ msgstr "Žig"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER ali PEM potrdila (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Uporabljeno za določanje ali naj bodo nastavitve preseljene v novo "
-#~ "različico."
+#: src/utils/utils.c:547
+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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Onemogoči ustvarjanje Wi-Fi"
+msgid "Wi-Fi _security"
+msgstr "Varnost Wi-Fi:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Izbrana možnost onemogoči ustvarjanje omrežij adhoc med uporabo apleta. "
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Ime omrežja:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Pokaži aplet v obvestilni vrstici"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "P_ovezava:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr "Neizbrana možnost onemogoči prikaz apleta v obvestilni vrstici."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Vmeskin Wi-Fi:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Prezri potrdilo CA"
+#~ msgid "Manage your network connections"
+#~ msgstr "Upravljanje omrežnih povezav"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr "Izbrana možnost onemogoča opozorila o potrdilih CA overitve EAP."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Dejavne omrežne storitve"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Izbrana možnost onemogoča opozorila o potrdilih CA na drugem koraku "
-#~ "overitve EAP."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Upravljanje in spreminjanje nastavitev omrežne povezave"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/sq.po b/po/sq.po
index 27813b03..4dc391d8 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2004-09-15 11:49+0200\n"
 "Last-Translator: Laurent Dhima <laurenti alblinux net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit lists sourceforge net>\n"
@@ -16,6 +16,83 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -63,43 +140,72 @@ msgstr "Fjalëkalimi:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Fjalëkalimi:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr ""
 
@@ -111,35 +217,35 @@ msgstr ""
 msgid "My country is not listed"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr ""
 
@@ -256,34 +362,24 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
+#: src/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
+#: src/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:116
+msgid "Name"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
 msgstr ""
 
 #: src/nma-pkcs11-cert-chooser.c:381
@@ -300,33 +396,13 @@ msgstr "Fjalëkalimi:"
 msgid "Sho_w passwords"
 msgstr ""
 
-#: src/nma-pkcs11-cert-chooser-dialog.c:241
-msgid "Error logging in: "
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.c:263
-msgid "Error opening a session: "
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:20
-msgid "_Unlock token"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:116
-msgid "Name"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:126
-msgid "Issued By"
-msgstr ""
-
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -374,446 +450,434 @@ msgstr ""
 msgid "_Password:"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 #, fuzzy
 msgid "WEP 128-bit Passphrase"
 msgstr "Fjalëkalimi:"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 msgid "WPA3 Personal"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Nevoitet Kyçi i Rrjetit Wireless"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr ""
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "Lidhjet e rrjetit"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Lidhjet e rrjetit"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr ""
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "Lidhjet e rrjetit"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr ""
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "Lidhjet e rrjetit"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "Fjalëkalimi:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Fjalëkalimi:"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Fjalëkalimi:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Lidhjet e rrjetit"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr ""
+
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr ""
+
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "Lidhjet e rrjetit"
+
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Lidhjet e rrjetit"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Manage your network connections"
 #~ msgstr "Lidhjet e rrjetit"
diff --git a/po/sr.po b/po/sr.po
index 8a0d9452..c2fa6c9b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2018-02-24 19:43+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
 "Language-Team: српски <gnome-sr googlegroups org>\n"
@@ -23,6 +23,95 @@ msgstr ""
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Искључивање обавештења о повезивању"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Укључите ову опцију да искључите обавештења када се повезујете на мрежу."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Искључивање обавештења о прекиду везе"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Укључите ову опцију да искључите обавештења када прекидате везу са мрежом."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Искључивање ВПН обавештења"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Укључите ову опцију да искључите обавештења када се повезујете на ВПН или "
+"када прекидате везу са њим."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Искључи обавештавања о доступним мрежама"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Укључите ову опцију да искључите обавештења о доступности бежичних мрежа."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Печат"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "Ово одређује да ли треба превести подешавања на ново издање."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Онемогући образовање бежичне мреже"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Укључите ову опцију да искључите образовање адхок мрежа из Управника мрежама."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Приказује програмче у области обавештења"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Поништите избор да искључите приказивање програмчета у области обавештења."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Занемарује ЦА уверење"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Укључите ову опцију да искључите упозорења о ЦА уверењима у ЕАП потврђивању "
+"идентитета."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Укључите ову опцију да искључите упозорења о ЦА уверењима у другој фази ЕАП "
+"потврђивања идентитета."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -71,43 +160,72 @@ msgstr "Лозинка:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Ништа)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Кључ у „%s“"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Уверење у „%s“"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Непознато)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Изабери"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Откажи"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Изабери из датотеке…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Није подешено уверење"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Није подешен кључ"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Изаберите кључ за „%s“ уверење"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "„%s“ приватни _кључ:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "„%s“ _лозинка кључа:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Изаберите „%s“ уверење"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "„%s“ _уверење:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Прикажи _лозинку"
 
@@ -119,35 +237,35 @@ msgstr "Подразумевана"
 msgid "My country is not listed"
 msgstr "Моја земља није на списку"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "ГСМ"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "ЦДМА"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Неизлистано"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Мој план није на списку…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Достављач"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Инсталиран ГСМ уређај"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Инсталиран ЦДМС уређај"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Било који уређај"
 
@@ -278,50 +396,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Потврдите мобилну широкопојасну везу"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Ништа)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Кључ у „%s“"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Уверење у „%s“"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Непознато)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Изабери"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Откажи"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Изабери из датотеке…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Изаберите „%s“ уверење"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Лозинка „%s“ уверења:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Прикажи _лозинке"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Грешка пријављивања"
@@ -342,13 +416,27 @@ msgstr "Назив"
 msgid "Issued By"
 msgstr "Издаје га"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Изаберите „%s“ уверење"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Лозинка „%s“ уверења:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Прикажи _лозинке"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Унесите „%s“ ПИН"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Откажи"
 
@@ -396,92 +484,92 @@ msgstr "_Друга лозинка:"
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Притисните да се повежете"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Ново…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ништа"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "ВЕП 40/128-битни кључ (Хекс или АСКРИ)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "ВЕП 128-битна лозинка"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "ЛЕАП"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Динамички ВЕП (802.1х)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "Лични ВПА & ВПА2"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "Пословни ВПА & ВПА2"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Лични ВПА & ВПА2"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Направи"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Повежи"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Потребне су лозинке или кључеви шифровања за приступ бежичној мрежи „%s“."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Потребно је потврђивање идентитета за бежичну мрежу"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Бежична мрежа захтева потврђивање идентитета"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Направи нову бежичну мрежу"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Нова бежична мрежа"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Унесите назив за нову бежичну мрежу."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Повежи се на скривену бежичну мрежу"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Скривена бежична мрежа"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -489,317 +577,267 @@ msgstr ""
 "Унесите назив и безбедносне податке за скривену бежичну мрежу на коју желите "
 "да се повежете."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Бежична _безбедност:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Име мреже:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "_Веза:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Бежични _уређај:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s веза"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "ПЕМ уверења (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr "ДЕР, ПЕМ, или ПКЦС#12 лични кључеви (*.der, *.pem, *.p12, *.key)"
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "непозната грешка у 802.1X безбедности (впа-еап)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "Није изабрано уверење"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "изабрана датотека уверења не постоји"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "недостаје ЕАП-ФАСТ ПАЦ датотека"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "ГТЦ"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "МСЦХАПв2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Изабери ПАЦ датотеку"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "ПАЦ датотеке (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Све датотеке"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Анонимно"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Потврђеним идентитетом"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Оба"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Анонимни _идентитет:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "ПАЦ _датотека:"
 
 # ~Милош
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_Унутрашња пријава:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Дозволи самостално ПАЦ _резервисање"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "недостаје ЕАП-ЛЕАП корисничко име"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "недостаје ЕАП-ЛЕАП лозинка"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Корисничко име:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Лозинка:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "МД5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Самостално"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Издање 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Издање 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Није потребно _уверење"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "ПЕАП _издање:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Суфикс назива уверења сервера."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 #, fuzzy
 msgid "_Domain"
 msgstr "_Домен:"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "недостаје ЕАП корисничко име"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "недостаје ЕАП лозинка"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "ВЕП 128-битна лозинка"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Прикажи _лозинке"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "недостаје ЕАП-ТЛС идентитет"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "није изабрано корисничко уверење"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "изабрана датотека корисничког уверења не постоји"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "није изабран кључ"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "изабрана датотека кључа не постоји"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "_Идентитет:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "ПАП"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "МСЦХАП"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "МСЦХАПв2 (без ЕАП-а)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "ЦХАП"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Непозната грешка проверавања 802.1X безбедности"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "непозната грешка у 802.1X безбедности (впа-еап)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "Није изабрано уверење"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "изабрана датотека уверења не постоји"
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "ТЛС"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "ЛЗНК"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "ФАСТ"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "ТЛС кроз тунел"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Заштићени ЕАП (ПЕАП)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Непознато"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "По_тврђивање идентитета:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "недостаје леап корисничко име"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "недостаје леап лозинка"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "недостаје ЕАП лозинка"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Врста:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "недостаје веп кључ"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "неисправан веп кључ: кључ дужине %zu мора да садржи само хекса-бројеве"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "неисправан веп кључ: кључ дужине %zu мора да садржи само аскри знакове"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -808,41 +846,41 @@ msgstr ""
 "неисправан веп кључ: погрешна дужина кључа %zu. Кључ мора бити или дужине "
 "5/13 (аскри) или 10/26 (хекс)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "неисправан веп-кључ: лозинка не сме бити празна"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "неисправан веп-кључ: лозинка мора бити краћа од 64 знака"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Отворени систем"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Дељени кључ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Основно)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Кључ:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "П_рикажи кључ"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "ВЕП _индекс:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -851,99 +889,59 @@ msgstr ""
 "неисправна впа лозинка: неисправна дужина кључа %zu. Мора бити [8,63] бајта "
 "или 64 хекса-броја"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "неисправна впа лозинка: не могу да растумачим кључ од 64 бајта као "
 "хексадецимални"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Управљајте вашим везама мреже"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Сирово подешавање"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Управљајте и измените подешавања ваших мрежних веза"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Искључивање обавештења о повезивању"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Укључите ову опцију да искључите обавештења када се повезујете на мрежу."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Искључивање обавештења о прекиду везе"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Укључите ову опцију да искључите обавештења када прекидате везу са мрежом."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Искључивање ВПН обавештења"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Укључите ову опцију да искључите обавештења када се повезујете на ВПН или "
-#~ "када прекидате везу са њим."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Искључи обавештавања о доступним мрежама"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Непозната грешка проверавања 802.1X безбедности"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Укључите ову опцију да искључите обавештења о доступности бежичних мрежа."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s веза"
 
-#~ msgid "Stamp"
-#~ msgstr "Печат"
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "ПЕМ уверења (*.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "Ово одређује да ли треба превести подешавања на ново издање."
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "ДЕР, ПЕМ, или ПКЦС#12 лични кључеви (*.der, *.pem, *.p12, *.key)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Онемогући образовање бежичне мреже"
+msgid "Wi-Fi _security"
+msgstr "Бежична _безбедност:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Укључите ову опцију да искључите образовање адхок мрежа из Управника "
-#~ "мрежама."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Име мреже:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Приказује програмче у области обавештења"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "_Веза:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Поништите избор да искључите приказивање програмчета у области обавештења."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Бежични _уређај:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Занемарује ЦА уверење"
+#~ msgid "Manage your network connections"
+#~ msgstr "Управљајте вашим везама мреже"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Укључите ову опцију да искључите упозорења о ЦА уверењима у ЕАП "
-#~ "потврђивању идентитета."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Сирово подешавање"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Укључите ову опцију да искључите упозорења о ЦА уверењима у другој фази "
-#~ "ЕАП потврђивања идентитета."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Управљајте и измените подешавања ваших мрежних веза"
 
 #~ msgid "NetworkManager"
 #~ msgstr "Управник мреже"
diff --git a/po/sr latin po b/po/sr latin po
index 70a94bf8..1ce25d02 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2018-02-24 19:43+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
 "Language-Team: srpski <gnome-sr googlegroups org>\n"
@@ -23,6 +23,96 @@ msgstr ""
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Isključivanje obaveštenja o povezivanju"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Uključite ovu opciju da isključite obaveštenja kada se povezujete na mrežu."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Isključivanje obaveštenja o prekidu veze"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Uključite ovu opciju da isključite obaveštenja kada prekidate vezu sa mrežom."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Isključivanje VPN obaveštenja"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Uključite ovu opciju da isključite obaveštenja kada se povezujete na VPN ili "
+"kada prekidate vezu sa njim."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Isključi obaveštavanja o dostupnim mrežama"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Uključite ovu opciju da isključite obaveštenja o dostupnosti bežičnih mreža."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Pečat"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "Ovo određuje da li treba prevesti podešavanja na novo izdanje."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Onemogući obrazovanje bežične mreže"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Uključite ovu opciju da isključite obrazovanje adhok mreža iz Upravnika "
+"mrežama."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Prikazuje programče u oblasti obaveštenja"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Poništite izbor da isključite prikazivanje programčeta u oblasti obaveštenja."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Zanemaruje CA uverenje"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Uključite ovu opciju da isključite upozorenja o CA uverenjima u EAP "
+"potvrđivanju identiteta."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Uključite ovu opciju da isključite upozorenja o CA uverenjima u drugoj fazi "
+"EAP potvrđivanja identiteta."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -71,43 +161,72 @@ msgstr "Lozinka:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Ništa)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Ključ u „%s“"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Uverenje u „%s“"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Nepoznato)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Izaberi"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Otkaži"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Izaberi iz datoteke…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Nije podešeno uverenje"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Nije podešen ključ"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Izaberite ključ za „%s“ uverenje"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "„%s“ privatni _ključ:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "„%s“ _lozinka ključa:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Izaberite „%s“ uverenje"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "„%s“ _uverenje:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Prikaži _lozinku"
 
@@ -119,35 +238,35 @@ msgstr "Podrazumevana"
 msgid "My country is not listed"
 msgstr "Moja zemlja nije na spisku"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Neizlistano"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Moj plan nije na spisku…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Dostavljač"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Instaliran GSM uređaj"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Instaliran CDMS uređaj"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Bilo koji uređaj"
 
@@ -278,50 +397,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Potvrdite mobilnu širokopojasnu vezu"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Ništa)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Ključ u „%s“"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Uverenje u „%s“"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Nepoznato)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Izaberi"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Otkaži"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Izaberi iz datoteke…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Izaberite „%s“ uverenje"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Lozinka „%s“ uverenja:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Prikaži _lozinke"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Greška prijavljivanja"
@@ -342,13 +417,27 @@ msgstr "Naziv"
 msgid "Issued By"
 msgstr "Izdaje ga"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Izaberite „%s“ uverenje"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Lozinka „%s“ uverenja:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Prikaži _lozinke"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Unesite „%s“ PIN"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Otkaži"
 
@@ -396,92 +485,92 @@ msgstr "_Druga lozinka:"
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Pritisnite da se povežete"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Novo…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ništa"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "VEP 40/128-bitni ključ (Heks ili ASKRI)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "VEP 128-bitna lozinka"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamički VEP (802.1h)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "Lični VPA & VPA2"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "Poslovni VPA & VPA2"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Lični VPA & VPA2"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Napravi"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Poveži"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, 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/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Potrebno je potvrđivanje identiteta za bežičnu mrežu"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Bežična mreža zahteva potvrđivanje identiteta"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Napravi novu bežičnu mrežu"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nova bežična mreža"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Unesite naziv za novu bežičnu mrežu."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Poveži se na skrivenu bežičnu mrežu"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Skrivena bežična mreža"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -489,319 +578,269 @@ msgstr ""
 "Unesite naziv i bezbednosne podatke za skrivenu bežičnu mrežu na koju želite "
 "da se povežete."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Bežična _bezbednost:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Ime mreže:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "_Veza:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Bežični _uređaj:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s veza"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM uverenja (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-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:351
-msgid "no CA certificate selected"
-msgstr "Nije izabrano uverenje"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "izabrana datoteka uverenja ne postoji"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "nedostaje EAP-FAST PAC datoteka"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Izaberi PAC datoteku"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC datoteke (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Potvrđenim identitetom"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Oba"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Anonimni _identitet:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC _datoteka:"
 
 # ~Miloš
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_Unutrašnja prijava:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Dozvoli samostalno PAC _rezervisanje"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "nedostaje EAP-LEAP korisničko ime"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "nedostaje EAP-LEAP lozinka"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Korisničko ime:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Lozinka:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Samostalno"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Izdanje 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Izdanje 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Nije potrebno _uverenje"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP _izdanje:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Sufiks naziva uverenja servera."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 #, fuzzy
 msgid "_Domain"
 msgstr "_Domen:"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "nedostaje EAP korisničko ime"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "nedostaje EAP lozinka"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "VEP 128-bitna lozinka"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Prikaži _lozinke"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "nedostaje EAP-TLS identitet"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "nije izabrano korisničko uverenje"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "izabrana datoteka korisničkog uverenja ne postoji"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "nije izabran ključ"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "izabrana datoteka ključa ne postoji"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "_Identitet:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP-a)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Nepoznata greška proveravanja 802.1X bezbednosti"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "nepoznata greška u 802.1X bezbednosti (vpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "Nije izabrano uverenje"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "izabrana datoteka uverenja ne postoji"
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "LZNK"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "TLS kroz tunel"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Zaštićeni EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Po_tvrđivanje identiteta:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "nedostaje leap korisničko ime"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "nedostaje leap lozinka"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "nedostaje EAP lozinka"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Vrsta:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "nedostaje vep ključ"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -810,41 +849,41 @@ msgstr ""
 "neispravan vep ključ: pogrešna dužina ključa %zu. Ključ mora biti ili dužine "
 "5/13 (askri) ili 10/26 (heks)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "neispravan vep-ključ: lozinka ne sme biti prazna"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "neispravan vep-ključ: lozinka mora biti kraća od 64 znaka"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Otvoreni sistem"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Deljeni ključ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Osnovno)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Ključ:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "P_rikaži ključ"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "VEP _indeks:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -853,103 +892,59 @@ 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "neispravna vpa lozinka: ne mogu da rastumačim ključ od 64 bajta kao "
 "heksadecimalni"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Upravljajte vašim vezama mreže"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Sirovo podešavanje"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Upravljajte i izmenite podešavanja vaših mrežnih veza"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Isključivanje obaveštenja o povezivanju"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Uključite ovu opciju da isključite obaveštenja kada se povezujete na "
-#~ "mrežu."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Isključivanje obaveštenja o prekidu veze"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Uključite ovu opciju da isključite obaveštenja kada prekidate vezu sa "
-#~ "mrežom."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Isključivanje VPN obaveštenja"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Uključite ovu opciju da isključite obaveštenja kada se povezujete na VPN "
-#~ "ili kada prekidate vezu sa njim."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Isključi obaveštavanja o dostupnim mrežama"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Nepoznata greška proveravanja 802.1X bezbednosti"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Uključite ovu opciju da isključite obaveštenja o dostupnosti bežičnih "
-#~ "mreža."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s veza"
 
-#~ msgid "Stamp"
-#~ msgstr "Pečat"
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM uverenja (*.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "Ovo određuje da li treba prevesti podešavanja na novo izdanje."
+#: src/utils/utils.c:547
+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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Onemogući obrazovanje bežične mreže"
+msgid "Wi-Fi _security"
+msgstr "Bežična _bezbednost:"
 
-#~ 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."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_Ime mreže:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Prikazuje programče u oblasti obaveštenja"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "_Veza:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Poništite izbor da isključite prikazivanje programčeta u oblasti "
-#~ "obaveštenja."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Bežični _uređaj:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Zanemaruje CA uverenje"
+#~ msgid "Manage your network connections"
+#~ msgstr "Upravljajte vašim vezama mreže"
 
-#~ 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."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Sirovo podešavanje"
 
-#~ 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."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Upravljajte i izmenite podešavanja vaših mrežnih veza"
 
 #~ msgid "NetworkManager"
 #~ msgstr "Upravnik mreže"
diff --git a/po/sv.po b/po/sv.po
index bf7d4289..6f24b15b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManagerApplet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2018-10-20 23:01+0200\n"
 "Last-Translator: Josef Andersson <l10nl18nsweja gmail com>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
@@ -22,6 +22,102 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Inaktivera anslutningsaviseringar"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Sätt till true (sant) för att inaktivera aviseringar vid anslutning till ett "
+"nätverk."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Inaktivera aviseringar om frånkopplingar"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Sätt till true (sant) för att inaktivera aviseringar när du kopplar från ett "
+"nätverk."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Inaktivera VPN-aviseringar"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Sätt till true (sant) för att inaktivera aviseringar när du ansluter till "
+"eller kopplar från ett VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Visa inte aviseringar om tillgängliga nätverk"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Sätt till true (sant) för att inaktivera aviseringar när trådlösa nätverk är "
+"tillgängliga."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Stämpel"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Används för att fastställa huruvida inställningar ska migreras till en ny "
+"version."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Inaktivera skapande av trådlöst nätverk"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Sätt till true (sant) för att inaktivera skapandet av adhoc-nätverk när du "
+"använder miniprogrammet."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Visa miniprogrammet i aviseringsytan"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Sätt till FALSE (falskt) för att inaktivera visning av miniprogrammet i "
+"aviseringsytan."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Ignorera CA-certifikat"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Sätt till true (sant) för att inaktivera varningar om CA-certifikat i EAP-"
+"autentisering."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Sätt till true (sant) för att inaktivera varningar om CA-certifikat i fas 2 "
+"av EAP-autentisering."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -75,43 +171,72 @@ msgstr "Lösenord:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Ingen)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Nyckel i %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certifikat i %s"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Okänd)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Välj"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Välj från fil…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Inget certifikat angivet"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Ingen nyckel angiven"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Välj en nyckel för %s-certifikat"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "Privat _nyckel för %s"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "Nyckel_lösenord för %s"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Välj %s-certifikat"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "%s-_certifikat"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Vi_sa lösenord"
 
@@ -123,35 +248,35 @@ msgstr "Standard"
 msgid "My country is not listed"
 msgstr "Mitt land är inte listat"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Inte listad"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Min betalningstyp är inte listad…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Leverantör"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Installerad GSM-enhet"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Installerad CDMA-enhet"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Valfri enhet"
 
@@ -282,50 +407,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Bekräfta inställningar för mobilt bredband"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Ingen)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "Nyckel i %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "Certifikat i %s"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Okänd)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Välj"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Välj från fil…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "Välj ett %s-certifikat"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "%s-certifikats_lösenord"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Visa _lösenord"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Fel vid inloggning: "
@@ -346,13 +427,27 @@ msgstr "Namn"
 msgid "Issued By"
 msgstr "Utfärdat av"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Välj ett %s-certifikat"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s-certifikats_lösenord"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Visa _lösenord"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Ange %s-PIN"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -400,57 +495,57 @@ msgstr "_Sekundärt lösenord:"
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Klicka för att ansluta"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Ny…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ingen"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitars nyckel (Hexadecimal eller ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bitars lösenfras"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisk WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA och WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA och WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA och WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "S_kapa"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_Anslut"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -458,35 +553,35 @@ msgstr ""
 "Lösenord eller krypteringsnycklar krävs för att komma åt det trådlösa "
 "nätverket ”%s”."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentisering krävs för det trådlösa nätverket"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentisering krävs för det trådlösa nätverket"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Skapa nytt trådlöst nätverk"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Nytt trådlöst nätverk"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Anslut till dolt trådlöst nätverk"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Dolt trådlöst nätverk"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -494,298 +589,252 @@ msgstr ""
 "Ange namn och säkerhetsuppgifter för det dolda trådlösa nätverket som du "
 "vill ansluta till."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Trådlös _säkerhet"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Nätverksnamn"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "Ans_lutning"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "Trådlös _adapter"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s-anslutning"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM-certifikat (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-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:351
-msgid "no CA certificate selected"
-msgstr "inget CA-certifikat valt"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "vald CA-certifikatfil existerar inte"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "saknar PAC-fil för EAP-FAST"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Välj en PAC-fil"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Alla filer"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Autentiserad"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Båda"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Anony_m identitet"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "PAC-_fil"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "_Inre autentisering"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillåt automatisk PAC-pro_visionering"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "saknar EAP-LEAP-användarnamn"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "saknar EAP-LEAP-lösenord"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "An_vändarnamn"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "_Lösenord"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Version 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Version 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Inget CA-certifikat k_rävs"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "PEAP-_version"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Suffix på servercertifikatets namn."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Domän"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "saknar EAP-användarnamn"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "saknar EAP-lösenord"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bitars lösenfras"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Visa _lösenord"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "saknar EAP-TLS-identitet"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "inget användarcertifikat valt"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "vald användarcertifikatfil existerar inte"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "ingen nyckel vald"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "vald nyckelfil existerar inte"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "I_dentitet"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (ingen EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "Okänt fel vid validering av 802.1X-säkerhet"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "odefinierat fel i 802.1X-säkerhet (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "inget CA-certifikat valt"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "vald CA-certifikatfil existerar inte"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunnlad TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "Au_tentisering"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "saknar leap-användarnamn"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "saknar leap-lösenord"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "saknar EAP-lösenord"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Typ"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "saknar wep-nyckel"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -793,7 +842,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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -802,39 +851,39 @@ msgstr ""
 "ogiltig wep-nyckel: felaktig nyckellängd %zu. En nyckel måste ha antingen "
 "längden 5/13 (ascii) eller 10/26 (hex)"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 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:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "ogiltig wep-nyckel: lösenfras måste vara kortare än 64 tecken"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Öppet system"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Delad nyckel"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Standard)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Nyckel"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Vis_a nyckel"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP-inde_x"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -843,103 +892,53 @@ 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 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"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Hantera dina nätverksanslutningar"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Råkonfiguration"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Hantera och ändra inställningar för dina nätverksanslutningar"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Inaktivera anslutningsaviseringar"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Sätt till true (sant) för att inaktivera aviseringar vid anslutning till "
-#~ "ett nätverk."
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "Okänt fel vid validering av 802.1X-säkerhet"
 
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Inaktivera aviseringar om frånkopplingar"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s-anslutning"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Sätt till true (sant) för att inaktivera aviseringar när du kopplar från "
-#~ "ett nätverk."
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM-certifikat (*.pem, *.crt, *.cer)"
 
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Inaktivera VPN-aviseringar"
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, eller PKCS#12 privata nycklar (*.der, *.pem, *.p12, *.key)"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Sätt till true (sant) för att inaktivera aviseringar när du ansluter till "
-#~ "eller kopplar från ett VPN."
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Trådlös _säkerhet"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Visa inte aviseringar om tillgängliga nätverk"
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Nätverksnamn"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Sätt till true (sant) för att inaktivera aviseringar när trådlösa nätverk "
-#~ "är tillgängliga."
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "Ans_lutning"
 
-#~ msgid "Stamp"
-#~ msgstr "Stämpel"
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Trådlös _adapter"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Används för att fastställa huruvida inställningar ska migreras till en ny "
-#~ "version."
+#~ msgid "Manage your network connections"
+#~ msgstr "Hantera dina nätverksanslutningar"
 
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Inaktivera skapande av trådlöst nätverk"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Sätt till true (sant) för att inaktivera skapandet av adhoc-nätverk när "
-#~ "du använder miniprogrammet."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Visa miniprogrammet i aviseringsytan"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Sätt till FALSE (falskt) för att inaktivera visning av miniprogrammet i "
-#~ "aviseringsytan."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ignorera CA-certifikat"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Sätt till true (sant) för att inaktivera varningar om CA-certifikat i EAP-"
-#~ "autentisering."
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Råkonfiguration"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "Sätt till true (sant) för att inaktivera varningar om CA-certifikat i fas "
-#~ "2 av EAP-autentisering."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Hantera och ändra inställningar för dina nätverksanslutningar"
 
 #~ msgid "NetworkManager"
 #~ msgstr "Nätverkshanteraren"
diff --git a/po/ta.po b/po/ta.po
index 843867ff..0d140114 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: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2012-02-27 13:19+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3 gmail com>\n"
 "Language-Team: American English <kde-i18n-doc kde org>\n"
@@ -29,6 +29,103 @@ msgstr ""
 "\n"
 "X-Generator: Lokalize 1.1\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "செயல்படுத்தாத இணைக்கப்பட்ட அறிவிப்புகள்"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Set this to TRUE to disable notifications when connecting to a network."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "செயல்படுத்தாத இணைக்கப்படாத அறிவிப்புகள்"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Set this to TRUE to disable notifications when disconnecting from a network."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "செயல்படுத்தாத இணைக்கப்பட்ட அறிவிப்புகள்"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Set this to TRUE to disable notifications when disconnecting from a network."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "கிடைக்கக்கூடிய அறிவிப்புகளின் பிணையத்தை குறைக்கிறது"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Set this to TRUE to disable notifications when wireless networks are "
+"available."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "முத்திரை"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Used to determine whether settings should be migrated to a new version."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "செயல்நீக்க Wi-Fiஐ உருவாக்கு"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"அப்லெட்டைப் பயன்படுத்தும் போது சரி என்பதற்கு செயல்நீக்க உருவாக்கமான  adhoc பிணையங்களை "
+"அமைக்கவும்."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "CA சான்றிதழை தேர்ந்தெடுக்கவும்"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Set this to TRUE to disable notifications when connecting to a network."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Set this to TRUE to disable notifications when connecting to a network."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -75,44 +172,77 @@ msgstr "கடவுச்சொல்:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ஒன்றுமில்லை)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A சான்றிதழ்:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "தெரியாத"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "ஒரு கோப்பினை தேர்ந்தெடு"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "ஒரு கோப்பினை தேர்ந்தெடு"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "தனிப்பட்ட விசை ( _k):"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "தனிப்பட்ட விசை கடவுச்சொல் (_P):"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "பயனர் சான்றிதழ் (_U):"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "கடவுச்சொல்லைக் காட்டு (_w)"
 
@@ -124,36 +254,36 @@ msgstr "முன்னிருப்பு"
 msgid "My country is not listed"
 msgstr "எனது நாடு பட்டியலிடப்படவில்லை"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "ஜிஎஸ்எம்(GSM)"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "பட்டியலிடப்படாத"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "எனது திட்டம் பட்டியலிடப்படவில்லை..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "வழங்குபவர்"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "GSM சாதனம் நிறுவப்பட்டது"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "CDMA சாதனம் நிறுவபட்டது"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "ஏதாவது சாதனம்"
 
@@ -289,54 +419,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "மொபைல் பிராட்பேண்டு அமைவுகளை உறுதி செய்யவும்"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(ஒன்றுமில்லை)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "C_A சான்றிதழ்:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "தெரியாத"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-#, fuzzy
-msgid "Select"
-msgstr "ஒரு கோப்பினை தேர்ந்தெடு"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-#, fuzzy
-msgid "Select from file…"
-msgstr "ஒரு கோப்பினை தேர்ந்தெடு"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "பயனர் சான்றிதழ் (_U):"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "கடவுச்சொற்களைக் காட்டு (_w)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -359,13 +441,27 @@ msgstr "பெயர்"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "பயனர் சான்றிதழ் (_U):"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "கடவுச்சொற்களைக் காட்டு (_w)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -418,59 +514,59 @@ msgstr "கடவுச்சொல் (_P):"
 msgid "_Password:"
 msgstr "கடவுச்சொல் (_P):"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "துண்டி"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ஒன்றுமில்லை"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-பிட் விசை (ஹெக்ஸ் அல்லது ஆஸ்கி)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-பிட் கடவுச்சொல்"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "மாறும் WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 தனிப்பட்ட"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 கடவுச்சொல்"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 தனிப்பட்ட"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "உருவாக்கு (_r)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "இணை (_o)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -478,42 +574,42 @@ msgstr ""
 "கடவுச்சொல் அல்லது மறைகுறியாக்க விசைகள் ஒயர்லெஸ் பிணைய '%s'ஐ அணுகுவதற்கு "
 "தேவைப்படுகிறது."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ஒயர்லெஸ் பிணைய அங்கீகாரம் தேவைப்படுகிறது"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "அங்கீகார ஒயர்லெஸ் பிணையம் தேவைப்படுகிறது"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "புதிய ஒர்லெஸ் பிணையத்தை உருவாக்கவும்"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "புதிய ஒயர்லெஸ் பிணையம்"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ஒயர்லெஸ் பிணையத்தை உருவாக்க ஒரு பெயரை உள்ளிடவும்."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "மறைக்கப்பட்ட ஒயர்லெஸ் பிணையத்தை இணைக்கவும்"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "மறைக்கட்ட ஒழர்லெஸ் பிணையம்"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -522,447 +618,369 @@ msgstr ""
 "நீங்கள் இணைக்க விரும்பினால் மறைக்கப்பட்ட ஒயர்லெஸ் பிணையத்திற்கு பெயர் மற்றும்பாதுகாப்பு "
 "விவரங்களை உள்ளிடவும்."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "ஒயர்லெஸ் பாதுகாப்பு (_W):"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "பிணைய பெயர் (_N):"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "இணைப்பு (_n):"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "ஒயர்லெஸ் அடாப்படர் (_a):"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "அடிப்படை இணைப்பு:"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER அல்லது PEM சான்றிதழ்கள் (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ஒரு PAC கோப்பினை தேர்ந்தெடுக்கவும்..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC கோப்புகள் (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "எல்லா கோப்புகள்"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "பெயரில்லாத அடையாளம்"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "அங்கீகரித்த"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "இரண்டும்"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "பெயரில்லாத அடையாளம் (_m):"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC _ கோப்பு:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "_I உள் அங்கீகாரம்:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_v தானியங்கி PAC  ஏற்பாடு"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "பயனர் பெயர் (_U) "
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "கடவுச்சொல் (_P):"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "தானாக"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "பதிப்பு 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "பதிப்பு 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "_v PEAP பதிப்பு:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-பிட் கடவுச்சொல்"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "கடவுச்சொற்களைக் காட்டு (_w)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "அடையாளம்(_d):"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "பாதுகாக்கப்பட்ட EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "தெரியாத"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_t அங்கீகாரம்:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "தனிப்பட்ட விசை கடவுச்சொல் (_P):"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "வகை (_T):"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "திறந்த கணினி"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "பகிரப்பட்ட விசை"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (முன்னிருப்பு)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "விசை (_K):"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "விசையை காட்டு (_w)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP அட்டவணை (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "உங்களது பிணையத்தின் இணைப்புகளை மேலாண்மை செய்க"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "செயலிலுள்ள பிணைய இணைப்புகள்"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "உங்களின் பிணைய இணைப்பு அமைவுகளை மேலாண்மை மற்றும் மாற்றவும்"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "செயல்படுத்தாத இணைக்கப்பட்ட அறிவிப்புகள்"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "அடிப்படை இணைப்பு:"
 
+#: src/utils/utils.c:535
 #, 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."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "செயல்படுத்தாத இணைக்கப்படாத அறிவிப்புகள்"
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER அல்லது PEM சான்றிதழ்கள் (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, 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."
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, or PKCS#12 தனிப்பட்ட விசைகள் (*.der, *.pem, *.p12)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "செயல்படுத்தாத இணைக்கப்பட்ட அறிவிப்புகள்"
+msgid "Wi-Fi _security"
+msgstr "ஒயர்லெஸ் பாதுகாப்பு (_W):"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ 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 disconnecting from a "
-#~ "network."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "கிடைக்கக்கூடிய அறிவிப்புகளின் பிணையத்தை குறைக்கிறது"
+msgid "_Network name"
+msgstr "பிணைய பெயர் (_N):"
 
+#: src/wifi.ui:154
 #, 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."
-
-#~ msgid "Stamp"
-#~ msgstr "முத்திரை"
-
-#~ 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."
+msgid "C_onnection"
+msgstr "இணைப்பு (_n):"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "செயல்நீக்க Wi-Fiஐ உருவாக்கு"
+msgid "Wi-Fi _adapter"
+msgstr "ஒயர்லெஸ் அடாப்படர் (_a):"
 
-#, fuzzy
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "அப்லெட்டைப் பயன்படுத்தும் போது சரி என்பதற்கு செயல்நீக்க உருவாக்கமான  adhoc பிணையங்களை "
-#~ "அமைக்கவும்."
+#~ msgid "Manage your network connections"
+#~ msgstr "உங்களது பிணையத்தின் இணைப்புகளை மேலாண்மை செய்க"
 
 #, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA சான்றிதழை தேர்ந்தெடுக்கவும்"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "செயலிலுள்ள பிணைய இணைப்புகள்"
+
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "உங்களின் பிணைய இணைப்பு அமைவுகளை மேலாண்மை மற்றும் மாற்றவும்"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/te.po b/po/te.po
index c899ecb2..b57ce919 100644
--- a/po/te.po
+++ b/po/te.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: te\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2012-06-27 15:21+0530\n"
 "Last-Translator: Sasi Bhushan Boddepalli <sasi swecha net>\n"
 "Language-Team: Telugu <indlinux-telugu lists sourceforge net>\n"
@@ -24,6 +24,90 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "అనుసంధానము నోటీసులను అచేతనముచేయుము"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"నెట్వర్కునకు అనుసంధానమవుచున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా అమర్చండి. "
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "అననుసంధానపు నోటీసులను అచేతనముచేయుము"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"నెట్వర్కునుండి అననుసంధానము అవుచున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా అమర్చుము. "
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "VPN ప్రకటనలను డిసేబుల్ చెయ్యి "
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"VPN నుండి అననుసంధానము అవుచున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా అమర్చుము. "
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "నెట్వర్కులు అందుబాటులోవున్నాయి నోటీసు అణిచివేయుము"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"వైర్‌లెస్ నెట్వర్కులు అందుబాటులో వున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా అమర్చండి. "
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "స్టాంప్"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "అమరికలు కొత్త వర్షన్‌కు మైగ్రేట్ కావాలా అనేది నిర్ణయించుటకు వుపయోగించబడుతుంది."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Wi-Fi సృష్టించుట అచేతనము చేయుము"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"అప్లెట్‌ను వుపయోగించునప్పుడు తాత్కాలిక  నెట్వర్కుల సృష్టీకరణను అచేతనము చేయుటకు TRUE వుంచండి."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA ధృవీకరణపత్రమును విస్మరించు "
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "EAP ప్రమాణీకరణ లో CA సర్టిఫికేట్ల గురించి హెచ్చరికలు డిసేబుల్ నిజమైతే  ఇది  సెట్ చెయ్యండి."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "EAP ప్రామాణిక దశ 2 లో CA సర్టిఫికేట్ల గురించి హెచ్చరికలు డిసేబుల్ నిజమైతే సెట్ చెయ్యండి."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -70,44 +154,75 @@ msgstr "సంకేతపదము:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ఏదీకాదు)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A ధృవీకరణపత్రము:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "తెలియదు"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r):"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "వ్యక్తిగత కీ (_k):"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "వ్యక్తిగత కీ సంకేతపదము (_P):"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "వినియోగదారి దృవీకరణపత్రము (_U):"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "సంకేతపదమును చూపుము (_w)"
 
@@ -119,36 +234,36 @@ msgstr "అప్రమేయ"
 msgid "My country is not listed"
 msgstr "నా దేశము జాబితాచేసి లేదు"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "జాబితాచేయని"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "నా ప్లాను జాబితాచేసి లేదు..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "ఉత్పాదకుడు"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "సంస్థాపించిన GSM పరికరము"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "సంస్థాపించిన CDMA పరికరము"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "ఏ పరికరమైనా"
 
@@ -281,52 +396,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ అమరికలను నిర్ధారించుము"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(ఏదీకాదు)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "C_A ధృవీకరణపత్రము:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "తెలియదు"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "వినియోగదారి దృవీకరణపత్రము (_U):"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "సంకేతపదములను చూపుము (_w)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -349,13 +418,27 @@ msgstr "పేరు"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "వినియోగదారి దృవీకరణపత్రము (_U):"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "సంకేతపదములను చూపుము (_w)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -408,100 +491,100 @@ msgstr "సంకేతపదము (_P):"
 msgid "_Password:"
 msgstr "సంకేతపదము (_P):"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "అననుసంధానించుము"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ఏదీకాదు"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Key (Hex లేదా ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit సంకేతపదము"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "గతిక(డైనమిక్) WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 వ్యక్తిగత"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ఎంటర్‌ప్రైజ్"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 వ్యక్తిగత"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "సృష్టించుము (_r)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "అనుసంధానించు (_o)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "వైరులేని నెట్వర్కు '%s'ను యాక్సిస్ చేసుకొనుటకు సంకేతపదములు లేదా ఎన్క్రిప్షన్ కీలు అవసరము."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "వైరులేని నెట్వర్కు ధృవీకరణము అవసరమైంది"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "వైరులేని నెట్వర్కుద్వారా ధృవీకరణము అవసరమైంది"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "కొత్త వైరులేని నెట్వర్కు సృష్టించుము"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "కొత్త వైరులేని నెట్వర్కు"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "మీరు సృష్టించాలని అనుకొనుచున్న వైరులేని నెట్వర్కునకు వొక నామమును ప్రవేశపెట్టుము."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "మరుగునవున్న వైరులేని నెట్వర్కునకు అనుసంధానించు"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "మరుగునవున్న వైరులేని నెట్వర్కు"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -510,448 +593,369 @@ msgstr ""
 "మీరు అనుసంధానం కావాలనుకొన్న మరుగునవుండు వైరులేని నెట్వర్కుయొక్క రక్షణ వివరములను మరియు నామమును "
 "ప్రవేశపెట్టుము."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "వైర్‌లెస్ రక్షణ (_W):"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "నెట్వర్కు పేరు (_N):"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "అనుసంధానము (_n):"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "వైర్‌లెస్ ఎడాప్టర్ (_a):"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "పీఠము అనుసంధానము :"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER లేదా PEM ధృవీకరణపత్రములు (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r):"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ఒక PAC దస్త్రమును ఎంచుకొనుము"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ఫైళ్ళు (*.PAC)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "అన్ని ఫైళ్ళు"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr " గుర్తింపులేని"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "ధృవీకరణ "
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "రెండింటినీ"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "పేరులేను గుర్తింపు (_m):"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC ఫైలు (_f):"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "లోపలి దృవీకరణము (_I):"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "PAC అవకాశాన్ని స్వయంచాలకంగా అనుమతించు(_v)"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "వాడుకరిపేరు (_U):"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "సంకేతపదము (_P):"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "స్వయంచాలకంగా"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "ముద్రణ 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "ముద్రణ 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r)"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP వర్షన్(_v):"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit సంకేతపదము"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "సంకేతపదములను చూపుము (_w)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r):"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "గుర్తింపు (_d):"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r):"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "టన్నెల్డ్ TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "సురక్షిత EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "తెలియదు"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "ధృవీకరణ (_t):"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "వ్యక్తిగత కీ సంకేతపదము (_P):"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "రకము (_T):"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "తెరిచిన సిస్టమ్"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "భాగస్వామ్య కీ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (అప్రమేయ)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "కీ (_K):"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "కీను చూపుము (_w)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP విషయసూచిక (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "మీ నెట్వర్కు అనుసంధానములను నిర్వహించు"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "క్రియాశీల నెట్వర్కు అనుసంధానములు"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "మీ నెట్వర్కు అనుసంధానము అమర్పులను నిర్వహించండి మరియు మార్చండి"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "అనుసంధానము నోటీసులను అచేతనముచేయుము"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "నెట్వర్కునకు అనుసంధానమవుచున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా అమర్చండి. "
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "అననుసంధానపు నోటీసులను అచేతనముచేయుము"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "నెట్వర్కునుండి అననుసంధానము అవుచున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా "
-#~ "అమర్చుము. "
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "VPN ప్రకటనలను డిసేబుల్ చెయ్యి "
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "VPN నుండి అననుసంధానము అవుచున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా "
-#~ "అమర్చుము. "
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "పీఠము అనుసంధానము :"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "నెట్వర్కులు అందుబాటులోవున్నాయి నోటీసు అణిచివేయుము"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER లేదా PEM ధృవీకరణపత్రములు (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "వైర్‌లెస్ నెట్వర్కులు అందుబాటులో వున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా అమర్చండి. "
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, లేదా PKCS#12 వ్యక్తిగత కీలు (*.der, *.pem, *.p12)"
 
-#~ msgid "Stamp"
-#~ msgstr "స్టాంప్"
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "వైర్‌లెస్ రక్షణ (_W):"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "అమరికలు కొత్త వర్షన్‌కు మైగ్రేట్ కావాలా అనేది నిర్ణయించుటకు వుపయోగించబడుతుంది."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "నెట్వర్కు పేరు (_N):"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wi-Fi సృష్టించుట అచేతనము చేయుము"
+msgid "C_onnection"
+msgstr "అనుసంధానము (_n):"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "అప్లెట్‌ను వుపయోగించునప్పుడు తాత్కాలిక  నెట్వర్కుల సృష్టీకరణను అచేతనము చేయుటకు TRUE వుంచండి."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "వైర్‌లెస్ ఎడాప్టర్ (_a):"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA ధృవీకరణపత్రమును విస్మరించు "
+#~ msgid "Manage your network connections"
+#~ msgstr "మీ నెట్వర్కు అనుసంధానములను నిర్వహించు"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr "EAP ప్రమాణీకరణ లో CA సర్టిఫికేట్ల గురించి హెచ్చరికలు డిసేబుల్ నిజమైతే  ఇది  సెట్ చెయ్యండి."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "క్రియాశీల నెట్వర్కు అనుసంధానములు"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr "EAP ప్రామాణిక దశ 2 లో CA సర్టిఫికేట్ల గురించి హెచ్చరికలు డిసేబుల్ నిజమైతే సెట్ చెయ్యండి."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "మీ నెట్వర్కు అనుసంధానము అమర్పులను నిర్వహించండి మరియు మార్చండి"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/tg.po b/po/tg.po
index ccea94f6..6bfd1663 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet nma-0-9-8\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2014-02-07 17:37+0500\n"
 "Last-Translator: Victor Ibragimov <victor ibragimov gmail com>\n"
 "Language-Team: Tajik <tg li org>\n"
@@ -18,6 +18,104 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.3\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+#, fuzzy
+msgid "Disable connected notifications"
+msgstr "Ягон огоҳӣ нест"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "Ба шабака пайваст шуда истодааст..."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+#, fuzzy
+msgid "Disable disconnected notifications"
+msgstr "Қатъшуда"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Қимати \"true\" гузоред, вақте ки корбари устоди танзимро аввалин бор иҷро "
+"мекунад."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Ягон огоҳӣ нест"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "Ба шабакаи VPN пайваст шуда истодааст..."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+#, fuzzy
+msgid "Suppress networks available notifications"
+msgstr "Ҷустуҷӯи шабакаҳои бесими дастрас"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "Шабакаҳои Wi-Fi-и дастрас"
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Тамға"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+#, fuzzy
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Оё \"window-placement\" бояд барои муайян кардани ҷойгиршавии мӯҳтавоҳо "
+"нисбати наворҳои ҳаракат истиофда шавад ё не."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Ғайрифаъол кардан"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Қимати \"true\" гузоред, вақте ки корбари устоди танзимро аввалин бор иҷро "
+"мекунад."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Намоиш додани зербарнома дар ноҳияи огоҳӣ"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+#, fuzzy
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "Намоиш додани зербарнома дар ноҳияи огоҳӣ"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Ягон гувоҳиномаи CA _лозим нест"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "Огоҳиҳо"
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "Огоҳиҳо"
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -64,44 +162,75 @@ msgstr "Парол:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ҳеҷ)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Гувоҳиномаи C_A:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Номаълум"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Ягон гувоҳиномаи CA _лозим нест"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Интихоби гувоҳиномаи CA"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Калиди _шахсӣ:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_Пароли калиди шахсӣ:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Интихоби гувоҳиномаи CA"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_Гувоҳиномаи корбарӣ:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "На_моиш додани парол"
 
@@ -114,38 +243,38 @@ msgstr "Пешфарз"
 msgid "My country is not listed"
 msgstr "Вуҷуд надора?"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Бе рӯйхат"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Нақша"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Провайдер"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 #, fuzzy
 msgid "Installed GSM device"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 #, fuzzy
 msgid "Installed CDMA device"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Ҳар дастгоҳ"
 
@@ -288,52 +417,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Танзимоти паҳннавори мобилӣ"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(ҳеҷ)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Гувоҳиномаи C_A:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Номаълум"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Интихоби гувоҳиномаи CA"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_Гувоҳиномаи корбарӣ:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Намоиш додани _паролҳо"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -356,13 +439,27 @@ msgstr "Ном"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Интихоби гувоҳиномаи CA"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Гувоҳиномаи корбарӣ:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Намоиш додани _паролҳо"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -417,60 +514,60 @@ msgstr "_Пароли иловагӣ:"
 msgid "_Password:"
 msgstr "_Парол:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Қатъ кардани пайваст"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ҳеҷ"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Калиди WEP 40/128-бит (Hex ё ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Гузарвожаи WEP 128-бит"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP-и серҳаракат (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2-и Шахсӣ"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2-и Тиҷорӣ"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2-и Шахсӣ"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Эҷод кардан"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 #, fuzzy
 msgid "C_onnect"
 msgstr "Пайваст шудааст"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -478,513 +575,415 @@ msgstr ""
 "Барои пайдо кардани дастрасӣ ба шабакаи бесими \"%s\" паролҳо ё калидҳои "
 "рамзгузорӣ лозиманд."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Санҷиши ҳаққонияти шабакавии Wi-Fi лозим аст"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Санҷиши ҳаққонияти шабакавии Wi-Fi лозим аст"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Эҷод кардани шабакаи Wi-Fi-и нав"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Шабакаи Wi-Fi-и нав"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "_Эҷод кардани шабакаи Wi-Fi-и нав..."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Шабакаи Wi-Fi-и ноаён"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Амнияти Wi-Fi:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Номи шабака:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "_Пайвастшавӣ:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "_Адаптери Wi-Fi:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Пайвасти %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Гувоҳиномаҳои DER ё PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Ягон гувоҳиномаи CA _лозим нест"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Интихоби файли PAC..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Файлҳои PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Ҳамаи файлҳо"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Ношинос"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Ҳаққоният санҷида шуд"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Ҳар ду"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "_Шахсияти номаълум:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "_Файли PAC:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Санҷиши _ҳаққонияти дохилӣ"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 #, fuzzy
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Таъминоти PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Номи корбар:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Парол:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 #, fuzzy
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Худкор"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Версияи 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Версияи 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Ягон гувоҳиномаи CA _лозим нест"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "_Версияи PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Гузарвожаи WEP 128-бит"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "На_моиш додани паролҳо"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ягон гувоҳиномаи CA _лозим нест"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "Ш_ахсият"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Ягон гувоҳиномаи CA _лозим нест"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "ТЕЗ"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 #, fuzzy
 msgid "Tunneled TLS"
 msgstr "TLS-и нақбӣ"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP-и муҳофизатшуда (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Номаълум"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_Санҷиши ҳаққоният:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "_Пароли калиди шахсӣ:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Навъ:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 #, fuzzy
 msgid "Open System"
 msgstr "Системаи кушод"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Калиди мубодилашуда"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Пешфарз)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Калид:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Намоиш _додани калид"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "_Индекси WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Manage your network connections"
-#~ msgstr "Пайвастҳои шабакавӣ"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Пайвастҳои шабакавии фаъол"
-
-#, fuzzy
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr ""
-#~ "Пайвасти шабакаи дастрас вуҷуд надорад.\n"
-#~ "Лутфан танзимоти пайвасти худро санҷида дубора кӯшиш намоед."
-
-#, fuzzy
-#~ msgid "Disable connected notifications"
-#~ msgstr "Ягон огоҳӣ нест"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "Ба шабака пайваст шуда истодааст..."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Пайвасти %s"
 
+#: src/utils/utils.c:535
 #, fuzzy
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Қатъшуда"
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Гувоҳиномаҳои DER ё PEM (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Қимати \"true\" гузоред, вақте ки корбари устоди танзимро аввалин бор "
-#~ "иҷро мекунад."
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "Калидҳои шахсии DER, PEM, ё PKCS#12 (*.der, *.pem, *.p12)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Ягон огоҳӣ нест"
+msgid "Wi-Fi _security"
+msgstr "_Амнияти Wi-Fi:"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr "Ба шабакаи VPN пайваст шуда истодааст..."
+msgid "_Network name"
+msgstr "_Номи шабака:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Ҷустуҷӯи шабакаҳои бесими дастрас"
+msgid "C_onnection"
+msgstr "_Пайвастшавӣ:"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "Шабакаҳои Wi-Fi-и дастрас"
-
-#~ msgid "Stamp"
-#~ msgstr "Тамға"
+msgid "Wi-Fi _adapter"
+msgstr "_Адаптери Wi-Fi:"
 
 #, fuzzy
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Оё \"window-placement\" бояд барои муайян кардани ҷойгиршавии мӯҳтавоҳо "
-#~ "нисбати наворҳои ҳаракат истиофда шавад ё не."
+#~ msgid "Manage your network connections"
+#~ msgstr "Пайвастҳои шабакавӣ"
 
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Ғайрифаъол кардан"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Пайвастҳои шабакавии фаъол"
 
 #, fuzzy
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
+#~ msgid "Manage and change your network connection settings"
 #~ msgstr ""
-#~ "Қимати \"true\" гузоред, вақте ки корбари устоди танзимро аввалин бор "
-#~ "иҷро мекунад."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Намоиш додани зербарнома дар ноҳияи огоҳӣ"
-
-#, fuzzy
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr "Намоиш додани зербарнома дар ноҳияи огоҳӣ"
-
-#, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Ягон гувоҳиномаи CA _лозим нест"
-
-#, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr "Огоҳиҳо"
-
-#, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr "Огоҳиҳо"
+#~ "Пайвасти шабакаи дастрас вуҷуд надорад.\n"
+#~ "Лутфан танзимоти пайвасти худро санҷида дубора кӯшиш намоед."
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/th.po b/po/th.po
index 7d94b39e..956107fb 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2012-09-12 15:27+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
@@ -19,6 +19,87 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "ปิดการแจ้งเหตุการเชื่อมต่อ"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการแจ้งเหตุเมื่อมีการเชื่อมต่อเครือข่าย"
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "ปิดการแจ้งเหตุการตัดการเชื่อมต่อ"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการแจ้งเหตุเมื่อมีการตัดการเชื่อมต่อเครือข่าย"
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "ปิดการแจ้งเหตุการเชื่อมต่อ VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"กำหนดเป็นค่าจริงถ้าต้องการปิดการแจ้งเหตุเมื่อมีการเชื่อมต่อหรือตัดการเชื่อมต่อกับเครือข่าย VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "ปิดการแจ้งเหตุเมื่อมีเครือข่ายให้เชื่อมต่อ"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการแจ้งเหตุเมื่อพบเครือข่ายไร้สายที่เชื่อมต่อได้"
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "ประทับตรา"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "ใช้ในการกำหนดว่าควรแปลงค่าตั้งไปเป็นรุ่นใหม่หรือไม่"
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "ปิดการสร้าง Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการสร้างเครือข่ายเฉพาะกิจขณะใช้แอพเพล็ต"
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "ปิดคำเตือนใบรับรอง CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดคำเตือนเกี่ยวกับใบรับรอง CA ในการยืนยันตัวตนแบบ EAP"
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"กำหนดเป็นค่าจริงถ้าต้องการปิดคำเตือนเกี่ยวกับใบรับรอง CA ในขั้นที่ 2 ของการยืนยันตัวตนแบบ EAP"
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -65,44 +146,75 @@ msgstr "รหัสผ่าน:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ไม่มี)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "ใ_บรับรอง CA:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "ไม่ทราบ"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "ปิดคำเตือนใบรับรอง CA"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "เลือกใบรับรอง CA"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "กุญแจ_ส่วนตัว:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_รหัสผ่านกุญแจส่วนตัว:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "เลือกใบรับรอง CA"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_ใบรับรองของผู้ใช้:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "แ_สดงรหัสผ่าน"
 
@@ -114,36 +226,36 @@ msgstr "ปริยาย"
 msgid "My country is not listed"
 msgstr "ไม่มีประเทศของฉันในรายชื่อ"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "ไม่ระบุ"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "แผนที่ฉันใช้ไม่มีในรายชื่อ..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "ผู้ให้บริการ"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "ติดตั้งอุปกรณ์ GSM แล้ว"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "ติดตั้งอุปกรณ์ CDMA แล้ว"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "อุปกรณ์ใดๆ"
 
@@ -273,52 +385,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "ยืนยันการตั้งค่าบรอดแบนด์มือถือ"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(ไม่มี)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "ใ_บรับรอง CA:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "ไม่ทราบ"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "เลือกใบรับรอง CA"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_ใบรับรองของผู้ใช้:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "แ_สดงรหัสผ่าน"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -341,13 +407,27 @@ msgstr "ชื่อ"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "เลือกใบรับรอง CA"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_ใบรับรองของผู้ใช้:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "แ_สดงรหัสผ่าน"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -400,546 +480,471 @@ msgstr "_รหัสผ่าน:"
 msgid "_Password:"
 msgstr "_รหัสผ่าน:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "ตัดการเชื่อมต่อ"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ไม่มี"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP กุญแจ 40/128 บิต (ฐานสิบหก หรือ ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 บิต แบบวลีรหัสผ่าน"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP แบบผันแปร (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ส่วนบุคคล"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 เอนเทอร์ไพรส์"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 ส่วนบุคคล"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_สร้าง"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "เ_ชื่อมต่อ"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "ต้องใช้รหัสผ่านหรือกุญแจเข้ารหัสลับในการเข้าใช้เครือข่ายไร้สาย '%s'"
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ต้องยืนยันตัวบุคคลกับเครือข่ายไร้สาย"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "เครือข่ายไร้สายต้องการการยืนยันตัวบุคคล"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "สร้างเครือข่ายไร้สายใหม่"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "เครือข่ายไร้สายรายการใหม่"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ป้อนชื่อเครือข่ายไร้สายที่ต้องการสร้าง"
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "เชื่อมต่อไปยังเครือข่ายไร้สายที่ซ่อนอยู่"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "เครือข่ายไร้สายที่ซ่อนอยู่"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "ป้อนชื่อและรายละเอียดการรักษาความปลอดภัยของเครือข่ายไร้สายที่ซ่อนอยู่ที่คุณต้องการเชื่อมต่อ"
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "การรักษา_ความปลอดภัยเครือข่ายไร้สาย:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_ชื่อเครือข่าย:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "การเชื่อม_ต่อ:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "อุปกรณ์ไ_ร้สาย:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "การเชื่อมต่อ %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "ใบรับรองแบบ DER หรือ PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "ปิดคำเตือนใบรับรอง CA"
-
-#: src/wireless-security/eap-method.c:356
-#, fuzzy
-msgid "selected CA certificate file does not exist"
-msgstr "เลือกแฟ้มใบรับรอง CA"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "เลือกแฟ้ม PAC..."
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "แฟ้ม PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "ทุกแฟ้ม"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "นิรนาม"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "ยืนยันตัวบุคคล"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "ทั้งสองอย่าง"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "ชื่อในระบบแบบนิ_รนาม:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "แ_ฟ้ม PAC:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "การยืนยันตัวบุคคลชั้นใ_น:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "เปิดรับการใช้ PAC อัตโนมัติ"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_ชื่อผู้ใช้:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_รหัสผ่าน:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "รุ่น 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "รุ่น 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "ปิดคำเตือนใบรับรอง CA"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "รุ่_นของ PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128 บิต แบบวลีรหัสผ่าน"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "แสดงวลีรหัสผ่าน"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "ปิดคำเตือนใบรับรอง CA"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "_ชื่อในระบบ:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "ปิดคำเตือนใบรับรอง CA"
+
+#: src/nma-ws/nma-eap.c:353
+#, fuzzy
+msgid "selected CA certificate file does not exist"
+msgstr "เลือกแฟ้มใบรับรอง CA"
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "TLS ผ่านทันเนล"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP ที่มีการปกป้อง (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "ไม่ทราบ"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "การ_ยืนยันตัวบุคคล:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "_รหัสผ่านกุญแจส่วนตัว:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "ช_นิด:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "ระบบเปิด"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "ใช้กุญแจร่วมกัน"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (ปริยาย)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "กุญแ_จ:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "แ_สดงกุญแจ"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "_ดัชนี WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "จัดการการเชื่อมต่อเครือข่ายของคุณ"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "ตั้งค่า VPN ผิดพลาด"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "จัดการและตั้งค่าการเชื่อมต่อเครือข่ายของคุณ"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "ปิดการแจ้งเหตุการเชื่อมต่อ"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการแจ้งเหตุเมื่อมีการเชื่อมต่อเครือข่าย"
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "ปิดการแจ้งเหตุการตัดการเชื่อมต่อ"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการแจ้งเหตุเมื่อมีการตัดการเชื่อมต่อเครือข่าย"
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "ปิดการแจ้งเหตุการเชื่อมต่อ VPN"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "กำหนดเป็นค่าจริงถ้าต้องการปิดการแจ้งเหตุเมื่อมีการเชื่อมต่อหรือตัดการเชื่อมต่อกับเครือข่าย VPN"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "การเชื่อมต่อ %s"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "ปิดการแจ้งเหตุเมื่อมีเครือข่ายให้เชื่อมต่อ"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "ใบรับรองแบบ DER หรือ PEM (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการแจ้งเหตุเมื่อพบเครือข่ายไร้สายที่เชื่อมต่อได้"
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "กุญแจส่วนตัวแบบ DER, PEM, หรือ PKCS#12 (*.der, *.pem, *.p12)"
 
-#~ msgid "Stamp"
-#~ msgstr "ประทับตรา"
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "การรักษา_ความปลอดภัยเครือข่ายไร้สาย:"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "ใช้ในการกำหนดว่าควรแปลงค่าตั้งไปเป็นรุ่นใหม่หรือไม่"
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "_ชื่อเครือข่าย:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "ปิดการสร้าง Wi-Fi"
+msgid "C_onnection"
+msgstr "การเชื่อม_ต่อ:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการสร้างเครือข่ายเฉพาะกิจขณะใช้แอพเพล็ต"
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "อุปกรณ์ไ_ร้สาย:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "ปิดคำเตือนใบรับรอง CA"
+#~ msgid "Manage your network connections"
+#~ msgstr "จัดการการเชื่อมต่อเครือข่ายของคุณ"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดคำเตือนเกี่ยวกับใบรับรอง CA ในการยืนยันตัวตนแบบ EAP"
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "ตั้งค่า VPN ผิดพลาด"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "กำหนดเป็นค่าจริงถ้าต้องการปิดคำเตือนเกี่ยวกับใบรับรอง CA ในขั้นที่ 2 ของการยืนยันตัวตนแบบ "
-#~ "EAP"
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "จัดการและตั้งค่าการเชื่อมต่อเครือข่ายของคุณ"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/tr.po b/po/tr.po
index f82a6e48..98be2e73 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-09-08 18:54+0300\n"
 "Last-Translator: Sabri Ünal <libreajans gmail com>\n"
 "Language-Team: Türkçe <gnome-turk gnome org>\n"
@@ -27,6 +27,101 @@ msgstr ""
 "X-Generator: Poedit 2.0.6\n"
 "X-POOTLE-MTIME: 1434872144.000000\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Bağlantı bildirimlerini kapat"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Bir ağa bağlanırken bildirim gelmesini engellemek istiyorsanız bunu doğru "
+"olarak ayarlayın."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Bağlantı kesildi bildirimlerini kapat"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Bir ağ bağlantısını keserken bildirim gelmesini engellemek istiyorsanız bu "
+"seçeneği doğru olarak ayarlayın."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "VPN bildirimlerini kapat"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"VPN bağlantısı yaparken ya da bağlantıyı keserken bildirim gelmesini "
+"engellemek istiyorsanız bunu doğru olarak ayarlayın."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Erişilebilir ağ bildirimlerini kapat"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Kullanılabilir kablosuz ağlar bulunduğunda bildirim gelmesini engellemek "
+"istiyorsanız bunu doğru olarak ayarlayın."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Damga"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Ayarların yeni bir sürüme göç ettirip ettirilmeyeceğini belirtmek için "
+"kullanılır."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "WiFi Oluşturmayı devre dışı bırak"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Uygulamacığı kullanırken adhoc ağ oluşturulmasını engellemek istiyorsanız bu "
+"seçeneği doğru olarak ayarlayın."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Bildirim alanında uygulamacığı göster"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Bildirim alanında uygulamacığın görüntülenmesini istemiyorsanız bu seçeneği "
+"YANLIŞ olarak işaretleyin."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA sertifikasını yok say"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"EAP kimlik doğrulamasında CA sertifikaları ile ilgili uyarıları görmek "
+"istemiyorsanız bu seçeneği doğru olarak işaretleyin."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"EAP kimlik doğrulamasının 2. aşamasında CA sertifikaları ile ilgili "
+"uyarıları görmek istemiyorsanız bu seçeneği doğru olarak işaretleyin."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -76,43 +171,72 @@ msgstr "Parola"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr "Telefonunuzla tarayın ya da <a href=\"nma:print\">Yazdırın</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Hiçbiri)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "%s içindeki anahtar"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "%s içindeki sertifika"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Bilinmeyen)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Seç"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "İptal Et"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Dosyadan seç…"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "Sertifika belirlenmedi"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "Anahtar belirlenmedi"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "%s Sertifikası için anahtar seç"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "%s özel _anahtarı"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "%s anahtar _parolası"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "%s Sertifikası Seç"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "%s _sertifikası"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "Parola_yı göster"
 
@@ -124,35 +248,35 @@ msgstr "Öntanımlı"
 msgid "My country is not listed"
 msgstr "Ülkem listede değil"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Listelenmemiş"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "Planım listede yok…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Sağlayıcı"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Kurulan GSM aygıtı"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Kurulan CDMA aygıtı"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Herhangi bir aygıt"
 
@@ -278,50 +402,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Mobil Geniş Bant Ayarlarını Doğrula"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(Hiçbiri)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "%s içindeki anahtar"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "%s içindeki sertifika"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(Bilinmeyen)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "Seç"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "İptal Et"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "Dosyadan seç…"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "%s Sertifikası Seç"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "%s sertifika _parolası"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "Parolaları _göster"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "Giriş yaparken hata: "
@@ -342,13 +422,27 @@ msgstr "Ad"
 msgid "Issued By"
 msgstr "Düzenleyen"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "%s Sertifikası Seç"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s sertifika _parolası"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "Parolaları _göster"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "%s PINʼini Gir"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "_İptal Et"
 
@@ -396,92 +490,92 @@ msgstr "_İkincil Parola:"
 msgid "_Password:"
 msgstr "Pa_rola:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "Bağlanmak için tıkla"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "Yeni…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Hiçbiri"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Anahtar (Hex ya da ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Parola"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamik WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Kişisel"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Kişisel"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Oluştur"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "B_ağlan"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, 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/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Kablosuz Ağ Kimlik Doğrulaması Gerekli"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Kablosuz ağ için kimlik doğrulaması gerekli"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Yeni Kablosuz Ağ Oluştur"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Yeni Kablosuz Ağ"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Gizli Kablosuz Ağa Bağlan"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Gizli Kablosuz ağ"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -489,296 +583,250 @@ msgstr ""
 "Bağlanmak istediğiniz gizli kablosuz ağın adını ve güvenlik ayrıntılarını "
 "girin."
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Kablosuz _güvenliği"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "_Ağ adı"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "B_ağlantı"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "Kablosuz _bağdaştırıcı"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s bağlantısı"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM sertifikaları (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-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:351
-msgid "no CA certificate selected"
-msgstr "CA sertifikası seçilmedi"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "seçilen CA sertifika dosyası yok"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC dosyası eksik"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Bir PAC dosyası seçin"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC dosyaları (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Tüm dosyalar"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonim"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Kimlik doğrulandı"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "İkisi de"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "Anoni_m kimlik"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "PAC _dosyası"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "_Dahili kimlik doğrulaması"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Kendiliğinden PAC ön _hazırlığına izin ver"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP kullanıcı adı eksik"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP parolası eksik"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "_Kullanıcı adı"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "Pa_rola"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Kendiliğinden"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Sürüm 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Sürüm 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "CA sertifikası ge_rekli değildir"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "PEAP _sürümü"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "Sunucu sertifika adının son eki."
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "_Etki Alanı"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "eksik EAP kullanıcı adı"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "eksik EAP parolası"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "kayıp EAP istemci Gizli Anahtar metni"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "Gizli Anahta_r Metni"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "Parolayı _göster"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "eksik EAP-TLS kimliği"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "kullanıcı sertifikası seçilmedi"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "seçilen kullanıcı sertifika dosyası yok"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "anahtar seçilmedi"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "seçilen anahtar dosyası yok"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "K_imlik"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (EAP yok)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "802.1X güvenliğini doğrulamada bilinmeyen hata"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "802.1X güvenliğinde (wpa-eap) tanımlanmamış hata"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "CA sertifikası seçilmedi"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "seçilen CA sertifika dosyası yok"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "HIZLI"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tünelli TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Korumalı EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "Harici olarak yapılandırıldı"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "_Yetkilendirme"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "leap-kullanıcı adı eksik"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "leap-parolası eksik"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "eksik EAP parolası"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "_Tür"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "wep-anahtarı eksik"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "geçersiz wep-anahtarı: %zu uzunluğundaki bir anahtar yalnızca onaltılı (hex) "
 "rakamlardan oluşmalı"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -786,7 +834,7 @@ msgstr ""
 "geçersiz wep-anahtarı: %zu uzunluğundaki bir anahtar yalnızca ascii "
 "karakterler içermelidir"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -795,39 +843,39 @@ msgstr ""
 "geçersiz wep-anahtarı: geçersiz anahtar uzunluğu %zu. Bir anahtar ya 5/13 "
 "(ascii) ya da 10/26 (onaltılık) uzunluğunda olmalıdır"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "geçersiz wep-anahtarı: parola boş olmamalıdır"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "geçersiz wep-anahtarı: parola 64 karakterden kısa olmalıdır"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Açık Sistem (Open System)"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Paylaşılan Anahtar"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Öntanımlı)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Anahtar"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "Anahtarı _göster"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP indek_si"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -836,10 +884,44 @@ 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 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"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "802.1X güvenliğini doğrulamada bilinmeyen hata"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s bağlantısı"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM sertifikaları (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+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/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Kablosuz _güvenliği"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "_Ağ adı"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "B_ağlantı"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Kablosuz _bağdaştırıcı"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "Ağ bağlantılarınızı yönetin"
 
@@ -855,89 +937,6 @@ msgstr "geçersiz wpa-psk: 64 baytlık anahtar onaltılık olarak yorumlanamıyo
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Bağlantı bildirimlerini kapat"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Bir ağa bağlanırken bildirim gelmesini engellemek istiyorsanız bunu doğru "
-#~ "olarak ayarlayın."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Bağlantı kesildi bildirimlerini kapat"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Bir ağ bağlantısını keserken bildirim gelmesini engellemek istiyorsanız "
-#~ "bu seçeneği doğru olarak ayarlayın."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "VPN bildirimlerini kapat"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "VPN bağlantısı yaparken ya da bağlantıyı keserken bildirim gelmesini "
-#~ "engellemek istiyorsanız bunu doğru olarak ayarlayın."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Erişilebilir ağ bildirimlerini kapat"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Kullanılabilir kablosuz ağlar bulunduğunda bildirim gelmesini engellemek "
-#~ "istiyorsanız bunu doğru olarak ayarlayın."
-
-#~ msgid "Stamp"
-#~ msgstr "Damga"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Ayarların yeni bir sürüme göç ettirip ettirilmeyeceğini belirtmek için "
-#~ "kullanılır."
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "WiFi Oluşturmayı devre dışı bırak"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Uygulamacığı kullanırken adhoc ağ oluşturulmasını engellemek istiyorsanız "
-#~ "bu seçeneği doğru olarak ayarlayın."
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Bildirim alanında uygulamacığı göster"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Bildirim alanında uygulamacığın görüntülenmesini istemiyorsanız bu "
-#~ "seçeneği YANLIŞ olarak işaretleyin."
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA sertifikasını yok say"
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "EAP kimlik doğrulamasında CA sertifikaları ile ilgili uyarıları görmek "
-#~ "istemiyorsanız bu seçeneği doğru olarak işaretleyin."
-
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "EAP kimlik doğrulamasının 2. aşamasında CA sertifikaları ile ilgili "
-#~ "uyarıları görmek istemiyorsanız bu seçeneği doğru olarak işaretleyin."
-
 #~ msgid "NetworkManager"
 #~ msgstr "Ağ Yöneticisi"
 
diff --git a/po/ug.po b/po/ug.po
index 0d3298be..3f714c6a 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\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,6 +18,99 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "باغلىنىش ئۇقتۇرۇشىنى ئىناۋەتسىز قىل"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"بىر تورغا باغلىنىۋاتقاندا ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ تاللاشنى "
+"TRUE غا تەڭشەڭ."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "باغلىنىش ئۈزۈلگەنلىك ئۇقتۇرۇشىنى ئىناۋەتسىز قىل"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"بىر تور باغلىنىشىنى ئۈزۈۋاتقاندا ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ "
+"تاللاشنى TRUE غا تەڭشەڭ."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "ۋ پ ن(VPN) ئۇقتۇرۇشىنى ئىناۋەتسىز قىل"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"ۋ پ ن(VPN) تورىغا  باغلىنىۋاتقاندا ياكى باغلىنىش ئۈزۈلۈۋاتقاندا "
+"ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ تاللاشنى TRUE غا تەڭشەڭ."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "تور ئىشلىتىلىشچان ئۇقتۇرۇشلىرىنى چەكلە"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"ئەگەر بۇ true قىلىپ بەلگىلەنسە، ئىشلەتكىلى بولىدىغان Wi-Fi بار بولغاندا "
+"چىقىرىدىغان ئۇقتۇرۇش ئىناۋەتسىز قىلىنىدۇ."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "تامغا"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"تەڭشەكلەرنىڭ يېڭى بىر نۇسخىغا كۆچۈش-كۆچۈرمەسلىكنى بەلگىلەش ئۈچۈن ئىشلىتىلىدۇ."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "سىمسىز تور Wi-Fi قۇرۇشنى تاقا"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"قوللانچاقلارنى ئىشلەتكەندە adhoc تورلىرىنى قۇرماسلىقنى ئىستىسىڭىز بۇ "
+"تاللاشنى TRUE غا تەڭشەڭ."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"EAP دىكى كىملىك دەلىللەشتە CA گۇۋاھنامىسىنىڭ ئاگاھلاندۇرۇشلىرىنى خالىمىسىڭىز "
+"بۇنى true غا تەڭشەڭ."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"EAP دىكى كىملىك دەلىللەشنىڭ ئىككىنچى باسقۇچىدىكى CA گۇۋاھنامىسىنىڭ "
+"ئاگاھلاندۇرۇشلىرىنى خالىمىسىڭىز بۇنى true غا تەڭشەڭ."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -64,44 +157,75 @@ msgstr "ئىم:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(يوق)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A گۇۋاھنامىسى:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "نامەلۇم"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "CA گۇۋاھنامىسى تاللا"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "شەخسىي ئاچقۇچ(_K)"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "شەخسىي ئاچقۇچ ئىمى(_P):"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "CA گۇۋاھنامىسى تاللا"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "ئىشلەتكۈچى گۇۋاھنامىسى(_U):"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "ئىمنى كۆرسەت(_W)"
 
@@ -113,36 +237,36 @@ msgstr "كۆڭۈلدىكى"
 msgid "My country is not listed"
 msgstr "دۆلىتىم تىزىملانماپتۇ"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "تىزىملانمىغان"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "پىلانىم تىزىملىكتە يوق..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "تەمىنلىگۈچى"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "ئورۇنلاشتۇرۇلغان GSM ئۈسكۈنىسى"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "ئورۇنلاشتۇرۇلغان CDMA ئۈسكۈنىسى"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "ھەرقانداق بىر ئۈسكۈنە"
 
@@ -276,52 +400,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "كۆچمە كەڭ بەلۋاغ تەڭشەكلىرىنى جەزملە"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(يوق)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "C_A گۇۋاھنامىسى:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "نامەلۇم"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "CA گۇۋاھنامىسى تاللا"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "ئىشلەتكۈچى گۇۋاھنامىسى(_U):"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "ئىمنى كۆرسەت(_W)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -344,13 +422,27 @@ msgstr "ئاتى"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "CA گۇۋاھنامىسى تاللا"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "ئىشلەتكۈچى گۇۋاھنامىسى(_U):"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "ئىمنى كۆرسەت(_W)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -403,60 +495,60 @@ msgstr "ئىم(_P):"
 msgid "_Password:"
 msgstr "ئىم(_P):"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "ئۈز"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "يوق"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 بىتلىق ئاچقۇچ(16لىك ياكى ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 بىتلىق شىفىر"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "دىنامىكىلىق WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ۋە WPA2 كىشىلىك نۇسخىسى"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ۋە WPA2 كارخانا نۇسخىسى"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA ۋە WPA2 كىشىلىك نۇسخىسى"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "قۇر(_R)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 #, fuzzy
 msgid "C_onnect"
 msgstr "باغلاندى"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -464,35 +556,35 @@ msgstr ""
 "سىمسىز(Wi-Fi) تور ‹%s› نى زىيارەت قىلىش ئۈچۈن ئىم ياكى شىفىرلاش ئاچقۇچى "
 "زۆرۈردۇر."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "سىمسىز(Wi-Fi) تور كىملىك دەلىللەش زۆرۈر"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "سىمسىز(Wi-Fi) تور كىملىك دەلىللەشنى تەلەپ قىلدى"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "يېڭى سىمسىز(Wi-Fi) تور قۇرۇش"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "يېڭى سىمسىز(Wi-Fi) تور"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "قۇرماقچى بولغان سىمسىز(Wi-Fi) تورنىڭ ئاتىنى كىرگۈزۈڭ."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "يوشۇرۇن سىمسىز(Wi-Fi) تورغا باغلىنىش"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "يوشۇرۇن سىمسىز(Wi-Fi) تور"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -500,457 +592,370 @@ msgstr ""
 "باغلانماقچى بولغان يوشۇرۇن سىمسىز تورنىڭ ئاتى ۋە بىخەتەرلىك تەپسىلاتلىرىنى "
 "كىرگۈزۈڭ."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "سىمسىز(Wi-Fi) تور بىخەتەرلىكى:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "تور ئاتى(_N)"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "باغلىنىش(_O):"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "سىمسىز(Wi-Fi) تور كارتىسى(_A):"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s باغلىنىش"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER ياكى PEM گۇۋاھنامىسى(der.*، pem.*، crt.*، cer.*)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC ھۆججىتىنى تاللاڭ…"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ھۆججەتلىرى(*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "ھەممە ھۆججەتلەر"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "ئاتسىز"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "سالاھىيىتى دەلىللەنگەن"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "ئىككىلىسى"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "ئاتسىز كىملىك(_M):"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC ھۆججىتى(_F):"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "ئىچكى ئىسپات"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ئاپتوماتىك PAC تەمىنلەش"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "ئىشلەتكۈچى ئاتى(_U):"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "ئىم(_P):"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "ئاپتوماتىك"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "نەشرى 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "نەشرى 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP نەشرى(_V):"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128 بىتلىق شىفىر"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "ئىمنى كۆرسەت(_W)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "كىملىك(_I):"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "تونىل TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "قوغدىلىدىغان EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "كىملىك دەلىللەش(_T):"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "شەخسىي ئاچقۇچ ئىمى(_P):"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "تىپى(_T):"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "ئوچۇق سىستېما"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "ھەمبەھىرلەنگەن ئاچقۇچ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (كۆڭۈلدىكى)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "ئاچقۇچ(_K):"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "ئاچقۇچنى كۆرسەت(_W)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP ئىندېكسى(_X):"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "تور باغلىنىشلىرىڭىزنى باشقۇرۇڭ"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "ئاكتىپ تور باغلىنىشلىرى"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "تور باغلىنىش تەڭشەكلىرىڭىزنى باشقۇرۇڭ ۋە ئۆزگەرتىڭ"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "باغلىنىش ئۇقتۇرۇشىنى ئىناۋەتسىز قىل"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "بىر تورغا باغلىنىۋاتقاندا ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ "
-#~ "تاللاشنى TRUE غا تەڭشەڭ."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "باغلىنىش ئۈزۈلگەنلىك ئۇقتۇرۇشىنى ئىناۋەتسىز قىل"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "بىر تور باغلىنىشىنى ئۈزۈۋاتقاندا ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز "
-#~ "بۇ تاللاشنى TRUE غا تەڭشەڭ."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "ۋ پ ن(VPN) ئۇقتۇرۇشىنى ئىناۋەتسىز قىل"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "ۋ پ ن(VPN) تورىغا  باغلىنىۋاتقاندا ياكى باغلىنىش ئۈزۈلۈۋاتقاندا "
-#~ "ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ تاللاشنى TRUE غا تەڭشەڭ."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s باغلىنىش"
 
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "تور ئىشلىتىلىشچان ئۇقتۇرۇشلىرىنى چەكلە"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER ياكى PEM گۇۋاھنامىسى(der.*، pem.*، crt.*، cer.*)"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "ئەگەر بۇ true قىلىپ بەلگىلەنسە، ئىشلەتكىلى بولىدىغان Wi-Fi بار بولغاندا "
-#~ "چىقىرىدىغان ئۇقتۇرۇش ئىناۋەتسىز قىلىنىدۇ."
+#: src/utils/utils.c:547
+#, fuzzy
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER، PEM ياكى PKCS#12 شەخسىي ئاچقۇچلار(*.der، *.pem،*.p12)"
 
-#~ msgid "Stamp"
-#~ msgstr "تامغا"
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "سىمسىز(Wi-Fi) تور بىخەتەرلىكى:"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "تەڭشەكلەرنىڭ يېڭى بىر نۇسخىغا كۆچۈش-كۆچۈرمەسلىكنى بەلگىلەش ئۈچۈن "
-#~ "ئىشلىتىلىدۇ."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "تور ئاتى(_N)"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "سىمسىز تور Wi-Fi قۇرۇشنى تاقا"
+msgid "C_onnection"
+msgstr "باغلىنىش(_O):"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "قوللانچاقلارنى ئىشلەتكەندە adhoc تورلىرىنى قۇرماسلىقنى ئىستىسىڭىز بۇ "
-#~ "تاللاشنى TRUE غا تەڭشەڭ."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "سىمسىز(Wi-Fi) تور كارتىسى(_A):"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
+#~ msgid "Manage your network connections"
+#~ msgstr "تور باغلىنىشلىرىڭىزنى باشقۇرۇڭ"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "EAP دىكى كىملىك دەلىللەشتە CA گۇۋاھنامىسىنىڭ ئاگاھلاندۇرۇشلىرىنى "
-#~ "خالىمىسىڭىز بۇنى true غا تەڭشەڭ."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "ئاكتىپ تور باغلىنىشلىرى"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr ""
-#~ "EAP دىكى كىملىك دەلىللەشنىڭ ئىككىنچى باسقۇچىدىكى CA گۇۋاھنامىسىنىڭ "
-#~ "ئاگاھلاندۇرۇشلىرىنى خالىمىسىڭىز بۇنى true غا تەڭشەڭ."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "تور باغلىنىش تەڭشەكلىرىڭىزنى باشقۇرۇڭ ۋە ئۆزگەرتىڭ"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/uk.po b/po/uk.po
index a1911345..b7582d53 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2012-03-24 09:49+0300\n"
 "Last-Translator: Korostil Daniel <ted korostiled gmail com>\n"
 "Language-Team: translation linux org ua\n"
@@ -19,6 +19,99 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Вимкнути сповіщення про підключення"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "Встановіть у TRUE, для вимикання сповіщення про приєднання до мережі."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Вимкнути сповіщення про відключення"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Встановіть у TRUE, для вимикання сповіщення про від'єднання від мережі."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Вимкнути сповіщення про підключення"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Встановіть у TRUE, для вимикання сповіщення про від'єднання від мережі."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Вимкнути сповіщення про доступні мережі"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Встановіть у TRUE, для вимикання сповіщення про доступні бездротові мережі."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Штамп"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"Використовується для визначення параметрів, які мають бути перенесені у нову "
+"версію."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Вимкнути створення з'єднання Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Встановіть у TRUE, для вимикання нестандартних мереж при використані аплету."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Виберіть сертифікат CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "Встановіть у TRUE, для вимикання сповіщення про приєднання до мережі."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "Встановіть у TRUE, для вимикання сповіщення про приєднання до мережі."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -65,44 +158,75 @@ msgstr "Пароль:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(немає)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Сертифікат C_A:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Невідомо"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Сертифікат C_A:"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Обрати персональний сертифікат..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "Приватний кл_юч:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Па_роль до мережного ключа:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Обрати персональний сертифікат..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Сертифікат _користувача:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "П_оказати пароль"
 
@@ -114,36 +238,36 @@ msgstr "Типово"
 msgid "My country is not listed"
 msgstr "Моєї країни немає у списку"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Немає у списку"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Мого плану немає у списку..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Провайдер"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Встановлено пристрій GSM"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Встановлено пристрій CDMA"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Будь-який пристрій"
 
@@ -278,52 +402,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Підтвердження параметрів мобільного з'єднання"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(немає)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "Сертифікат C_A:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Невідомо"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Обрати персональний сертифікат..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Сертифікат _користувача:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "П_оказати паролі"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -346,13 +424,27 @@ msgstr "Назва"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Обрати персональний сертифікат..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Сертифікат _користувача:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "П_оказати паролі"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -405,101 +497,101 @@ msgstr "_Пароль:"
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Від'єднатися"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Без перевірки автентичності"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-бітний ключ (Hex або ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-и бітна ключова фраза"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Динамічний WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "С_творити"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_З'єднати"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Для доступу до бездротової мережі «%s» необхідні паролі або ключі шифрування."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Для доступу до бездротової мережі потрібна автентифікація"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Для доступу до бездротової мережі потрібна автентифікація"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Створити нову бездротову мережу"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Нова бездротова мережа"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Введіть назву бездротової мережі, яку треба створити."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "З'єднатись з прихованою бездротовою мережею"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Прихована бездротова мережа"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -508,447 +600,370 @@ msgstr ""
 "Введіть назву та параметри безпеки прихованої бездротової мережі, до якої "
 "треба приєднатись."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_Захист бездротової мережі:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_Назва мережі:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "З'_єднання:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Бездротовий _адаптер:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "Основне з'єднання:"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Сертифікати DER чи PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Сертифікат C_A:"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Виберіть файл PAC…"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Файли PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Усі файли"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Анонімно"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Розпізнано"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Обидва"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "_Анонімне посвідчення:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "_Файл PAC:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Вн_утрішня автентифікація:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Дозволити автоматичне перед_бачення PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Користувач:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Пароль:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Версія 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Версія 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Сертифікат C_A:"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "Ве_рсія PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-и бітна ключова фраза"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "П_оказати паролі"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Сертифікат C_A:"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "_Посвідчення:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Сертифікат C_A:"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "ШВИДКО"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Тунельний TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Захищено EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "Ав_тентифікація:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Па_роль до мережного ключа:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Тип:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Відкрита система"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Спільний ключ"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (типово)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Ключ:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "П_оказати ключ"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "_Індекс WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Організуйте ваші мережеві з'єднання"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Увімкнути мережеві з'єднання"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Керування параметрами мережних з'єднань"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "Вимкнути сповіщення про підключення"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Основне з'єднання:"
 
+#: src/utils/utils.c:535
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "Встановіть у TRUE, для вимикання сповіщення про приєднання до мережі."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Вимкнути сповіщення про відключення"
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Сертифікати DER чи PEM (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "Встановіть у TRUE, для вимикання сповіщення про від'єднання від мережі."
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "Секретні ключі DER, PEM чи PKCS#12 (*.der, *.pem, *.p12)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Вимкнути сповіщення про підключення"
+msgid "Wi-Fi _security"
+msgstr "_Захист бездротової мережі:"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "Встановіть у TRUE, для вимикання сповіщення про від'єднання від мережі."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Вимкнути сповіщення про доступні мережі"
+msgid "_Network name"
+msgstr "_Назва мережі:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "Встановіть у TRUE, для вимикання сповіщення про доступні бездротові "
-#~ "мережі."
-
-#~ msgid "Stamp"
-#~ msgstr "Штамп"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "Використовується для визначення параметрів, які мають бути перенесені у "
-#~ "нову версію."
+msgid "C_onnection"
+msgstr "З'_єднання:"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Вимкнути створення з'єднання Wi-Fi"
+msgid "Wi-Fi _adapter"
+msgstr "Бездротовий _адаптер:"
 
-#, fuzzy
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "Встановіть у TRUE, для вимикання нестандартних мереж при використані "
-#~ "аплету."
+#~ msgid "Manage your network connections"
+#~ msgstr "Організуйте ваші мережеві з'єднання"
 
 #, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Виберіть сертифікат CA"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Увімкнути мережеві з'єднання"
+
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Керування параметрами мережних з'єднань"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/ur.po b/po/ur.po
index abaea57b..0360708d 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2010-04-06 22:47+0500\n"
 "Last-Translator: Muhammad Ali Makki <makkiabufaris aol com>\n"
 "Language-Team: urducoder.com <makkiabufaris aol com>\n"
@@ -19,6 +19,102 @@ msgstr ""
 "X-Poedit-Country: PAKISTAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "متصل اطلاعات کو معطل کریں"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "نیٹ ورک سے اتصال کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE کردیں."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "غیر متصل اطلاعات کو معطل کریں"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"نیٹ ورک سے اتصال منقطع کرنے کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE "
+"کردیں."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "متصل اطلاعات کو معطل کریں"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"نیٹ ورک سے اتصال منقطع کرنے کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE "
+"کردیں."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "زیریں نیٹ ورکس دستیابی اطلاعات"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"وائیرلیس نیٹ ورک کی دستیابی پر اطلاعات کو معطل کرنے کے لیے اسے TRUE کردیں."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "مہر"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+"یہ جاننے کے لیے استعمال ہوتا ہے کہ آیا ترتیبات نئے نسخے پر منتقل کی جانی "
+"چاہئیں یا نہیں."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Wi-Fi کو بنانا معطل کریں"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+#, 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:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "CA سند منتخب کریں"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "نیٹ ورک سے اتصال کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE کردیں."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+#, fuzzy
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "نیٹ ورک سے اتصال کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE کردیں."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -66,44 +162,78 @@ msgstr "پاس ورڈ:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(کچھ نہیں)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA _سند:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "نامعلوم"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "فائل منتخب کریں"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+#, fuzzy
+msgid "Cancel"
+msgstr "gtk-cancel"
+
+#: src/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "فائل منتخب کریں"
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA _سند:"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "اپنی ذاتی سند منتخب کریں..."
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "نجی _کلید:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_نجی کلید پاس ورڈ:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "اپنی ذاتی سند منتخب کریں..."
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "_صارف سند:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "پاس ورڈ د_کھائیں"
 
@@ -115,36 +245,36 @@ msgstr "طے شدہ"
 msgid "My country is not listed"
 msgstr "میرا ملک فہرست میں نہیں ہے"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "غیر درج شدہ"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "میرا پلان درجِ فہرست نہیں ہے..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "فراہم کُنندہ"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "نصب شدہ GSM ڈیوائس"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "نصب شدہ CDMA ڈیوائس"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "کوئی بھی ڈیوائس"
 
@@ -282,55 +412,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "موبائل براڈ بینڈ کی ترتیبات کی تصدیق کریں"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(کچھ نہیں)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "CA _سند:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "نامعلوم"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-#, fuzzy
-msgid "Select"
-msgstr "فائل منتخب کریں"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-#, fuzzy
-msgid "Cancel"
-msgstr "gtk-cancel"
-
-#: src/nma-cert-chooser-button.c:460
-#, fuzzy
-msgid "Select from file…"
-msgstr "فائل منتخب کریں"
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "اپنی ذاتی سند منتخب کریں..."
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "_صارف سند:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "پاس ورڈ _دکھائیں"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -352,13 +433,27 @@ msgstr "نام"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "اپنی ذاتی سند منتخب کریں..."
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_صارف سند:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "پاس ورڈ _دکھائیں"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -410,103 +505,103 @@ msgstr "_پاس ورڈ:"
 msgid "_Password:"
 msgstr "_پاس ورڈ:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Verbindung konnte nicht verschoben werden"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "کچھ نہیں"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 64/128-bit ASCII"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "حرکی WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ذاتی"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 انٹرپرائز"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 ذاتی"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_بنائیں"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "_متصل ہوں"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "وائیرلیس نیٹ ورک '%s' تک رسائی کے لیے پاس ورڈ یا ترمیزی کلیدیں درکار ہیں."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "وائیرلیس نیٹ ورک توثیق درکار"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "توثیق درکار از وائیرلیس نیٹ ورک"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "نیا وائیرلیس نیٹ ورک بنائیں"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "نیا وائیرلیس نیٹ ورک"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "نئے وائیرلیس نیٹ ورک کا نام لکھیں جو آپ بنانا چاہتے ہیں."
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "پوشیدہ وائیرلیس نیٹ ورک سے اتصال قائم کریں"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "پوشیدہ وائیرلیس نیٹ ورک"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -515,345 +610,293 @@ msgstr ""
 "اس پوشیدہ وائیرلیس نیٹ ورک کا نام اور سیکورٹی تفصیلات داخل کریں جس سے آپ "
 "متصل ہونے چاہتے ہیں."
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_وائیرلیس سیکورٹی:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "_نیٹ ورک کا نام:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "ا_تصال:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "وائیرلیس ا_ڈاپٹر:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "ڈی ایس ایل اتصال %d"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER یا PEM اسناد (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-#, 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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA _سند:"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "_نامعلوم پہچان:"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "_توثیق:"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "_نامعلوم پہچان:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "داخلی توثیق:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "صا_رف کا نام:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_پاس ورڈ:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "خودکار"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "CA _سند:"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "_PEAP نسخہ:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "_Passwort:"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Passphrase anzeigen"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA _سند:"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "شناخت:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA _سند:"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "محفوظ EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_توثیق:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "_نجی کلید پاس ورڈ:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_نوعیت:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Offenes System"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Gemeinsamer Schlüssel (PSK)"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 #, fuzzy
 msgid "1 (Default)"
 msgstr ""
@@ -862,107 +905,81 @@ msgstr ""
 "3\n"
 "4"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_کلید:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "کلید _دکھائیں"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP inde_x:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Manage your network connections"
-#~ msgstr "اپنے نیٹ ورک اتصال کی ادارت کریں"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "VPN-Konfigurationsfehler"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "اپنے نیٹ ورک اتصال کی تبدیلی اور ادارت کریں"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "متصل اطلاعات کو معطل کریں"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "ڈی ایس ایل اتصال %d"
 
+#: src/utils/utils.c:535
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr ""
-#~ "نیٹ ورک سے اتصال کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE کردیں."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "غیر متصل اطلاعات کو معطل کریں"
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER یا PEM اسناد (*.der, *.pem, *.crt, *.cer)"
 
+#: src/utils/utils.c:547
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr ""
-#~ "نیٹ ورک سے اتصال منقطع کرنے کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE "
-#~ "کردیں."
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, or PKCS#12 نجی کلیدیں (*.der, *.pem, *.p12)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable VPN notifications"
-#~ msgstr "متصل اطلاعات کو معطل کریں"
+msgid "Wi-Fi _security"
+msgstr "_وائیرلیس سیکورٹی:"
 
+#: src/wifi.ui:129
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr ""
-#~ "نیٹ ورک سے اتصال منقطع کرنے کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE "
-#~ "کردیں."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "زیریں نیٹ ورکس دستیابی اطلاعات"
+msgid "_Network name"
+msgstr "_نیٹ ورک کا نام:"
 
+#: src/wifi.ui:154
 #, fuzzy
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr ""
-#~ "وائیرلیس نیٹ ورک کی دستیابی پر اطلاعات کو معطل کرنے کے لیے اسے TRUE کردیں."
-
-#~ msgid "Stamp"
-#~ msgstr "مہر"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr ""
-#~ "یہ جاننے کے لیے استعمال ہوتا ہے کہ آیا ترتیبات نئے نسخے پر منتقل کی جانی "
-#~ "چاہئیں یا نہیں."
+msgid "C_onnection"
+msgstr "ا_تصال:"
 
+#: src/wifi.ui:179
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Wi-Fi کو بنانا معطل کریں"
+msgid "Wi-Fi _adapter"
+msgstr "وائیرلیس ا_ڈاپٹر:"
 
 #, fuzzy
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr ""
-#~ "ایپلیٹ کے استعمال کے دوران adhoc نیٹ ورک کو بننے سے روکنے کے لیے اسے TRUE "
-#~ "کردیں."
+#~ msgid "Manage your network connections"
+#~ msgstr "اپنے نیٹ ورک اتصال کی ادارت کریں"
 
 #, fuzzy
-#~ msgid "Ignore CA certificate"
-#~ msgstr "CA سند منتخب کریں"
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "VPN-Konfigurationsfehler"
+
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "اپنے نیٹ ورک اتصال کی تبدیلی اور ادارت کریں"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/vi.po b/po/vi.po
index 9e4a2542..b494d754 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2014-11-28 15:54+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman gmail com>\n"
 "Language-Team: Vietnamese <gnome-vi-list gnome org>\n"
@@ -20,6 +20,86 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.5.5\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "Tắt thông báo kết nối"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "Đặt là true để tắt thông báo khi nối mạng."
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "Tắt thông báo ngắt kết nối"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "Đặt là true để tắt thông báo khi ngắt mạng."
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "Tắt thông báo VPN"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "Đặt là true để tắt thông báo khi ngắt mạng VPN."
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "Ngăn thông báo mạng sẵn sàng"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "Đặt để tắt thông báo khi có mạng Wi-Fi."
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "Tem"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "Dùng để xác định thiết lập có được chuyển sang phiên bản mới không."
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "Tắt tạo Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr "Đặt là true để tắt tạo mạng adhock bằng applet."
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "Hiện applet ở khu vực thông báo"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "Đặt thành SAI để tắt hiển thị applet trong vùng thông báo."
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "Bỏ qua chứng nhận CA"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "Đặt nó thành đúng để tắt cảnh báo về chứng nhận CA trong xác thực EAP."
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+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."
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -66,44 +146,75 @@ msgstr "Mật khẩu:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(không)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "_Chứng nhận CA:"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Không rõ"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "Không có chứng nhận CA như _yêu cầu"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Chọn chứng nhận CA"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "_Khoá riêng:"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "_Mật khẩu khoá riêng:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Chọn chứng nhận CA"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Chứng nhận người _dùng:"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "_Hiện mật khẩu"
 
@@ -115,36 +226,36 @@ msgstr "Mặc định"
 msgid "My country is not listed"
 msgstr "Không thấy có quốc gia của tôi"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "Không liệt kê"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Không thấy gói cước của tôi…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "Nhà cung cấp"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "Thiết bị GSM đã cài đặt"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "Thiết bị CDMA đã cài đặt"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "Bất kỳ thiết bị nào"
 
@@ -278,52 +389,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Xác nhận thiết lập di động băng thông rộng"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(không)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "_Chứng nhận CA:"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "Không rõ"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "Chọn chứng nhận CA"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "Chứng nhận người _dùng:"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "_Hiện mật khẩu"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -346,13 +411,27 @@ msgstr "Tên"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Chọn chứng nhận CA"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Chứng nhận người _dùng:"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "_Hiện mật khẩu"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -405,543 +484,462 @@ msgstr "Mật khẩu _phụ:"
 msgid "_Password:"
 msgstr "_Mật khẩu:"
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "Ngắt kết nối"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Không"
 
 # Name: don't translate / Tên: đừng dịch
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 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/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "Mật khẩu WEP 128-bit"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP động (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Cá nhân"
 
 # Name: don't translate / Tên: đừng dịch
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Kinh doanh"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Cá nhân"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "_Tạo"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "Kết nố_i"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Cần mật khẩu hoặc khoá mã hoá để truy cập mạng Wi-Fi “%s”."
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Cần xác thực mạng Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Cần xác thực mạng Wi-Fi"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "Tạo mạng Wi-Fi mới"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "Mạng Wi-Fi mới"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 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/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Kết nối đến mạng Wi-Fi ẩn"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "Mạng Wi-Fi ẩn"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 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/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "_An ninh Wi-Fi:"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "Tê_n mạng:"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "_Kết nối:"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "_Bộ điều hợp Wi-Fi:"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "Kết nối %s"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "Chứng nhậng DER hoặc PEM (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Không có chứng nhận CA như _yêu cầu"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Chọn tập tin PAC…"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Tập tin PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "Mọi tập tin"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "Vô danh"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "Xác thực"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "Cả hai"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "Định danh _vô danh:"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "Tập tin _PAC:"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "Xác thực _trong:"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Cho phép tự động dự liệ_u PAC"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "_Tên người dùng:"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "_Mật khẩu:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "Tự động"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "Phiên bản 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "Phiên bản 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "Không có chứng nhận CA như _yêu cầu"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "Phiên bản _PEAP:"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Mật khẩu WEP 128-bit"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "_Hiện mật khẩu"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Không có chứng nhận CA như _yêu cầu"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "Đị_nh danh:"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Không có chứng nhận CA như _yêu cầu"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "Đường hầm TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "EAP Bảo vệ (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "_Xác thực:"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "_Mật khẩu khoá riêng:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "_Kiểu:"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Hệ thống mở"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Khóa dùng chung"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Mặc định)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "_Khóa:"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "_Hiện khoá"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "_Chỉ mục WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "Quản lý kết nối mạng"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "Lỗi cấu hình VPN"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "Quản lí và thay đổi thiết lập kết nối mạng"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "Tắt thông báo kết nối"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "Đặt là true để tắt thông báo khi nối mạng."
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "Tắt thông báo ngắt kết nối"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr "Đặt là true để tắt thông báo khi ngắt mạng."
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "Tắt thông báo VPN"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr "Đặt là true để tắt thông báo khi ngắt mạng VPN."
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "Ngăn thông báo mạng sẵn sàng"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "Đặt để tắt thông báo khi có mạng Wi-Fi."
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "Kết nối %s"
 
-#~ msgid "Stamp"
-#~ msgstr "Tem"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Chứng nhậng DER hoặc PEM (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "Dùng để xác định thiết lập có được chuyển sang phiên bản mới không."
+#: src/utils/utils.c:547
+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/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "Tắt tạo Wi-Fi"
+msgid "Wi-Fi _security"
+msgstr "_An ninh Wi-Fi:"
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr "Đặt là true để tắt tạo mạng adhock bằng applet."
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "Tê_n mạng:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Hiện applet ở khu vực thông báo"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "_Kết nối:"
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr "Đặt thành SAI để tắt hiển thị applet trong vùng thông báo."
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Bộ điều hợp Wi-Fi:"
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "Bỏ qua chứng nhận CA"
+#~ msgid "Manage your network connections"
+#~ msgstr "Quản lý kết nối mạng"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr ""
-#~ "Đặt nó thành đúng để tắt cảnh báo về chứng nhận CA trong xác thực EAP."
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "Lỗi cấu hình VPN"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ 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."
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "Quản lí và thay đổi thiết lập kết nối mạng"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/wa.po b/po/wa.po
index 6773917c..de30e99b 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2004-09-09 10:41+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo walon org>\n"
 "Language-Team: Walloon <linux-wa walon org>\n"
@@ -17,6 +17,83 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -64,43 +141,72 @@ msgstr "Sicret:"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Sicret:"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr ""
 
@@ -112,35 +218,35 @@ msgstr ""
 msgid "My country is not listed"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr ""
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr ""
 
@@ -257,34 +363,24 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
+#: src/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
+#: src/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:116
+msgid "Name"
 msgstr ""
 
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
+#: src/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
 msgstr ""
 
 #: src/nma-pkcs11-cert-chooser.c:381
@@ -301,33 +397,13 @@ msgstr "Sicret:"
 msgid "Sho_w passwords"
 msgstr ""
 
-#: src/nma-pkcs11-cert-chooser-dialog.c:241
-msgid "Error logging in: "
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.c:263
-msgid "Error opening a session: "
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:20
-msgid "_Unlock token"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:116
-msgid "Name"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser-dialog.ui:126
-msgid "Issued By"
-msgstr ""
-
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -375,448 +451,436 @@ msgstr ""
 msgid "_Password:"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 #, fuzzy
 msgid "WEP 128-bit Passphrase"
 msgstr "Sicret:"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 msgid "WPA3 Personal"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "I gn a mezåjhe d' ene clé d' ecriptaedje pol rantoele sins fyis"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Rantoeles sins fyis"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Rantoeles sins fyis"
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "Raloyaedjes rantoele"
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "Raloyaedjes rantoele"
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Rantoeles sins fyis"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, fuzzy, c-format
-msgid "%s connection"
-msgstr "Raloyaedjes rantoele"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr ""
-
-#: src/utils/utils.c:556
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "Raloyaedjes rantoele"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "Sicret:"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "Sicret:"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "Sicret:"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Raloyaedjes rantoele"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr ""
+
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+
+#: src/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Rantoeles sins fyis"
+
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "Raloyaedjes rantoele"
+
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Raloyaedjes rantoele"
+
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Rantoeles sins fyis"
+
 #, fuzzy
 #~ msgid "Manage your network connections"
 #~ msgstr "Raloyaedjes rantoele"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f30f5f73..e8483869 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet 1.8.22\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2019-08-15 01:36+0000\n"
 "Last-Translator: tfu <tfu redhat com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
@@ -30,6 +30,83 @@ msgstr ""
 "X-Launchpad-Export-Date: 2016-03-22 13:39+0000\n"
 "X-Generator: Zanata 4.6.2\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "禁用连接通知"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "将此项设为 true 以禁用连接到一个网络时显示的通知。"
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "禁用断开通知"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "将此项设为 true 以禁用从一个网络断开时显示的通知。"
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "禁用 VPN 通知"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "将此项设为 true 以禁用连接或断开 VPN 时的通知。"
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "禁用网络可用通知"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "将此项设为 true 以禁用无线网络可用时显示的通知。"
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "时间戳"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "用于决定设置是否应被迁移至一个新版本。"
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
+msgstr "禁用 Wi-Fi 创建"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr "设为 true 以禁止使用小程序时创建 adhoc 网络。"
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "在通知区域显示小程序图标"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "设为 FALSE 以禁止小程序图标在通知区域显示。"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "忽略 CA 证书"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "将此项设为 true 以禁用在 EAP 认证中关于 CA 证书的警告。"
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "将此项设为 true 以禁用在 EAP 认证第 2 阶段中关于 CA 证书的警告。"
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -75,43 +152,72 @@ msgstr "密码"
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr "使用手机扫描或 <a href=\"nma:print\">打印</a>"
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(无)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "键入 %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "%s 中的证书"
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(未知信息)"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "选择"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "取消"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "从文件选择..."
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 msgid "No certificate set"
 msgstr "无证书"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "无密钥"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "为 %s 证书选择一个密钥"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, c-format
 msgid "%s private _key"
 msgstr "%s 私钥(_k)"
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, c-format
 msgid "%s key _password"
 msgstr "%s 密钥密码(_p)"
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "选择 %s 证书"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, c-format
 msgid "%s _certificate"
 msgstr "%s 证书(_c)"
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "显示密码(_W)"
 
@@ -123,35 +229,35 @@ msgstr "默认"
 msgid "My country is not listed"
 msgstr "我所在国家/地区没有被列出"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "未列出"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 msgid "My plan is not listed…"
 msgstr "我的套餐未被列出..."
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "提供商"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "已安装的 GSM 设备"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "已安装的 CDMA 设备"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "任何设备"
 
@@ -273,50 +379,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "确认移动宽带设置"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "(无)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "键入 %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, c-format
-msgid "Certificate in %s"
-msgstr "%s 中的证书"
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "(未知信息)"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "选择"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "取消"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "从文件选择..."
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, c-format
-msgid "Choose a %s Certificate"
-msgstr "选择一个 %s 证书"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, c-format
-msgid "%s certificate _password"
-msgstr "%s 证书密码(_p)"
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "显示密码(_w)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "错误日志中： "
@@ -337,13 +399,27 @@ msgstr "名称"
 msgid "Issued By"
 msgstr "由...发出"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "选择一个 %s 证书"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s 证书密码(_p)"
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "显示密码(_w)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "输入 %s PIN码"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "取消（_C）"
 
@@ -391,390 +467,344 @@ msgstr "次要密码(_S)："
 msgid "_Password:"
 msgstr "密码(_P)："
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 msgid "Click to connect"
 msgstr "点击连接"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "新…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "无"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 位密钥(十六进制或 ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 位密码句"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "动态 WEP (802.1x)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 及 WPA2 个人"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 及 WPA2 企业"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA 及 WPA2 个人"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "访问 Wi-Fi 网络 %s 需要密码或加密密钥。"
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "需要 Wi-Fi 网络认证"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi 网络要求认证"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "创建新的 Wi-Fi 网络"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "新建 Wi-Fi 网络"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "输入您要创建的 Wi-Fi 网络的名称。"
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "连接到隐藏的 Wi-Fi 网络"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "隐藏的 Wi-Fi 网络"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "输入您要连接的隐藏的 Wi-Fi 网络的名称及安全性详细信息。"
 
-#: src/wifi.ui:97
-msgid "Wi-Fi _security"
-msgstr "Wi-Fi 安全性(_s)"
-
-#: src/wifi.ui:129
-msgid "_Network name"
-msgstr "网络名称(_N)"
-
-#: src/wifi.ui:154
-msgid "C_onnection"
-msgstr "连接(_o)"
-
-#: src/wifi.ui:179
-msgid "Wi-Fi _adapter"
-msgstr "Wi-Fi 适配器(_a)"
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s 连接"
-
-#: src/utils/utils.c:544
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "PEM 证书 (*.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "在 802.1X 安全性中不确定的错误 (wpa-eap)"
-
-#: src/wireless-security/eap-method.c:351
-msgid "no CA certificate selected"
-msgstr "没有选择 CA 证书"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "所选的CA证书文件不存在"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "缺少 EAP-FAST PAC 文件"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 msgid "Choose a PAC file"
 msgstr "选择一个 PAC 文件"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC 文件(*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "所有文件"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "匿名"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "已认证"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "两者兼用"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 msgid "Anony_mous identity"
 msgstr "匿名身份(_m)"
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 msgid "PAC _file"
 msgstr "PAC 文件(_f)"
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 msgid "_Inner authentication"
 msgstr "内部认证(_I)"
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允许自动 PAC 配置(_V)"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "缺少 EAP-LEAP 用户名"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "缺少 EAP-LEAP 密码"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 msgid "_Username"
 msgstr "用户名(_U)"
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 msgid "_Password"
 msgstr "密码(_P)"
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "自动"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "版本 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "版本 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 证书(_R)"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 msgid "PEAP _version"
 msgstr "PEAP 版本(_v)"
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "服务器证书名称的后缀。"
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr "域(_d)"
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "缺少 EAP 用户名"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "缺少 EAP 密码"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr "缺少 EAP 客户端私钥密码口令"
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 msgid "P_rivate Key Passphrase"
 msgstr "私钥密码口令(_r)"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 msgid "Sh_ow passphrase"
 msgstr "显示密码(_o)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "缺少 EAP-TLS 身份"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 msgid "no user certificate selected"
 msgstr "没有选择用户证书"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "选择用户证书文件不存在"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "没有选择的关键"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "选择的关键文件不存在"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 msgid "I_dentity"
 msgstr "身份(_d)"
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (no EAP)"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "未知错误验证 802.1X 安全性"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "在 802.1X 安全性中不确定的错误 (wpa-eap)"
+
+#: src/nma-ws/nma-eap.c:348
+msgid "no CA certificate selected"
+msgstr "没有选择 CA 证书"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "所选的CA证书文件不存在"
+
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "FAST"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "隧道 TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "受保护的 EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "未知"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr "外部配置"
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 msgid "Au_thentication"
 msgstr "认证(_t)"
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "缺少 leap 用户名"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "缺少 leap 密码"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "缺少 EAP 密码"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 msgid "_Type"
 msgstr "类型(_T)"
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "缺少 wep-key"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "无效的 wep-key：%zu 长度的密钥只能包含十六进制数字"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "无效的 wep-key：%zu 长度的密钥只能包含 ASCII 字符"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -783,39 +813,39 @@ msgstr ""
 "无效的 wep-key：错误的密钥长度%zu。密钥必须由长度 5/13 (ASCII) 或 10/26 (十六"
 "进制)组成"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "无效的 wep-key：密码必须非空"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "无效的 wep-key：密码必须少于64个字符"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "开放式系统"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "共享密钥"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (默认)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 msgid "_Key"
 msgstr "密钥(_K)"
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "显示密钥(_W)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 msgid "WEP inde_x"
 msgstr "WEP 索引(_x)"
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -823,10 +853,44 @@ msgid ""
 msgstr ""
 "无效的 wpa-psk：无效的密钥长度 %zu。必须是 [8,63] 字节或 64 个十六进制数字"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "无效的 wpa-psk：不能用 64 个字节作为十六进制解释密钥"
 
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "未知错误验证 802.1X 安全性"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s 连接"
+
+#: src/utils/utils.c:535
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "PEM 证书 (*.pem, *.crt, *.cer)"
+
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER，PEM 或 PKCS#12 私钥 (*.der, *.pem, *.p12, *.key)"
+
+#: src/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi 安全性(_s)"
+
+#: src/wifi.ui:129
+msgid "_Network name"
+msgstr "网络名称(_N)"
+
+#: src/wifi.ui:154
+msgid "C_onnection"
+msgstr "连接(_o)"
+
+#: src/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi 适配器(_a)"
+
 #~ msgid "Manage your network connections"
 #~ msgstr "管理网络连接"
 
@@ -842,71 +906,6 @@ msgstr "无效的 wpa-psk：不能用 64 个字节作为十六进制解释密钥
 #~ msgid "preferences-system-network"
 #~ msgstr "preferences-system-network"
 
-#~ msgid "Disable connected notifications"
-#~ msgstr "禁用连接通知"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "将此项设为 true 以禁用连接到一个网络时显示的通知。"
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "禁用断开通知"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr "将此项设为 true 以禁用从一个网络断开时显示的通知。"
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "禁用 VPN 通知"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr "将此项设为 true 以禁用连接或断开 VPN 时的通知。"
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "禁用网络可用通知"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "将此项设为 true 以禁用无线网络可用时显示的通知。"
-
-#~ msgid "Stamp"
-#~ msgstr "时间戳"
-
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "用于决定设置是否应被迁移至一个新版本。"
-
-#~ msgid "Disable WiFi Create"
-#~ msgstr "禁用 Wi-Fi 创建"
-
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr "设为 true 以禁止使用小程序时创建 adhoc 网络。"
-
-#~ msgid "Show the applet in notification area"
-#~ msgstr "在通知区域显示小程序图标"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr "设为 FALSE 以禁止小程序图标在通知区域显示。"
-
-#~ msgid "Ignore CA certificate"
-#~ msgstr "忽略 CA 证书"
-
-#~ 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 phase 2 of "
-#~ "EAP authentication."
-#~ msgstr "将此项设为 true 以禁用在 EAP 认证第 2 阶段中关于 CA 证书的警告。"
-
 #~ msgid "NetworkManager"
 #~ msgstr "网络管理器"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index dab6cb9e..e3a8c203 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet 0.9.8\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2014-08-30 18:45+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
@@ -24,6 +24,84 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.6.5\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "停止已連線的通知"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "將這設為 True，以停用網絡連線時的通知。"
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "停止已離線的通知"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "將這設為 True，以停用網絡離線時的通知。"
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "停用 VPN 的通知"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "將這設為 True，以停用 VPN 線或離線時的通知。"
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "停止可用網絡的通知"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "將這設為 True，以停用有 Wi-Fi 無線網絡可用時的通知。"
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "戳記"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "用來決定設定是不是要轉移到新版本上。"
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "禁止建立 Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr "將這設為 True，以停用使用面板程式建立 Ad hoc 網絡。"
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "在通知區域顯示面板程式"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "設定為 FALSE 來停用在通知區域示顯示面板程式的功能。"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "忽略 CA 證書"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "將這設為 True，以停用在 EAP 認證中關於 CA 證書的警告。"
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "將這設為 True，以停用在 EAP 認證第二階段中關於 CA 證書的警告。"
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -70,44 +148,75 @@ msgstr "密碼："
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(無)"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A 證書："
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "不明"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "不需要 CA 證書(_R)"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "選擇 CA 憑證"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "私密密碼匙(_K)："
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "私密密碼匙密碼(_P)："
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "選擇 CA 憑證"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "使用者證書(_U)："
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "顯示密碼(_W)"
 
@@ -119,36 +228,36 @@ msgstr "預設"
 msgid "My country is not listed"
 msgstr "我的國家並沒有列出來"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "未列出的"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "我的計劃沒有列出…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "供應商"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "已安裝的 GSM 裝置"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "已安裝的 CDMA 裝置"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "任何裝置"
 
@@ -276,52 +385,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "確認流動寬頻設定"
 
-#: src/nma-cert-chooser-button.c:153
-#, fuzzy
-msgid "(None)"
-msgstr "(無)"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "C_A 證書："
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-#, fuzzy
-msgid "(Unknown)"
-msgstr "不明"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr ""
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr ""
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "選擇 CA 憑證"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "使用者證書(_U)："
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "顯示密碼(_W)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr ""
@@ -344,13 +407,27 @@ msgstr "名稱"
 msgid "Issued By"
 msgstr ""
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "選擇 CA 憑證"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "使用者證書(_U)："
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "顯示密碼(_W)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr ""
 
@@ -403,538 +480,460 @@ msgstr "第二密碼(_S)："
 msgid "_Password:"
 msgstr "密碼(_P)："
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "斷線"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr ""
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "沒有"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-位元 密碼匙 (Hex 或 ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-位元 密語"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "動態 WEP (802.1X)"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 個人版"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 企業版"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 個人版"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "需要密碼或是加密密碼匙來存取 Wi-Fi 網絡「%s」。"
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi 網絡連線需要驗證"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi 網絡連線需要驗證"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "建立新的 Wi-Fi 網絡"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "新的 Wi-Fi 網絡"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "輸入你要建立的 Wi-Fi 網絡的名稱。"
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "連接到隱藏的 Wi-Fi 網絡"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "隱藏的 Wi-Fi 網絡"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "輸入你要連接的隱藏 Wi-Fi 網絡的名稱與安全性詳細資料。"
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Wi-Fi 安全性(_S)："
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "網絡名稱(_N)："
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "連線(_N)："
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Wi-Fi 介面卡(_A)："
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s 連線"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER 或 PEM 證書 (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr ""
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "不需要 CA 證書(_R)"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "選擇一個 PAC 檔案…"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "所有檔案"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "匿名"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "已驗證"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "兩者"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "匿名識別(_M)："
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC 檔案(_F)："
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "內部驗證(_I)："
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允許自動供應 PAC (_V)"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "使用者名稱(_U)："
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "密碼(_P)："
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "自動"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "版本 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "版本 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 證書(_R)"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP 版本(_V)："
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-位元 密語"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "顯示密碼(_O)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "不需要 CA 證書(_R)"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "識別(_D)："
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "不需要 CA 證書(_R)"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "快"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "穿隧式 TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "保護式 EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "不明"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "驗證(_E)："
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "私密密碼匙密碼(_P)："
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "類型(_T)："
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, 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:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, 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:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, 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:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "開放系統"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "共享密碼匙"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (預設值)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "密碼匙(_K)："
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "顯示密碼匙(_W)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X)："
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, 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:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "Manage your network connections"
-#~ msgstr "管理你的網絡連線"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "啟用網絡連線"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "管理與更改你的連線設定值"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "停止已連線的通知"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "將這設為 True，以停用網絡連線時的通知。"
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "停止已離線的通知"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr "將這設為 True，以停用網絡離線時的通知。"
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "停用 VPN 的通知"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr "將這設為 True，以停用 VPN 線或離線時的通知。"
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "停止可用網絡的通知"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr ""
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "將這設為 True，以停用有 Wi-Fi 無線網絡可用時的通知。"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s 連線"
 
-#~ msgid "Stamp"
-#~ msgstr "戳記"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER 或 PEM 證書 (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "用來決定設定是不是要轉移到新版本上。"
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER、PEM 或是 PKCS#12 私人密碼匙 (*.der, *.pem, *.p12, *.key)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "禁止建立 Wi-Fi"
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi 安全性(_S)："
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr "將這設為 True，以停用使用面板程式建立 Ad hoc 網絡。"
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "網絡名稱(_N)："
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "在通知區域顯示面板程式"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "連線(_N)："
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr "設定為 FALSE 來停用在通知區域示顯示面板程式的功能。"
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi 介面卡(_A)："
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "忽略 CA 證書"
+#~ msgid "Manage your network connections"
+#~ msgstr "管理你的網絡連線"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr "將這設為 True，以停用在 EAP 認證中關於 CA 證書的警告。"
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "啟用網絡連線"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr "將這設為 True，以停用在 EAP 認證第二階段中關於 CA 證書的警告。"
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "管理與更改你的連線設定值"
 
 #, fuzzy
 #~ msgid "NetworkManager"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7e2284c5..2357c439 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libnma/\n";
-"POT-Creation-Date: 2019-11-04 13:46+0100\n"
+"POT-Creation-Date: 2020-03-06 11:41+0100\n"
 "PO-Revision-Date: 2017-11-07 06:45+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata zanata org>\n"
 "Language-Team: Traditional Chinese <zh-l10n lists linux org tw>\n"
@@ -24,6 +24,84 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.3.2\n"
 
+#: org.gnome.nm-applet.gschema.xml.in:6
+msgid "Disable connected notifications"
+msgstr "停止已連線的通知"
+
+#: org.gnome.nm-applet.gschema.xml.in:7
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "將這設為 True，以停用網路連線時的通知。"
+
+#: org.gnome.nm-applet.gschema.xml.in:11
+msgid "Disable disconnected notifications"
+msgstr "停止已離線的通知"
+
+#: org.gnome.nm-applet.gschema.xml.in:12
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "將這設為 True，以停用網路離線時的通知。"
+
+#: org.gnome.nm-applet.gschema.xml.in:16
+msgid "Disable VPN notifications"
+msgstr "停用 VPN 的通知"
+
+#: org.gnome.nm-applet.gschema.xml.in:17
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "將這設為 True，以停用 VPN 線或離線時的通知。"
+
+#: org.gnome.nm-applet.gschema.xml.in:21
+msgid "Suppress networks available notifications"
+msgstr "停止可用網路的通知"
+
+#: org.gnome.nm-applet.gschema.xml.in:22
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "將這設為 True，以停用有 Wi-Fi 無線網路可用時的通知。"
+
+#: org.gnome.nm-applet.gschema.xml.in:26
+msgid "Stamp"
+msgstr "戳記"
+
+#: org.gnome.nm-applet.gschema.xml.in:27
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "用來決定設定是不是要轉移到新版本上。"
+
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
+msgstr "禁止建立 Wi-Fi"
+
+#: org.gnome.nm-applet.gschema.xml.in:32
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr "將這設為 True，以停用使用面板程式建立 Ad hoc 網路。"
+
+#: org.gnome.nm-applet.gschema.xml.in:36
+msgid "Show the applet in notification area"
+msgstr "在通知區域顯示面板程式"
+
+#: org.gnome.nm-applet.gschema.xml.in:37
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr "設定為 FALSE 來停用在通知區域示顯示面板程式的功能。"
+
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
+msgid "Ignore CA certificate"
+msgstr "忽略 CA 憑證"
+
+#: org.gnome.nm-applet.gschema.xml.in:44
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr "將這設為 True，以停用在 EAP 認證中關於 CA 證書的警告。"
+
+#: org.gnome.nm-applet.gschema.xml.in:49
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr "將這設為 True，以停用在 EAP 認證第二階段中關於 CA 證書的警告。"
+
 #: shared/nm-utils/nm-shared-utils.c:793
 #, c-format
 msgid "object class '%s' has no property named '%s'"
@@ -70,44 +148,73 @@ msgstr "密碼："
 msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
 
-#: src/nma-file-cert-chooser.c:101 src/nma-pkcs11-cert-chooser.c:139
+#: src/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "（無）"
+
+#: src/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "鍵入 %s"
+
+#: src/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A 憑證："
+
+#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "（不明）"
+
+#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "選擇"
+
+#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "取消"
+
+#: src/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "從文件中選擇..."
+
+#: src/nma-file-cert-chooser.c:113 src/nma-pkcs11-cert-chooser.c:139
 #, fuzzy
 msgid "No certificate set"
 msgstr "不需要 CA 憑證(_R)"
 
-#: src/nma-file-cert-chooser.c:119 src/nma-pkcs11-cert-chooser.c:163
+#: src/nma-file-cert-chooser.c:131 src/nma-pkcs11-cert-chooser.c:163
 msgid "No key set"
 msgstr "沒有按鍵設置"
 
-#: src/nma-file-cert-chooser.c:239 src/nma-pkcs11-cert-chooser.c:369
+#: src/nma-file-cert-chooser.c:288 src/nma-pkcs11-cert-chooser.c:369
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "選擇 CA 憑證"
 
-#: src/nma-file-cert-chooser.c:243 src/nma-pkcs11-cert-chooser.c:373
+#: src/nma-file-cert-chooser.c:292 src/nma-pkcs11-cert-chooser.c:373
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "私密金鑰(_K)："
 
-#: src/nma-file-cert-chooser.c:247 src/nma-pkcs11-cert-chooser.c:377
+#: src/nma-file-cert-chooser.c:296 src/nma-pkcs11-cert-chooser.c:377
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "私密金鑰密碼(_P)："
 
-#: src/nma-file-cert-chooser.c:251
+#: src/nma-file-cert-chooser.c:300
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "選擇 CA 憑證"
 
-#: src/nma-file-cert-chooser.c:255 src/nma-pkcs11-cert-chooser.c:385
+#: src/nma-file-cert-chooser.c:304 src/nma-pkcs11-cert-chooser.c:385
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "使用者憑證(_U)："
 
-#: src/nma-file-cert-chooser.c:340 src/wireless-security/eap-method-leap.ui:60
-#: src/wireless-security/eap-method-simple.ui:77
-#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-sae.ui:60
-#: src/wireless-security/ws-wpa-psk.ui:60
+#: src/nma-file-cert-chooser.c:389 src/nma-ws/nma-eap-leap.ui:54
+#: src/nma-ws/nma-eap-simple.ui:71 src/nma-ws/nma-ws-leap.ui:55
+#: src/nma-ws/nma-ws-sae.ui:56 src/nma-ws/nma-ws-wpa-psk.ui:55
 msgid "Sho_w password"
 msgstr "顯示密碼(_W)"
 
@@ -119,36 +226,36 @@ msgstr "預設"
 msgid "My country is not listed"
 msgstr "我的國家並沒有列出來"
 
-#: src/nma-mobile-wizard.c:139
+#: src/nma-mobile-wizard.c:141
 msgid "GSM"
 msgstr "GSM"
 
-#: src/nma-mobile-wizard.c:142
+#: src/nma-mobile-wizard.c:144
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/nma-mobile-wizard.c:247 src/nma-mobile-wizard.c:279
+#: src/nma-mobile-wizard.c:249 src/nma-mobile-wizard.c:281
 msgid "Unlisted"
 msgstr "未列出的"
 
-#: src/nma-mobile-wizard.c:479
+#: src/nma-mobile-wizard.c:481
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "我的方案沒有列出…"
 
-#: src/nma-mobile-wizard.c:651
+#: src/nma-mobile-wizard.c:653
 msgid "Provider"
 msgstr "供應商"
 
-#: src/nma-mobile-wizard.c:1023
+#: src/nma-mobile-wizard.c:1025
 msgid "Installed GSM device"
 msgstr "已安裝的 GSM 裝置"
 
-#: src/nma-mobile-wizard.c:1026
+#: src/nma-mobile-wizard.c:1028
 msgid "Installed CDMA device"
 msgstr "已安裝的 CDMA 裝置"
 
-#: src/nma-mobile-wizard.c:1231
+#: src/nma-mobile-wizard.c:1233
 msgid "Any device"
 msgstr "任何裝置"
 
@@ -276,50 +383,6 @@ msgstr ""
 msgid "Confirm Mobile Broadband Settings"
 msgstr "確認行動寬頻設定"
 
-#: src/nma-cert-chooser-button.c:153
-msgid "(None)"
-msgstr "（無）"
-
-#: src/nma-cert-chooser-button.c:161
-#, c-format
-msgid "Key in %s"
-msgstr "鍵入 %s"
-
-#: src/nma-cert-chooser-button.c:162
-#, fuzzy, c-format
-msgid "Certificate in %s"
-msgstr "C_A 憑證："
-
-#: src/nma-cert-chooser-button.c:181 src/nma-pkcs11-cert-chooser-dialog.c:169
-msgid "(Unknown)"
-msgstr "（不明）"
-
-#: src/nma-cert-chooser-button.c:203 src/nma-cert-chooser-button.c:233
-msgid "Select"
-msgstr "選擇"
-
-#: src/nma-cert-chooser-button.c:204 src/nma-cert-chooser-button.c:234
-msgid "Cancel"
-msgstr "取消"
-
-#: src/nma-cert-chooser-button.c:460
-msgid "Select from file…"
-msgstr "從文件中選擇..."
-
-#: src/nma-pkcs11-cert-chooser.c:381
-#, fuzzy, c-format
-msgid "Choose a %s Certificate"
-msgstr "選擇 CA 憑證"
-
-#: src/nma-pkcs11-cert-chooser.c:389
-#, fuzzy, c-format
-msgid "%s certificate _password"
-msgstr "使用者憑證(_U)："
-
-#: src/nma-pkcs11-cert-chooser.c:441
-msgid "Sho_w passwords"
-msgstr "顯示密碼(_W)"
-
 #: src/nma-pkcs11-cert-chooser-dialog.c:241
 msgid "Error logging in: "
 msgstr "登錄時出錯： "
@@ -342,13 +405,27 @@ msgstr "名稱"
 msgid "Issued By"
 msgstr "由...發出"
 
+#: src/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "選擇 CA 憑證"
+
+#: src/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "使用者憑證(_U)："
+
+#: src/nma-pkcs11-cert-chooser.c:441
+msgid "Sho_w passwords"
+msgstr "顯示密碼(_W)"
+
 #: src/nma-pkcs11-token-login-dialog.c:132
 #, c-format
 msgid "Enter %s PIN"
 msgstr "輸入 %s 銷"
 
 #: src/nma-pkcs11-token-login-dialog.ui:19 src/nma-vpn-password-dialog.ui:23
-#: src/nma-wifi-dialog.c:1115
+#: src/nma-wifi-dialog.c:1107
 msgid "_Cancel"
 msgstr "取消 (_C)"
 
@@ -400,411 +477,360 @@ msgstr "第二密碼(_S)："
 msgid "_Password:"
 msgstr "密碼(_P)："
 
-#: src/nma-wifi-dialog.c:114
+#: src/nma-wifi-dialog.c:117
 #, fuzzy
 msgid "Click to connect"
 msgstr "斷線"
 
-#: src/nma-wifi-dialog.c:445
+#: src/nma-wifi-dialog.c:448
 msgid "New…"
 msgstr "新…"
 
-#: src/nma-wifi-dialog.c:923
+#: src/nma-wifi-dialog.c:929
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "沒有"
 
-#: src/nma-wifi-dialog.c:940
+#: src/nma-wifi-dialog.c:945
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-位元 金鑰 (Hex 或 ASCII)"
 
-#: src/nma-wifi-dialog.c:949
+#: src/nma-wifi-dialog.c:952
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-位元 密語"
 
-#: src/nma-wifi-dialog.c:966 src/wireless-security/wireless-security.c:435
+#: src/nma-wifi-dialog.c:967 src/nma-ws/nma-ws-802-1x.c:370
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/nma-wifi-dialog.c:979
+#: src/nma-wifi-dialog.c:978
 msgid "Dynamic WEP (802.1x)"
 msgstr "動態 WEP（802.1x）"
 
-#: src/nma-wifi-dialog.c:993
+#: src/nma-wifi-dialog.c:990
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 個人版"
 
-#: src/nma-wifi-dialog.c:1011
+#: src/nma-wifi-dialog.c:1006
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 企業版"
 
-#: src/nma-wifi-dialog.c:1024
+#: src/nma-wifi-dialog.c:1017
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 個人版"
 
-#: src/nma-wifi-dialog.c:1119
+#: src/nma-wifi-dialog.c:1111
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: src/nma-wifi-dialog.c:1121
+#: src/nma-wifi-dialog.c:1113
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: src/nma-wifi-dialog.c:1199
+#: src/nma-wifi-dialog.c:1191
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "需要密碼或是加密金鑰來存取 Wi-Fi 網路「%s」。"
 
-#: src/nma-wifi-dialog.c:1201
+#: src/nma-wifi-dialog.c:1193
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi 網路連線需要驗證"
 
-#: src/nma-wifi-dialog.c:1203
+#: src/nma-wifi-dialog.c:1195
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi 網路連線需要驗證"
 
-#: src/nma-wifi-dialog.c:1208
+#: src/nma-wifi-dialog.c:1200
 msgid "Create New Wi-Fi Network"
 msgstr "建立新的 Wi-Fi 網路"
 
-#: src/nma-wifi-dialog.c:1210
+#: src/nma-wifi-dialog.c:1202
 msgid "New Wi-Fi network"
 msgstr "新的 Wi-Fi 網路"
 
-#: src/nma-wifi-dialog.c:1211
+#: src/nma-wifi-dialog.c:1203
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "輸入您要建立的 Wi-Fi 網路的名稱。"
 
-#: src/nma-wifi-dialog.c:1213
+#: src/nma-wifi-dialog.c:1205
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "連接到隱藏的 Wi-Fi 網路"
 
-#: src/nma-wifi-dialog.c:1215
+#: src/nma-wifi-dialog.c:1207
 msgid "Hidden Wi-Fi network"
 msgstr "隱藏的 Wi-Fi 網路"
 
-#: src/nma-wifi-dialog.c:1216
+#: src/nma-wifi-dialog.c:1208
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "輸入您要連接的隱藏 Wi-Fi 網路的名稱與安全性詳細資料。"
 
-#: src/wifi.ui:97
-#, fuzzy
-msgid "Wi-Fi _security"
-msgstr "Wi-Fi 安全性(_S)："
-
-#: src/wifi.ui:129
-#, fuzzy
-msgid "_Network name"
-msgstr "網路名稱(_N)："
-
-#: src/wifi.ui:154
-#, fuzzy
-msgid "C_onnection"
-msgstr "連線(_N)："
-
-#: src/wifi.ui:179
-#, fuzzy
-msgid "Wi-Fi _adapter"
-msgstr "Wi-Fi 介面卡(_A)："
-
-#. The %s is a mobile provider name, eg "T-Mobile"
-#: src/utils/utils.c:170
-#, c-format
-msgid "%s connection"
-msgstr "%s 連線"
-
-#: src/utils/utils.c:544
-#, fuzzy
-msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
-
-#: src/utils/utils.c:556
-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:43
-msgid "undefined error in 802.1X security (wpa-eap)"
-msgstr "802.1X安全性中的未定義錯誤（wpa-eap）"
-
-#: src/wireless-security/eap-method.c:351
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "不需要 CA 憑證(_R)"
-
-#: src/wireless-security/eap-method.c:356
-msgid "selected CA certificate file does not exist"
-msgstr "選定的CA證書文件不存在"
-
-#: src/wireless-security/eap-method-fast.c:59
+#: src/nma-ws/nma-eap-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "缺少EAP-FAST PAC文件"
 
-#: src/wireless-security/eap-method-fast.c:256
-#: src/wireless-security/eap-method-peap.c:319
-#: src/wireless-security/eap-method-ttls.c:373
+#: src/nma-ws/nma-eap-fast.c:256 src/nma-ws/nma-eap-peap.c:312
+#: src/nma-ws/nma-eap-ttls.c:366
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:272
-#: src/wireless-security/eap-method-peap.c:287
-#: src/wireless-security/eap-method-ttls.c:307
+#: src/nma-ws/nma-eap-fast.c:272 src/nma-ws/nma-eap-peap.c:280
+#: src/nma-ws/nma-eap-ttls.c:300
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-fast.c:395
+#: src/nma-ws/nma-eap-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "選擇一個 PAC 檔案…"
 
-#: src/wireless-security/eap-method-fast.c:402
+#: src/nma-ws/nma-eap-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:406
+#: src/nma-ws/nma-eap-fast.c:406
 msgid "All files"
 msgstr "所有檔案"
 
-#: src/wireless-security/eap-method-fast.ui:23
+#: src/nma-ws/nma-eap-fast.ui:23
 msgid "Anonymous"
 msgstr "匿名"
 
-#: src/wireless-security/eap-method-fast.ui:26
+#: src/nma-ws/nma-eap-fast.ui:26
 msgid "Authenticated"
 msgstr "已驗證"
 
-#: src/wireless-security/eap-method-fast.ui:29
+#: src/nma-ws/nma-eap-fast.ui:29
 msgid "Both"
 msgstr "兩者"
 
-#: src/wireless-security/eap-method-fast.ui:48
-#: src/wireless-security/eap-method-peap.ui:48
-#: src/wireless-security/eap-method-ttls.ui:119
+#: src/nma-ws/nma-eap-fast.ui:42 src/nma-ws/nma-eap-peap.ui:42
+#: src/nma-ws/nma-eap-ttls.ui:113
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "匿名識別(_M)："
 
-#: src/wireless-security/eap-method-fast.ui:74
+#: src/nma-ws/nma-eap-fast.ui:68
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC 檔案(_F)："
 
-#: src/wireless-security/eap-method-fast.ui:113
-#: src/wireless-security/eap-method-peap.ui:121
-#: src/wireless-security/eap-method-ttls.ui:77
+#: src/nma-ws/nma-eap-fast.ui:107 src/nma-ws/nma-eap-peap.ui:115
+#: src/nma-ws/nma-eap-ttls.ui:71
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "內部驗證(_I)："
 
-#: src/wireless-security/eap-method-fast.ui:142
+#: src/nma-ws/nma-eap-fast.ui:136
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允許自動供應 PAC (_V)"
 
-#: src/wireless-security/eap-method-leap.c:53
+#: src/nma-ws/nma-eap-leap.c:55
 msgid "missing EAP-LEAP username"
 msgstr "缺少EAP-LEAP用戶名"
 
-#: src/wireless-security/eap-method-leap.c:62
+#: src/nma-ws/nma-eap-leap.c:64
 msgid "missing EAP-LEAP password"
 msgstr "缺少EAP-LEAP密碼"
 
-#: src/wireless-security/eap-method-leap.ui:21
-#: src/wireless-security/eap-method-simple.ui:21
-#: src/wireless-security/ws-leap.ui:21
+#: src/nma-ws/nma-eap-leap.ui:15 src/nma-ws/nma-eap-simple.ui:15
+#: src/nma-ws/nma-ws-leap.ui:15
 #, fuzzy
 msgid "_Username"
 msgstr "使用者名稱(_U)："
 
-#: src/wireless-security/eap-method-leap.ui:35
-#: src/wireless-security/eap-method-simple.ui:35
-#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-sae.ui:20
-#: src/wireless-security/ws-wpa-psk.ui:20
+#: src/nma-ws/nma-eap-leap.ui:29 src/nma-ws/nma-eap-simple.ui:29
+#: src/nma-ws/nma-ws-leap.ui:29 src/nma-ws/nma-ws-sae.ui:14
+#: src/nma-ws/nma-ws-wpa-psk.ui:14
 #, fuzzy
 msgid "_Password"
 msgstr "密碼(_P)："
 
-#: src/wireless-security/eap-method-peap.c:303
-#: src/wireless-security/eap-method-ttls.c:357
-#: src/wireless-security/wireless-security.c:411
+#: src/nma-ws/nma-eap-peap.c:296 src/nma-ws/nma-eap-ttls.c:350
+#: src/nma-ws/nma-ws-802-1x.c:346
 msgid "MD5"
 msgstr "MD5"
 
-#: src/wireless-security/eap-method-peap.ui:23
+#: src/nma-ws/nma-eap-peap.ui:23
 msgid "Automatic"
 msgstr "自動"
 
-#: src/wireless-security/eap-method-peap.ui:26
+#: src/nma-ws/nma-eap-peap.ui:26
 msgid "Version 0"
 msgstr "版本 0"
 
-#: src/wireless-security/eap-method-peap.ui:29
+#: src/nma-ws/nma-eap-peap.ui:29
 msgid "Version 1"
 msgstr "版本 1"
 
-#: src/wireless-security/eap-method-peap.ui:72
-#: src/wireless-security/eap-method-tls.ui:44
-#: src/wireless-security/eap-method-ttls.ui:89
+#: src/nma-ws/nma-eap-peap.ui:66 src/nma-ws/nma-eap-tls.ui:38
+#: src/nma-ws/nma-eap-ttls.ui:83
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 憑證(_R)"
 
-#: src/wireless-security/eap-method-peap.ui:89
+#: src/nma-ws/nma-eap-peap.ui:83
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP 版本(_V)："
 
-#: src/wireless-security/eap-method-peap.ui:168
-#: src/wireless-security/eap-method-tls.ui:62
-#: src/wireless-security/eap-method-ttls.ui:133
+#: src/nma-ws/nma-eap-peap.ui:162 src/nma-ws/nma-eap-tls.ui:56
+#: src/nma-ws/nma-eap-ttls.ui:127
 msgid "Suffix of the server certificate name."
 msgstr "服務器證書名稱的後綴。"
 
-#: src/wireless-security/eap-method-peap.ui:169
-#: src/wireless-security/eap-method-tls.ui:63
-#: src/wireless-security/eap-method-ttls.ui:134
+#: src/nma-ws/nma-eap-peap.ui:163 src/nma-ws/nma-eap-tls.ui:57
+#: src/nma-ws/nma-eap-ttls.ui:128
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:77
+#: src/nma-ws/nma-eap-simple.c:79
 msgid "missing EAP username"
 msgstr "缺少EAP用戶名"
 
-#: src/wireless-security/eap-method-simple.c:93
+#: src/nma-ws/nma-eap-simple.c:95
 msgid "missing EAP password"
 msgstr "缺少EAP密碼"
 
-#: src/wireless-security/eap-method-simple.c:107
+#: src/nma-ws/nma-eap-simple.c:109
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.ui:103
+#: src/nma-ws/nma-eap-simple.ui:97
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-位元 密語"
 
-#: src/wireless-security/eap-method-simple.ui:128
+#: src/nma-ws/nma-eap-simple.ui:122
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "顯示密碼(_O)"
 
-#: src/wireless-security/eap-method-tls.c:51
+#: src/nma-ws/nma-eap-tls.c:47
 msgid "missing EAP-TLS identity"
 msgstr "缺少EAP-TLS身份"
 
-#: src/wireless-security/eap-method-tls.c:243
+#: src/nma-ws/nma-eap-tls.c:234
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "不需要 CA 憑證(_R)"
 
-#: src/wireless-security/eap-method-tls.c:248
+#: src/nma-ws/nma-eap-tls.c:239
 msgid "selected user certificate file does not exist"
 msgstr "選定的用戶證書文件不存在"
 
-#: src/wireless-security/eap-method-tls.c:268
+#: src/nma-ws/nma-eap-tls.c:259
 msgid "no key selected"
 msgstr "沒有選擇密鑰"
 
-#: src/wireless-security/eap-method-tls.c:273
+#: src/nma-ws/nma-eap-tls.c:264
 msgid "selected key file does not exist"
 msgstr "選定的密鑰文件不存在"
 
-#: src/wireless-security/eap-method-tls.ui:20
+#: src/nma-ws/nma-eap-tls.ui:14
 #, fuzzy
 msgid "I_dentity"
 msgstr "識別(_D)："
 
-#: src/wireless-security/eap-method-ttls.c:275
+#: src/nma-ws/nma-eap-ttls.c:268
 msgid "PAP"
 msgstr "PAP"
 
-#: src/wireless-security/eap-method-ttls.c:291
+#: src/nma-ws/nma-eap-ttls.c:284
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: src/wireless-security/eap-method-ttls.c:324
+#: src/nma-ws/nma-eap-ttls.c:317
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: src/wireless-security/eap-method-ttls.c:341
+#: src/nma-ws/nma-eap-ttls.c:334
 msgid "CHAP"
 msgstr "CHAP"
 
-#: src/wireless-security/wireless-security.c:58
-msgid "Unknown error validating 802.1X security"
-msgstr "驗證802.1X安全性的未知錯誤"
+#: src/nma-ws/nma-eap.c:40
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr "802.1X安全性中的未定義錯誤（wpa-eap）"
+
+#: src/nma-ws/nma-eap.c:348
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "不需要 CA 憑證(_R)"
+
+#: src/nma-ws/nma-eap.c:353
+msgid "selected CA certificate file does not exist"
+msgstr "選定的CA證書文件不存在"
 
-#: src/wireless-security/wireless-security.c:423
+#: src/nma-ws/nma-ws-802-1x.c:358
 msgid "TLS"
 msgstr "TLS"
 
-#: src/wireless-security/wireless-security.c:447
+#: src/nma-ws/nma-ws-802-1x.c:382
 msgid "PWD"
 msgstr "PWD"
 
-#: src/wireless-security/wireless-security.c:458
+#: src/nma-ws/nma-ws-802-1x.c:393
 msgid "FAST"
 msgstr "快"
 
-#: src/wireless-security/wireless-security.c:469
+#: src/nma-ws/nma-ws-802-1x.c:404
 msgid "Tunneled TLS"
 msgstr "穿隧式 TLS"
 
-#: src/wireless-security/wireless-security.c:480
+#: src/nma-ws/nma-ws-802-1x.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "保護式 EAP (PEAP)"
 
-#: src/wireless-security/wireless-security.c:495
+#: src/nma-ws/nma-ws-802-1x.c:430
 msgid "Unknown"
 msgstr "不明"
 
-#: src/wireless-security/wireless-security.c:509
+#: src/nma-ws/nma-ws-802-1x.c:444
 msgid "Externally configured"
 msgstr ""
 
-#: src/wireless-security/ws-dynamic-wep.ui:31
-#: src/wireless-security/ws-wep-key.ui:97
-#: src/wireless-security/ws-wpa-eap.ui:31
+#: src/nma-ws/nma-ws-802-1x.ui:25 src/nma-ws/nma-ws-wep-key.ui:95
 #, fuzzy
 msgid "Au_thentication"
 msgstr "驗證(_E)："
 
-#: src/wireless-security/ws-leap.c:51
+#: src/nma-ws/nma-ws-leap.c:71
 msgid "missing leap-username"
 msgstr "缺少leap-username"
 
-#: src/wireless-security/ws-leap.c:69
+#: src/nma-ws/nma-ws-leap.c:87
 msgid "missing leap-password"
 msgstr "缺少飛躍密碼"
 
-#: src/wireless-security/ws-sae.c:57
+#: src/nma-ws/nma-ws-sae.c:73
 #, fuzzy
 msgid "missing password"
 msgstr "缺少EAP密碼"
 
-#: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48
+#: src/nma-ws/nma-ws-sae.ui:44 src/nma-ws/nma-ws-wpa-psk.ui:43
 #, fuzzy
 msgid "_Type"
 msgstr "類型(_T)："
 
-#: src/wireless-security/ws-wep-key.c:100
+#: src/nma-ws/nma-ws-wep-key.c:110
 msgid "missing wep-key"
 msgstr "缺少wep-key"
 
-#: src/wireless-security/ws-wep-key.c:107
+#: src/nma-ws/nma-ws-wep-key.c:117
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "無效的wep-key：密鑰長度為 %zu 必須只包含十六進制數字"
 
-#: src/wireless-security/ws-wep-key.c:115
+#: src/nma-ws/nma-ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "無效的wep-key：密鑰長度為 %zu 必須只包含ascii字符"
 
-#: src/wireless-security/ws-wep-key.c:121
+#: src/nma-ws/nma-ws-wep-key.c:131
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -812,41 +838,41 @@ msgid ""
 msgstr ""
 "無效的wep-key：錯誤的密鑰長度 %zu。密鑰長度必須為5/13（ascii）或10/26（hex）"
 
-#: src/wireless-security/ws-wep-key.c:128
+#: src/nma-ws/nma-ws-wep-key.c:138
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "無效的wep-key：passphrase必須是非空的"
 
-#: src/wireless-security/ws-wep-key.c:130
+#: src/nma-ws/nma-ws-wep-key.c:140
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "無效的wep-key：passphrase必須短於64個字符"
 
-#: src/wireless-security/ws-wep-key.ui:12
+#: src/nma-ws/nma-ws-wep-key.ui:12
 msgid "Open System"
 msgstr "開放系統"
 
-#: src/wireless-security/ws-wep-key.ui:15
+#: src/nma-ws/nma-ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "共享金鑰"
 
-#: src/wireless-security/ws-wep-key.ui:26
+#: src/nma-ws/nma-ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (預設值)"
 
-#: src/wireless-security/ws-wep-key.ui:54
+#: src/nma-ws/nma-ws-wep-key.ui:48
 #, fuzzy
 msgid "_Key"
 msgstr "金鑰(_K)："
 
-#: src/wireless-security/ws-wep-key.ui:80
+#: src/nma-ws/nma-ws-wep-key.ui:77
 msgid "Sho_w key"
 msgstr "顯示金鑰(_W)"
 
-#: src/wireless-security/ws-wep-key.ui:129
+#: src/nma-ws/nma-ws-wep-key.ui:128
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X)："
 
-#: src/wireless-security/ws-wpa-psk.c:63
+#: src/nma-ws/nma-ws-wpa-psk.c:80
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -854,85 +880,58 @@ msgid ""
 msgstr ""
 "無效的wpa-psk：無效的密鑰長度 %zu。必須是[8,63]個字節或64個十六進制數字"
 
-#: src/wireless-security/ws-wpa-psk.c:70
+#: src/nma-ws/nma-ws-wpa-psk.c:87
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "無效的wpa-psk：無法將64字節的密鑰解釋為十六進制"
 
-#~ msgid "Manage your network connections"
-#~ msgstr "管理您的網路連線"
-
-#, fuzzy
-#~ msgid "Advanced Network Configuration"
-#~ msgstr "啟用網路連線"
-
-#~ msgid "Manage and change your network connection settings"
-#~ msgstr "管理與變更您的連線設定值"
-
-#~ msgid "Disable connected notifications"
-#~ msgstr "停止已連線的通知"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to a network."
-#~ msgstr "將這設為 True，以停用網路連線時的通知。"
-
-#~ msgid "Disable disconnected notifications"
-#~ msgstr "停止已離線的通知"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when disconnecting from a "
-#~ "network."
-#~ msgstr "將這設為 True，以停用網路離線時的通知。"
-
-#~ msgid "Disable VPN notifications"
-#~ msgstr "停用 VPN 的通知"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when connecting to or "
-#~ "disconnecting from a VPN."
-#~ msgstr "將這設為 True，以停用 VPN 線或離線時的通知。"
-
-#~ msgid "Suppress networks available notifications"
-#~ msgstr "停止可用網路的通知"
+#: src/nma-ws/nma-ws.c:38
+msgid "Unknown error validating 802.1X security"
+msgstr "驗證802.1X安全性的未知錯誤"
 
-#~ msgid ""
-#~ "Set this to true to disable notifications when Wi-Fi networks are "
-#~ "available."
-#~ msgstr "將這設為 True，以停用有 Wi-Fi 無線網路可用時的通知。"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: src/utils/utils.c:161
+#, c-format
+msgid "%s connection"
+msgstr "%s 連線"
 
-#~ msgid "Stamp"
-#~ msgstr "戳記"
+#: src/utils/utils.c:535
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
 
-#~ msgid ""
-#~ "Used to determine whether settings should be migrated to a new version."
-#~ msgstr "用來決定設定是不是要轉移到新版本上。"
+#: src/utils/utils.c:547
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER、PEM 或是 PKCS#12 私人金鑰 (*.der, *.pem, *.p12, *.key)"
 
+#: src/wifi.ui:97
 #, fuzzy
-#~ msgid "Disable WiFi Create"
-#~ msgstr "禁止建立 Wi-Fi"
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi 安全性(_S)："
 
-#~ msgid ""
-#~ "Set to true to disable creation of adhoc networks when using the applet."
-#~ msgstr "將這設為 True，以停用使用面板程式建立 Ad hoc 網路。"
+#: src/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "網路名稱(_N)："
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "在通知區域顯示面板程式"
+#: src/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "連線(_N)："
 
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr "設定為 FALSE 來停用在通知區域示顯示面板程式的功能。"
+#: src/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi 介面卡(_A)："
 
-#~ msgid "Ignore CA certificate"
-#~ msgstr "忽略 CA 憑證"
+#~ msgid "Manage your network connections"
+#~ msgstr "管理您的網路連線"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in EAP "
-#~ "authentication."
-#~ msgstr "將這設為 True，以停用在 EAP 認證中關於 CA 證書的警告。"
+#, fuzzy
+#~ msgid "Advanced Network Configuration"
+#~ msgstr "啟用網路連線"
 
-#~ msgid ""
-#~ "Set this to true to disable warnings about CA certificates in phase 2 of "
-#~ "EAP authentication."
-#~ msgstr "將這設為 True，以停用在 EAP 認證第二階段中關於 CA 證書的警告。"
+#~ msgid "Manage and change your network connection settings"
+#~ msgstr "管理與變更您的連線設定值"
 
 # Tag: title
 #~ msgid "NetworkManager"