[network-manager-applet/lr/libnmicide: 4/4] Revert "libnma: drop"



commit 83b2d6a990b12783fe34ebae456650571e681973
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Mon Oct 14 11:55:43 2019 +0200

    Revert "libnma: drop"
    
    This reverts commit b97239cc42081e024d60e0f8018fb9a158d5e527.

 .gitlab-ci.yml                               |   67 +-
 Makefile.am                                  |  612 +++++++++-
 autogen.sh                                   |    1 +
 configure.ac                                 |  162 ++-
 m4/introspection.m4                          |   93 ++
 meson.build                                  |  188 ++-
 meson_options.txt                            |    6 +
 po/POTFILES.in                               |   17 +
 po/af.po                                     |  826 ++++++++-----
 po/an.po                                     |  905 +++++++++------
 po/ar.po                                     |  932 +++++++++------
 po/as.po                                     |  937 +++++++++------
 po/ast.po                                    |  935 +++++++++------
 po/be.po                                     |  931 +++++++++------
 po/be latin po                               |  819 ++++++++-----
 po/bg.po                                     |  934 +++++++++------
 po/bn_IN.po                                  |  938 +++++++++------
 po/bs.po                                     |  938 +++++++++------
 po/ca.po                                     |  943 ++++++++-------
 po/ca valencia po                            |  942 +++++++++------
 po/crh.po                                    |  926 +++++++++------
 po/cs.po                                     |  930 ++++++++-------
 po/da.po                                     |  948 ++++++++-------
 po/de.po                                     |  956 ++++++++-------
 po/dz.po                                     |  718 +++++++++---
 po/el.po                                     |  949 ++++++++-------
 po/en_CA.po                                  |  690 ++++++++---
 po/en_GB.po                                  |  954 ++++++++-------
 po/eo.po                                     |  904 +++++++++------
 po/es.po                                     |  940 ++++++++-------
 po/et.po                                     |  924 +++++++++------
 po/eu.po                                     |  932 +++++++++------
 po/fa.po                                     |  935 +++++++++------
 po/fi.po                                     |  924 +++++++++------
 po/fr.po                                     |  947 ++++++++-------
 po/gd.po                                     |  952 ++++++++-------
 po/gl.po                                     |  947 ++++++++-------
 po/gu.po                                     |  932 +++++++++------
 po/he.po                                     |  920 +++++++++------
 po/hi.po                                     |  923 +++++++++------
 po/hr.po                                     |  947 ++++++++-------
 po/hu.po                                     |  944 ++++++++-------
 po/id.po                                     |  937 ++++++++-------
 po/is.po                                     |  947 ++++++++-------
 po/it.po                                     |  966 +++++++++-------
 po/ja.po                                     |  931 ++++++++-------
 po/kk.po                                     |  876 ++++++++------
 po/km.po                                     |  917 +++++++++------
 po/kn.po                                     |  947 +++++++++------
 po/ko.po                                     |  960 +++++++++-------
 po/ku.po                                     |  716 +++++++++---
 po/lt.po                                     |  939 ++++++++-------
 po/lv.po                                     |  951 ++++++++-------
 po/mk.po                                     |  944 +++++++++------
 po/ml.po                                     |  924 +++++++++------
 po/mr.po                                     |  926 +++++++++------
 po/ms.po                                     |  942 +++++++++------
 po/nb.po                                     |  935 +++++++++------
 po/ne.po                                     |  718 +++++++++---
 po/nl.po                                     |  967 +++++++++-------
 po/nn.po                                     |  934 +++++++++------
 po/oc.po                                     |  931 +++++++++------
 po/or.po                                     |  935 +++++++++------
 po/pa.po                                     |  919 ++++++++-------
 po/pl.po                                     |  935 ++++++++-------
 po/pt.po                                     |  958 ++++++++-------
 po/pt_BR.po                                  |  941 ++++++++-------
 po/ro.po                                     |  957 +++++++++------
 po/ru.po                                     |  935 ++++++++-------
 po/rw.po                                     |  617 ++++++++--
 po/sk.po                                     |  960 +++++++++-------
 po/sl.po                                     |  941 +++++++++------
 po/sq.po                                     |  613 ++++++++--
 po/sr.po                                     |  942 ++++++++-------
 po/sr latin po                               |  943 ++++++++-------
 po/sv.po                                     |  940 ++++++++-------
 po/ta.po                                     |  947 +++++++++------
 po/te.po                                     |  929 +++++++++------
 po/tg.po                                     |  974 +++++++++-------
 po/th.po                                     |  914 +++++++++------
 po/tr.po                                     |  932 ++++++++-------
 po/ug.po                                     |  929 +++++++++------
 po/uk.po                                     |  932 +++++++++------
 po/ur.po                                     |  951 +++++++++------
 po/vi.po                                     |  927 +++++++++------
 po/wa.po                                     |  628 ++++++++--
 po/zh_CN.po                                  |  914 ++++++++-------
 po/zh_HK.po                                  |  913 +++++++++------
 po/zh_TW.po                                  |  949 ++++++++-------
 src/libnma/init.c                            |   23 +
 src/libnma/libnma-gtk4.pc.in                 |   11 +
 src/libnma/libnma.pc.in                      |   11 +
 src/libnma/libnma.ver                        |  114 ++
 src/libnma/meson.build                       |  186 +++
 src/libnma/nma-bar-code-widget.c             |  462 ++++++++
 src/libnma/nma-bar-code-widget.h             |   43 +
 src/libnma/nma-bar-code-widget.ui            |   45 +
 src/libnma/nma-bar-code.c                    |  222 ++++
 src/libnma/nma-bar-code.h                    |   54 +
 src/libnma/nma-cert-chooser-button.c         |  469 ++++++++
 src/libnma/nma-cert-chooser-button.h         |   59 +
 src/libnma/nma-cert-chooser-private.h        |  143 +++
 src/libnma/nma-cert-chooser.c                |  788 +++++++++++++
 src/libnma/nma-cert-chooser.h                |  151 +++
 src/libnma/nma-file-cert-chooser.c           |  399 +++++++
 src/libnma/nma-mobile-providers.c            | 1600 ++++++++++++++++++++++++++
 src/libnma/nma-mobile-providers.h            |  131 +++
 src/libnma/nma-mobile-wizard.c               | 1560 +++++++++++++++++++++++++
 src/libnma/nma-mobile-wizard.h               |   65 ++
 src/libnma/nma-mobile-wizard.ui              |  604 ++++++++++
 src/libnma/nma-pkcs11-cert-chooser-dialog.c  |  643 +++++++++++
 src/libnma/nma-pkcs11-cert-chooser-dialog.h  |   49 +
 src/libnma/nma-pkcs11-cert-chooser-dialog.ui |  153 +++
 src/libnma/nma-pkcs11-cert-chooser.c         |  559 +++++++++
 src/libnma/nma-pkcs11-token-login-dialog.c   |  236 ++++
 src/libnma/nma-pkcs11-token-login-dialog.h   |   43 +
 src/libnma/nma-pkcs11-token-login-dialog.ui  |  111 ++
 src/libnma/nma-private.h                     |   21 +
 src/libnma/nma-ui-utils.c                    |  432 +++++++
 src/libnma/nma-ui-utils.h                    |   26 +
 src/libnma/nma-version.h.in                  |  119 ++
 src/libnma/nma-vpn-password-dialog.c         |  351 ++++++
 src/libnma/nma-vpn-password-dialog.h         |   85 ++
 src/libnma/nma-vpn-password-dialog.ui        |  222 ++++
 src/libnma/nma-wifi-dialog.c                 | 1559 +++++++++++++++++++++++++
 src/libnma/nma-wifi-dialog.h                 |   69 ++
 src/libnma/nma.gresource.xml                 |   11 +
 src/libnma/qrcodegen.c                       | 1009 ++++++++++++++++
 src/libnma/qrcodegen.h                       |  311 +++++
 src/libnma/tests/bar-code.c                  |  178 +++
 src/libnma/tests/cert-chooser.c              |  104 ++
 src/libnma/tests/meson.build                 |   31 +
 src/libnma/tests/mobile-wizard.c             |   33 +
 src/libnma/tests/run-vpn.c                   |   87 ++
 src/libnma/tests/vpn-password-dialog.c       |   36 +
 src/libnma/tests/wifi-dialog-secrets.c       |  100 ++
 src/libnma/tests/wifi-dialog.c               |   60 +
 src/libnma/wifi.ui                           |  215 ++++
 src/meson.build                              |   16 +
 src/wireless-security/meson.build            |   22 +-
 140 files changed, 59818 insertions(+), 29164 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed488417..12b518d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,6 @@
       file
       findutils
       gcc
-      libtool
       desktop-file-utils
       gettext-devel
       glib2-devel
@@ -21,8 +20,6 @@
       NetworkManager-libnm-devel
       pkgconfig
       /usr/bin/autopoint
-    - dnf -y install --releasever=31
-      libnma-devel
 
 .fedora_full: &fedora_full
   before_script:
@@ -30,7 +27,6 @@
       file
       findutils
       gcc
-      libtool
       desktop-file-utils
       gettext-devel
       glib2-devel
@@ -41,12 +37,14 @@
       NetworkManager-libnm-devel
       pkgconfig
       /usr/bin/autopoint
-      redhat-rpm-config
+      gcr-devel
+      gobject-introspection-devel redhat-rpm-config
+      gtk-doc
+      iso-codes-devel
+      mobile-broadband-provider-info-devel
       jansson-devel
       ModemManager-glib-devel
       libselinux-devel
-    - dnf -y install --releasever=31
-      libnma-devel
 
 .dist: &dist
   dependencies:
@@ -64,7 +62,12 @@
       -Dwwan=false
       -Dselinux=false
       -Dteam=false
+      -Dgcr=false
+      -Diso_codes=false
+      -Dmobile_broadband_provider_info=false
       -Dld_gc=false
+      -Dgtk_doc=false
+      -Dintrospection=false
       -Dappindicator=no
       -Dmore_asserts=no
       network-manager-applet-*/ build
@@ -83,7 +86,12 @@
       -Dwwan=true
       -Dselinux=true
       -Dteam=true
+      -Dgcr=true
+      -Diso_codes=true
+      -Dmobile_broadband_provider_info=true
       -Dld_gc=true
+      -Dgtk_doc=true
+      -Dintrospection=true
       -Dappindicator=no
       -Dmore_asserts=yes
       network-manager-applet-*/ build
@@ -103,12 +111,17 @@
       --disable-silent-rules
       --with-more-asserts=no
       --disable-nls
+      --disable-iso-codes
+      --disable-mobile-broadband-provider-info
+      --disable-gtk-doc
+      --disable-introspection
       --disable-schemas-compile
       --disable-more-warnings
       --without-appindicator
       --without-wwan
       --without-selinux
       --without-team
+      --without-gcr
     - make -j$(nproc)
     - make -j$(nproc) check
     - make -j$(nproc) install
@@ -125,11 +138,16 @@
       --disable-silent-rules
       --with-more-asserts=yes
       --enable-nls
+      --enable-iso-codes
+      --enable-mobile-broadband-provider-info
+      --enable-gtk-doc
+      --enable-introspection
       --enable-schemas-compile
       --enable-more-warnings
       --with-wwan
       --with-selinux
       --with-team
+      --with-gcr
     - make -j$(nproc)
     - make -j$(nproc) check
     - make -j$(nproc) install
@@ -175,7 +193,6 @@ centos7:
       file
       findutils
       gcc
-      libtool
       desktop-file-utils
       gettext-devel
       glib2-devel
@@ -187,7 +204,11 @@ centos7:
       NetworkManager-libnm-devel
       pkgconfig
       /usr/bin/autopoint
-      redhat-rpm-config
+      gcr-devel
+      gobject-introspection-devel redhat-rpm-config
+      gtk-doc
+      iso-codes-devel
+      mobile-broadband-provider-info-devel
       jansson-devel
       ModemManager-glib-devel
       libselinux-devel
@@ -199,14 +220,42 @@ centos7:
       --disable-silent-rules
       --with-more-asserts=yes
       --enable-nls
+      --enable-iso-codes
+      --enable-mobile-broadband-provider-info
+      --enable-gtk-doc
+      --enable-introspection
       --enable-schemas-compile
       --enable-more-warnings
       --with-wwan
       --with-selinux
       --with-team
+      --with-gcr
     - make -j$(nproc)
     - make -j$(nproc) check
     - make -j$(nproc) install
     - make -j$(nproc) uninstall
   image: centos:7
   stage: test
+
+# https://network-manager-applet.pages.gitlab.gnome.org/libnma/
+pages:
+  <<: *fedora_full
+  <<: *dist
+  image: fedora:latest
+  stage: deploy
+  script:
+    - dnf -y install make
+    - tar xJf network-manager-applet-*.tar.xz
+    - cd network-manager-applet-*/
+    - ./configure
+      --disable-silent-rules
+      --enable-gtk-doc
+    - make -j$(nproc)
+    - cd ..
+    - mkdir -p public
+    - mv network-manager-applet-*/html public/libnma
+  artifacts:
+    paths:
+      - public
+  only:
+    - master
diff --git a/Makefile.am b/Makefile.am
index 8da267b7..e5876460 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,6 @@
 include $(GLIB_MAKEFILE)
+-include $(INTROSPECTION_MAKEFILE)
+include $(top_srcdir)/gtk-doc.make
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
@@ -24,17 +26,16 @@ check_local =
 
 TESTS =
 
-EXTRA_DIST =
-
-CLEANFILES =
-
 DISTCLEANFILES =
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --disable-dependency-tracking \
+       --enable-gtk-doc \
+       --enable-introspection \
        --enable-more-warnings=error \
        --with-wwan \
-       --with-team
+       --with-team \
+       --with-gcr
 
 
 man_MANS =
@@ -43,6 +44,16 @@ pkgconfig_DATA =
 
 pkgconfigdir = $(libdir)/pkgconfig
 
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+BUILT_SOURCES += $(gir_DATA)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+BUILT_SOURCES += $(typelib_DATA)
+
+INTROSPECTION_GIRS =
+
 SUBDIRS = \
        . \
        po
@@ -179,6 +190,26 @@ src_utils_libutils_libnm_la_LIBADD = \
        $(GTK3_LIBS) \
        $(LIBNM_LIBS)
 
+if WITH_LIBNMA_GTK4
+
+noinst_LTLIBRARIES += src/utils/libutils-libnm-gtk4.la
+
+src_utils_libutils_libnm_gtk4_la_CPPFLAGS = \
+       "-I$(srcdir)/shared" \
+       $(GTK4_CFLAGS) \
+       $(LIBNM_CFLAGS)
+
+src_utils_libutils_libnm_gtk4_la_SOURCES = \
+       $(shared_files) \
+       src/utils/utils.c \
+       src/utils/utils.h
+
+src_utils_libutils_libnm_gtk4_la_LIBADD = \
+       $(GTK4_LIBS) \
+       $(LIBNM_LIBS)
+
+endif
+
 check_programs += src/utils/tests/test-utils
 
 src_utils_tests_test_utils_SOURCES = src/utils/tests/test-utils.c
@@ -260,8 +291,9 @@ src_wireless_security_libwireless_security_libnm_la_CPPFLAGS = \
        $(dflt_cppflags) \
        "-I$(srcdir)/shared" \
        "-I$(srcdir)/src/utils" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma \
        $(GTK3_CFLAGS) \
-       $(LIBNMA_CFLAGS) \
        $(LIBNM_CFLAGS)
 
 src_wireless_security_libwireless_security_libnm_la_LIBADD = \
@@ -271,6 +303,33 @@ src_wireless_security_libwireless_security_libnm_la_LIBADD = \
 
 $(src_wireless_security_libwireless_security_libnm_la_OBJECTS): $(wireless_security_h_gen)
 
+if WITH_LIBNMA_GTK4
+
+noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm-gtk4.la
+
+src_wireless_security_libwireless_security_libnm_gtk4_la_SOURCES = \
+       $(wireless_security_c_real)
+
+nodist_src_wireless_security_libwireless_security_libnm_gtk4_la_SOURCES = \
+       $(wireless_security_c_gen)
+
+src_wireless_security_libwireless_security_libnm_gtk4_la_CPPFLAGS = \
+       "-I$(srcdir)/shared" \
+       "-I$(srcdir)/src/utils" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma \
+       $(GTK4_CFLAGS) \
+       $(LIBNM_CFLAGS)
+
+src_wireless_security_libwireless_security_libnm_gtk4_la_LIBADD = \
+       src/utils/libutils-libnm-gtk4.la \
+       $(GTK4_LIBS) \
+       $(LIBNM_LIBS)
+
+$(src_wireless_security_libwireless_security_libnm_gtk4_la_OBJECTS): $(wireless_security_h_gen)
+
+endif
+
 EXTRA_DIST += \
        src/wireless-security/eap-method-fast.ui \
        src/wireless-security/eap-method-leap.ui \
@@ -289,6 +348,499 @@ EXTRA_DIST += \
 
 ###############################################################################
 
+src/libnma/nma-resources.h: src/libnma/nma.gresource.xml
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnma 
--generate-header --internal
+
+src/libnma/nma-resources.c: src/libnma/nma.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) 
--sourcedir=$(srcdir)/src/libnma --generate-dependencies $(srcdir)/src/libnma/nma.gresource.xml)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnma 
--generate-source --internal
+
+src/libnma-gtk4/nma-resources.c: src/libnma/nma.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) 
--generate-dependencies $(srcdir)/src/libnma/nma.gresource.xml |sed "s,^,$(builddir)/src/libnma-gtk4/,")
+       @mkdir -p $(builddir)/src/libnma-gtk4
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(builddir)/src/libnma-gtk4 
--generate-source --internal
+
+
+src/libnma-gtk4/%.ui: src/libnma/%.ui
+       @mkdir -p $(builddir)/src/libnma-gtk4
+       gtk4-builder-tool simplify --3to4 $< >$@
+
+CLEANFILES += \
+       $(libnma_h_priv_gen) \
+       $(libnma_c_gen) \
+       $(libnma_gtk4_c_gen)
+
+libnma_h_priv_gen = \
+       src/libnma/nma-resources.h
+
+libnma_c_gen = \
+       src/libnma/nma-resources.c
+
+libnma_gtk4_c_gen = \
+       src/libnma-gtk4/nma-resources.c
+
+libnma_h_pub = \
+       src/libnma/nma-version.h \
+       src/libnma/nma-wifi-dialog.h \
+       src/libnma/nma-mobile-wizard.h \
+       src/libnma/nma-mobile-providers.h \
+       src/libnma/nma-vpn-password-dialog.h \
+       src/libnma/nma-ui-utils.h \
+       src/libnma/nma-cert-chooser.h \
+       src/libnma/nma-bar-code-widget.h \
+       src/libnma/nma-bar-code.h
+
+libnma_c_real = \
+       src/libnma/nma-wifi-dialog.c \
+       src/libnma/nma-mobile-wizard.c \
+       src/libnma/nma-mobile-providers.c \
+       src/libnma/nma-vpn-password-dialog.c \
+       src/libnma/nma-ui-utils.c \
+       src/libnma/init.c \
+       src/libnma/nma-cert-chooser.c \
+       src/libnma/nma-file-cert-chooser.c \
+       src/libnma/nma-bar-code-widget.c \
+       src/libnma/nma-bar-code.c
+
+EXTRA_DIST += \
+       src/libnma/qrcodegen.c \
+       src/libnma/qrcodegen.h
+
+libnma_h_priv_real = \
+       src/libnma/nma-cert-chooser-private.h \
+       src/libnma/nma-private.h
+
+libnma_h_priv_gcr = \
+       src/libnma/nma-pkcs11-token-login-dialog.h \
+       src/libnma/nma-pkcs11-cert-chooser-dialog.h \
+       src/libnma/nma-cert-chooser-button.h
+
+libnma_c_gcr = \
+       src/libnma/nma-pkcs11-token-login-dialog.c \
+       src/libnma/nma-pkcs11-cert-chooser-dialog.c \
+       src/libnma/nma-cert-chooser-button.c \
+       src/libnma/nma-pkcs11-cert-chooser.c
+
+src_libnma_libnmadir = $(includedir)/libnma
+
+src_libnma_libnma_HEADERS = \
+       $(libnma_h_pub)
+
+lib_LTLIBRARIES += src/libnma/libnma.la
+
+src_libnma_libnma_la_SOURCES = \
+       $(libnma_h_priv_real) \
+       $(libnma_c_real)
+
+if WITH_GCR
+src_libnma_libnma_la_SOURCES += \
+       $(libnma_h_priv_gcr) \
+       $(libnma_c_gcr)
+endif
+
+nodist_src_libnma_libnma_la_SOURCES = \
+       $(libnma_h_priv_gen) \
+       $(libnma_c_gen)
+
+src_libnma_libnma_la_CFLAGS = \
+       $(dflt_cppflags) \
+       -DICONDIR=\""$(datadir)/icons"\" \
+       -DBINDIR=\""$(bindir)"\" \
+       -DSYSCONFDIR=\""$(sysconfdir)"\" \
+       -DLIBEXECDIR=\""$(libexecdir)"\" \
+       -DDATADIR=\""$(datadir)"\" \
+       -DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
+       -DNMALOCALEDIR=\"$(datadir)/locale\" \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
+       "-I$(srcdir)/shared" \
+       "-I$(srcdir)/src/utils" \
+       "-I$(srcdir)/src/wireless-security" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma \
+       $(GTK3_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       $(GUDEV_CFLAGS) \
+       $(GCR_CFLAGS)
+
+src_libnma_libnma_la_LIBADD = \
+       src/wireless-security/libwireless-security-libnm.la \
+       $(GTK3_LIBS) \
+       $(LIBNM_LIBS) \
+       $(GUDEV_LIBS) \
+       $(GCR_LIBS)
+
+EXTRA_src_libnma_libnma_la_DEPENDENCIES = src/libnma/libnma.ver
+
+src_libnma_libnma_la_LDFLAGS = \
+       -Wl,-no-undefined \
+       -Wl,--version-script=$(srcdir)/src/libnma/libnma.ver
+
+
+pkgconfig_DATA += src/libnma/libnma.pc
+
+if HAVE_INTROSPECTION
+src/libnma/NMA-1.0.gir: src/libnma/libnma.la
+src_libnma_NMA_1_0_gir_INCLUDES = NM-1.0 Gtk-3.0
+src_libnma_NMA_1_0_gir_EXPORT_PACKAGES = libnma
+src_libnma_NMA_1_0_gir_CFLAGS = $(src_libnma_libnma_la_CFLAGS)
+src_libnma_NMA_1_0_gir_LIBS = src/libnma/libnma.la
+src_libnma_NMA_1_0_gir_FILES = \
+       $(libnma_h_pub) \
+       $(libnma_c_real)
+if WITH_GCR
+src_libnma_NMA_1_0_gir_FILES += \
+       $(libnma_c_gcr)
+endif
+src_libnma_NMA_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
+INTROSPECTION_GIRS += src/libnma/NMA-1.0.gir
+endif
+
+check_PROGRAMS_norun += src/libnma/tests/mobile-wizard
+
+src_libnma_tests_mobile_wizard_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK3_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_mobile_wizard_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK3_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma.la
+
+check_PROGRAMS_norun += src/libnma/tests/vpn-password-dialog
+
+src_libnma_tests_vpn_password_dialog_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK3_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_vpn_password_dialog_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK3_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma.la
+
+check_PROGRAMS_norun += src/libnma/tests/wifi-dialog
+
+src_libnma_tests_wifi_dialog_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK3_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_wifi_dialog_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK3_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma.la
+
+check_PROGRAMS_norun += src/libnma/tests/wifi-dialog-secrets
+
+src_libnma_tests_wifi_dialog_secrets_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK3_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_wifi_dialog_secrets_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK3_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma.la
+
+check_PROGRAMS_norun += src/libnma/tests/run-vpn
+
+src_libnma_tests_run_vpn_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK3_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_run_vpn_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK3_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma.la
+
+check_PROGRAMS_norun += src/libnma/tests/cert-chooser
+
+src_libnma_tests_cert_chooser_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK3_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_cert_chooser_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK3_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma.la
+
+check_PROGRAMS_norun += src/libnma/tests/bar-code
+
+src_libnma_tests_bar_code_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK3_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_bar_code_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK3_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma.la
+
+if WITH_LIBNMA_GTK4
+
+lib_LTLIBRARIES += src/libnma/libnma-gtk4.la
+
+src_libnma_libnma_gtk4_la_SOURCES = \
+       $(libnma_h_priv_real) \
+       $(libnma_c_real)
+
+if WITH_GCR_GTK4
+src_libnma_libnma_gtk4_la_SOURCES += \
+       $(libnma_h_priv_gcr) \
+       $(libnma_c_gcr)
+endif
+
+nodist_src_libnma_libnma_gtk4_la_SOURCES = \
+       $(libnma_h_priv_gen) \
+       $(libnma_gtk4_c_gen)
+
+src_libnma_libnma_gtk4_la_CFLAGS = \
+       -DICONDIR=\""$(datadir)/icons"\" \
+       -DBINDIR=\""$(bindir)"\" \
+       -DSYSCONFDIR=\""$(sysconfdir)"\" \
+       -DLIBEXECDIR=\""$(libexecdir)"\" \
+       -DDATADIR=\""$(datadir)"\" \
+       -DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
+       -DNMALOCALEDIR=\"$(datadir)/locale\" \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
+       "-I$(srcdir)/shared" \
+       "-I$(srcdir)/src/utils" \
+       "-I$(srcdir)/src/wireless-security" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma \
+       $(GTK4_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       $(GUDEV_CFLAGS) \
+       $(GCR_GCR4_CFLAGS)
+
+src_libnma_libnma_gtk4_la_LIBADD = \
+       src/wireless-security/libwireless-security-libnm-gtk4.la \
+       $(GTK4_LIBS) \
+       $(LIBNM_LIBS) \
+       $(GUDEV_LIBS) \
+       $(GCR_GCR4_LIBS)
+
+EXTRA_src_libnma_libnma_gtk4_la_DEPENDENCIES = src/libnma/libnma.ver
+
+src_libnma_libnma_gtk4_la_LDFLAGS = \
+       -Wl,-no-undefined \
+       -Wl,--version-script=$(srcdir)/src/libnma/libnma.ver
+
+
+pkgconfig_DATA += src/libnma/libnma-gtk4.pc
+
+if HAVE_INTROSPECTION
+src/libnma/NMA4-1.0.gir: src/libnma/libnma-gtk4.la
+src_libnma_NMA4_1_0_gir_INCLUDES = NM-1.0 Gtk-4.0
+src_libnma_NMA4_1_0_gir_EXPORT_PACKAGES = libnma-gtk4
+src_libnma_NMA4_1_0_gir_CFLAGS = $(src_libnma_libnma_gtk4_la_CFLAGS)
+src_libnma_NMA4_1_0_gir_LIBS = src/libnma/libnma-gtk4.la
+src_libnma_NMA4_1_0_gir_FILES = \
+       $(libnma_h_pub) \
+       $(libnma_c_real)
+if WITH_GCR_GTK4
+src_libnma_NMA4_1_0_gir_FILES += \
+       $(libnma_c_gcr)
+endif
+src_libnma_NMA4_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
+INTROSPECTION_GIRS += src/libnma/NMA4-1.0.gir
+endif
+
+check_PROGRAMS_norun += src/libnma/tests/mobile-wizard-gtk4
+
+src_libnma_tests_mobile_wizard_gtk4_SOURCES = \
+       src/libnma/tests/mobile-wizard.c
+
+src_libnma_tests_mobile_wizard_gtk4_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK4_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_mobile_wizard_gtk4_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK4_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma-gtk4.la
+
+check_PROGRAMS_norun += src/libnma/tests/vpn-password-dialog-gtk4
+
+src_libnma_tests_vpn_password_dialog_gtk4_SOURCES = \
+       src/libnma/tests/vpn-password-dialog.c
+
+src_libnma_tests_vpn_password_dialog_gtk4_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK4_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_vpn_password_dialog_gtk4_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK4_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma-gtk4.la
+
+check_PROGRAMS_norun += src/libnma/tests/wifi-dialog-gtk4
+
+src_libnma_tests_wifi_dialog_gtk4_SOURCES = \
+       src/libnma/tests/wifi-dialog.c
+
+src_libnma_tests_wifi_dialog_gtk4_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK4_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_wifi_dialog_gtk4_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK4_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma-gtk4.la
+
+check_PROGRAMS_norun += src/libnma/tests/wifi-dialog-secrets-gtk4
+
+src_libnma_tests_wifi_dialog_secrets_gtk4_SOURCES = \
+       src/libnma/tests/wifi-dialog-secrets.c
+
+src_libnma_tests_wifi_dialog_secrets_gtk4_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK4_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_wifi_dialog_secrets_gtk4_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK4_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma-gtk4.la
+
+check_PROGRAMS_norun += src/libnma/tests/run-vpn-gtk4
+
+src_libnma_tests_run_vpn_gtk4_SOURCES = \
+       src/libnma/tests/run-vpn.c
+
+src_libnma_tests_run_vpn_gtk4_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK4_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_run_vpn_gtk4_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK4_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma-gtk4.la
+
+check_PROGRAMS_norun += src/libnma/tests/cert-chooser-gtk4
+
+src_libnma_tests_cert_chooser_gtk4_SOURCES = \
+       src/libnma/tests/cert-chooser.c
+
+src_libnma_tests_cert_chooser_gtk4_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK4_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_cert_chooser_gtk4_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK4_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma-gtk4.la
+
+check_PROGRAMS_norun += src/libnma/tests/bar-code-gtk4
+
+src_libnma_tests_bar_code_gtk4_SOURCES = \
+       src/libnma/tests/bar-code.c
+
+src_libnma_tests_bar_code_gtk4_CPPFLAGS = \
+       $(dflt_cppflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK4_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       "-I$(srcdir)/shared/" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma
+
+src_libnma_tests_bar_code_gtk4_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK4_LIBS) \
+       $(LIBNM_LIBS) \
+       src/libnma/libnma-gtk4.la
+
+endif
+
+EXTRA_DIST += \
+       src/libnma/nma-version.h.in \
+       src/libnma/libnma.pc.in \
+       src/libnma/libnma-gtk4.pc.in \
+       src/libnma/libnma.ver \
+       src/libnma/wifi.ui \
+       src/libnma/nma-mobile-wizard.ui \
+       src/libnma/nma-bar-code-widget.ui \
+       src/libnma/nma-pkcs11-token-login-dialog.ui \
+       src/libnma/nma-pkcs11-cert-chooser-dialog.ui \
+       src/libnma/nma-vpn-password-dialog.ui \
+       src/libnma/nma.gresource.xml \
+       src/libnma/meson.build \
+       src/libnma/tests/meson.build
+
+###############################################################################
+
 src/connection-editor/ce-resources.h: src/connection-editor/ce.gresource.xml
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/connection-editor 
--generate-header --internal
 
@@ -397,17 +949,18 @@ src_connection_editor_nm_connection_editor_CPPFLAGS = \
        "-I$(srcdir)/shared" \
        "-I$(srcdir)/src/utils" \
        "-I$(srcdir)/src/wireless-security" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma \
        $(GTK3_CFLAGS) \
-       $(LIBNMA_CFLAGS) \
        $(LIBNM_CFLAGS) \
        $(JANSSON_CFLAGS) \
        $(SELINUX_CFLAGS)
 
 src_connection_editor_nm_connection_editor_LDADD = \
        src/wireless-security/libwireless-security-libnm.la \
+       src/libnma/libnma.la \
        $(GTK3_LIBS) \
        $(LIBNM_LIBS) \
-       $(LIBNMA_LIBS) \
        $(JANSSON_LIBS) \
        $(SELINUX_LIBS) \
        -lm
@@ -523,8 +1076,9 @@ src_nm_applet_CPPFLAGS = \
        "-I$(srcdir)/shared" \
        "-I$(srcdir)/src/utils" \
        "-I$(srcdir)/src/wireless-security" \
+       "-I$(srcdir)/src/libnma" \
+       -Isrc/libnma \
        $(GTK3_CFLAGS) \
-       $(LIBNMA_CFLAGS) \
        $(LIBNM_CFLAGS) \
        $(LIBSECRET_CFLAGS) \
        $(NOTIFY_CFLAGS) \
@@ -533,9 +1087,9 @@ src_nm_applet_CPPFLAGS = \
 
 src_nm_applet_LDADD = \
        src/wireless-security/libwireless-security-libnm.la \
+       src/libnma/libnma.la \
        $(GTK3_LIBS) \
        $(LIBNM_LIBS) \
-       $(LIBNMA_LIBS) \
        $(LIBSECRET_LIBS) \
        $(NOTIFY_LIBS) \
        $(MM_GLIB_LIBS) \
@@ -584,6 +1138,43 @@ EXTRA_DIST += man/meson.build
 
 ###############################################################################
 
+DOC_MODULE = libnma
+
+DOC_SOURCE_DIR = $(top_srcdir)/src/libnma
+
+SCAN_OPTIONS=--rebuild-types --rebuild-sections
+
+DOC_MAIN_SGML_FILE = libnma-docs.xml
+
+GTKDOC_LIBS = src/libnma/libnma.la
+
+scan-build.stamp: $(GTKDOC_LIBS)
+
+HFILE_GLOB = $(top_srcdir)/src/libnma/*.h
+
+CFILE_GLOB = $(top_srcdir)/src/libnma/*.c
+
+IGNORE_HFILES = \
+       nma-resources.h \
+       nma-version.h \
+       nma-cert-chooser-private.h \
+       nma-private.h \
+       nma-pkcs11-token-login-dialog.h \
+       nma-pkcs11-cert-chooser-dialog.h \
+       nma-cert-chooser-button.h
+
+mkdb_ignore_c_files = \
+       nma-resources.c \
+       nma-file-cert-chooser.c \
+       nma-pkcs11-token-login-dialog.c \
+       nma-pkcs11-cert-chooser-dialog.c \
+       nma-cert-chooser-button.c \
+       nma-pkcs11-cert-chooser.c
+
+MKDB_OPTIONS = --ignore-files "$(IGNORE_HFILES) $(mkdb_ignore_c_files)"
+
+###############################################################################
+
 check_PROGRAMS += $(check_programs)
 
 check-local: $(check_local)
@@ -641,6 +1232,7 @@ EXTRA_DIST += \
        $(desktop_in_files)
 
 CLEANFILES += \
+       $(INTROSPECTION_GIRS) \
        $(typelib_DATA) \
        \
        $(autostart_DATA) \
diff --git a/autogen.sh b/autogen.sh
index 37363e75..cbdc5c44 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,6 +14,7 @@ PKG_NAME=nm-applet
 }
 
 (cd $srcdir;
+    gtkdocize &&
     autoreconf --force --install --symlink
 )
 
diff --git a/configure.ac b/configure.ac
index 5a46cde3..727fed30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,14 +68,69 @@ GETTEXT_PACKAGE=nm-applet
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 
+# Check for iso-codes for country names translation
+AC_MSG_CHECKING([whether to disable iso-codes at build-time])
+AC_ARG_ENABLE([iso-codes],
+    AS_HELP_STRING([--disable-iso-codes],[do not check for iso-codes at build-time]),
+    [],[disable_iso_codes_check=no])
+if test x$disable_iso_codes_check = xno ; then
+    AC_MSG_RESULT([no])
+else
+    AC_MSG_RESULT([yes])
+fi
+
+if test x$disable_iso_codes_check = "xno" ; then
+    AC_MSG_CHECKING([whether iso-codes has iso_3166 domain])
+    if $PKG_CONFIG --variable=domains iso-codes | grep iso_3166 >/dev/null ; then
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([no])
+    fi
+    AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
+    PKG_CHECK_MODULES(ISO_CODES, [iso-codes],
+        [],
+        [echo -e "\n$ISO_CODES_PKG_ERRORS.\n"
+         echo "Consider installing the package or adjusting the PKG_CONFIG_PATH environment variable."
+         echo "You can also disable build-time check for 'iso-codes' via --disable-iso-codes";
+         exit 1;])
+else
+    AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["$prefix"],[ISO codes prefix])
+fi
+
+# Check for mobile-broadband-provider-info for Mobile Broadband wizard
+AC_MSG_CHECKING([whether to disable mobile-broadband-provider-info at build-time])
+AC_ARG_ENABLE([mobile-broadband-provider-info],
+    AS_HELP_STRING([--disable-mobile-broadband-provider-info],[do not check for 
mobile-broadband-provider-info at build-time]),
+    [],[disable_mobile_broadband_provider_info_check=no])
+if test x$disable_mobile_broadband_provider_info_check = xno ; then
+    AC_MSG_RESULT([no])
+else
+    AC_MSG_RESULT([yes])
+fi
+
+if test x$disable_mobile_broadband_provider_info_check = "xno" ; then
+    AC_DEFINE_UNQUOTED([MOBILE_BROADBAND_PROVIDER_INFO_DATABASE],["`$PKG_CONFIG --variable=database 
mobile-broadband-provider-info`"],[Mobile Broadband Service Provider Information Database location])
+    PKG_CHECK_MODULES(MOBILE_BROADBAND_PROVIDER_INFO, [mobile-broadband-provider-info],
+        [],
+        [echo -e "\n$MOBILE_BROADBAND_PROVIDER_INFO_PKG_ERRORS.\n"
+         echo "Consider installing the package or adjusting the PKG_CONFIG_PATH environment variable."
+         echo "You can also disable build-time check for 'mobile-broadband-provider-info' via 
--disable-mobile-broadband-provider-info";
+         exit 1;])
+else
+    
AC_DEFINE_UNQUOTED([MOBILE_BROADBAND_PROVIDER_INFO_DATABASE],["$prefix/share/mobile-broadband-provider-info/serviceproviders.xml"],[Mobile
 Broadband Service Provider Information Database location])
+fi
+
+dnl
+dnl API documentation
+dnl
+GTK_DOC_CHECK(1.0)
+
 PKG_CHECK_MODULES(LIBNM, [libnm >= 1.7 gio-2.0 >= 2.38 gmodule-export-2.0])
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38"
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_8"
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_8"
 
-PKG_CHECK_MODULES(LIBNMA, libnma)
-
 PKG_CHECK_MODULES(LIBSECRET, [libsecret-1 >= 0.18])
 
 # Check for libnotify >= 0.7
@@ -88,6 +143,20 @@ PKG_CHECK_MODULES(NOTIFY, [libnotify >= 0.4.3])
 PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.10)
 GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_10 
-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_10"
 
+AC_ARG_WITH(libnma-gtk4, AS_HELP_STRING([--with-libnma-gtk4], [build EXPERIMENTAL libnma-gtk4 library for 
use with GTK4]))
+if test "$with_libnma_gtk4" == yes; then
+       PKG_CHECK_MODULES(GTK4, gtk4 >= 3.94)
+       GTK4_CFLAGS="$GTK4_CFLAGS -DGTK_VERSION_MIN_REQUIRED=GTK_VERSION_3_96 
-DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_96"
+else
+       with_libnma_gtk4=no
+fi
+AM_CONDITIONAL(WITH_LIBNMA_GTK4, test "$with_libnma_gtk4" != "no")
+
+# No such thing yet, just same lame duck placeholders.
+# it may actually end up being called differently.
+AC_DEFINE(WITH_GCR_GTK4, 0, [Define if GTK4 Gcr is available])
+AM_CONDITIONAL(WITH_GCR_GTK4, false)
+
 AC_ARG_WITH([appindicator],
             AS_HELP_STRING([--with-appindicator=no|yes|auto|ayatana|ubuntu], [Build with 
lib(ayatana-)appindicator support in addition to xembed systray support.]),
             [], [with_appindicator=no])
@@ -119,6 +188,8 @@ if test "$with_appindicator" != "no"; then
        fi
 fi
 
+AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
+
 dnl ModemManager1 with libmm-glib for WWAN support
 AC_ARG_WITH(wwan, AS_HELP_STRING([--with-wwan], [Enable WWAN support (default: yes)]))
 if (test "${with_wwan}" == "no"); then
@@ -158,6 +229,79 @@ else
 fi
 AM_CONDITIONAL(WITH_JANSSON, test "${with_team}" != "no")
 
+dnl GCR for PKCS#11 enabled certificate chooser
+AC_ARG_WITH(gcr, AS_HELP_STRING([--with-gcr], [Enable advanced certificate chooser (default: auto)]))
+if (test "${with_gcr}" == "no"); then
+    have_gcr=no
+else
+    PKG_CHECK_MODULES(GCR,
+                      [gcr-3 >= 3.14, gck-1 >= 3.14],
+                      dnl GCR API is declared subject to change, do an extensive check of the prototypes
+                      GCR_CFLAGS="$GCR_CFLAGS -DGCR_API_SUBJECT_TO_CHANGE -DGCK_API_SUBJECT_TO_CHANGE"
+                      CFLAGS_SAVED="$CFLAGS"
+                      CFLAGS="$CFLAGS $GCR_CFLAGS"
+                      AC_MSG_CHECKING([for GCR usefulness])
+                      AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+                                        #include <gcr/gcr.h>
+                                        #include <gck/gck.h>
+
+                                        const GckAttribute *gck_attributes_find (GckAttributes *attrs, 
gulong attr_type);
+                                        gboolean gck_attributes_find_string (GckAttributes *attrs, gulong 
attr_type, gchar **value);
+                                        gboolean gck_attributes_find_ulong (GckAttributes *attrs, gulong 
attr_type, gulong *value);
+                                        GckAttributes *gck_attributes_new_empty (gulong first_type, ...);
+                                        void gck_attributes_unref (gpointer attrs);
+                                        void gck_builder_add_all (GckBuilder *builder, GckAttributes *attrs);
+                                        void gck_builder_add_only (GckBuilder *builder, GckAttributes 
*attrs, gulong only_type, ...);
+                                        GckAttributes *gck_builder_end (GckBuilder *builder);
+                                        GckBuilder *gck_builder_new (GckBuilderFlags flags);
+                                        void gck_enumerator_next_async (GckEnumerator *self, gint 
max_objects, GCancellable *cancellable,
+                                                                        GAsyncReadyCallback callback, 
gpointer user_data);
+                                        GList *gck_enumerator_next_finish (GckEnumerator *self, GAsyncResult 
*result, GError **error);
+                                        void gck_list_unref_free (GList *reflist);
+                                        GList *gck_modules_get_slots (GList *modules, gboolean 
token_present);
+                                        void gck_modules_initialize_registered_async (GCancellable 
*cancellable, GAsyncReadyCallback callback,
+                                                                                      gpointer user_data);
+                                        GList *gck_modules_initialize_registered_finish (GAsyncResult 
*result, GError **error);
+                                        void gck_object_get_async (GckObject *self, const gulong 
*attr_types, guint n_attr_types,
+                                                                   GCancellable *cancellable, 
GAsyncReadyCallback callback, gpointer user_data);
+                                        GckAttributes *gck_object_get_finish (GckObject *self, GAsyncResult 
*result, GError **error);
+                                        void gck_session_login_async (GckSession *self, gulong user_type, 
const guchar *pin,
+                                                                      gsize n_pin, GCancellable *cancellable,
+                                                                      GAsyncReadyCallback callback, gpointer 
user_data);
+                                        gboolean gck_session_login_finish (GckSession *self, GAsyncResult 
*result, GError **error);
+                                        GckSlotInfo *gck_slot_get_info (GckSlot *self);
+                                        GckTokenInfo *gck_slot_get_token_info (GckSlot *self);
+                                        void gck_slot_open_session_async (GckSlot *self, GckSessionOptions 
options, GCancellable *cancellable,
+                                                                          GAsyncReadyCallback callback, 
gpointer user_data);
+                                        GckSession *gck_slot_open_session_finish (GckSlot *self, 
GAsyncResult *result, GError **error);
+                                        void gck_token_info_free (GckTokenInfo *token_info);
+                                        gchar *gck_uri_build (GckUriData *uri_data, GckUriFlags flags);
+                                        void gck_uri_data_free (GckUriData *uri_data);
+                                        GckUriData *gck_uri_parse (const gchar *string, GckUriFlags flags, 
GError **error);
+                                        gchar *gcr_certificate_get_issuer_name (GcrCertificate *self);
+                                        gchar *gcr_certificate_get_subject_name (GcrCertificate *self);
+                                        GcrCertificate *gcr_simple_certificate_new (const guchar *data, 
gsize n_data);
+                                        ])],
+                                        have_gcr=yes,
+                                        have_gcr=no)
+                      AC_MSG_RESULT(${have_gcr})
+                      CFLAGS="$CFLAGS_SAVED",
+                      have_gcr=no);
+fi
+
+if (test "${have_gcr}" == "yes"); then
+     AC_DEFINE(WITH_GCR, 1, [Define if Gcr is available])
+else
+    if (test "${with_gcr}" == "yes"); then
+        AC_MSG_ERROR([gcr support was requested, but the gcr library is not available.])
+    fi
+    AC_DEFINE(WITH_GCR, 0, [Define if Gcr is available])
+fi
+AM_CONDITIONAL(WITH_GCR, test "${have_gcr}" == "yes")
+
+dnl Check for gobject introspection
+GOBJECT_INTROSPECTION_CHECK([0.9.6])
+
 GLIB_CONFIG_NMA
 GLIB_GSETTINGS
 AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
@@ -166,6 +310,15 @@ NM_COMPILER_WARNINGS(CFLAGS, [yes])
 NM_LTO
 NM_LD_GC
 
+# Disable extra compiler warning until GTK4 doesn't trigger it via graphene
+# https://github.com/ebassi/graphene/issues/134
+if test "$with_libnma_gtk4" == yes; then
+       _CFLAGS_SAVED="$CFLAGS"
+       CFLAGS="$CFLAGS $GTK4_CFLAGS"
+       NM_COMPILER_WARNING([_CFLAGS], [float-equal], [#include <gtk/gtk.h>])
+       CFLAGS="$_CFLAGS_SAVED $_CFLAGS"
+fi
+
 AC_ARG_WITH(more-asserts,
             AS_HELP_STRING([--with-more-asserts=level], [Enable more assertions for debugging (default: 0)]),
             [more_asserts=${with_more_asserts}],
@@ -182,14 +335,19 @@ AC_DEFINE_UNQUOTED(NM_MORE_ASSERTS, $more_asserts, [Define if more asserts are e
 
 AC_CONFIG_FILES([
 Makefile
+src/libnma/libnma.pc
+src/libnma/libnma-gtk4.pc
 po/Makefile.in
 man/nm-applet.1
 man/nm-connection-editor.1
 org.gnome.nm-applet.gschema.xml
+src/libnma/nma-version.h
 ])
 AC_OUTPUT
 
 echo ""
+echo "  Build EXPERIMENTAL libnma-gtk4 library for use with GTK4: --with-libnma-gtk4=${with_libnma_gtk4}"
+echo "  GCR: --with-gcr=$have_gcr"
 echo "  LTO: --enable-lto=$enable_lto"
 echo "  Linker garbage collection: --enable-ld-gc=$enable_ld_gc"
 echo "  appindicator: $with_appindicator"
diff --git a/m4/introspection.m4 b/m4/introspection.m4
new file mode 100644
index 00000000..f3bda0e7
--- /dev/null
+++ b/m4/introspection.m4
@@ -0,0 +1,93 @@
+dnl -*- mode: autoconf -*-
+dnl Copyright 2009 Johan Dahlin
+dnl
+dnl This file is free software; the author(s) gives unlimited
+dnl permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+
+# serial 1
+
+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+[
+    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
+
+    dnl enable/disable introspection
+    m4_if([$2], [require],
+    [dnl
+        enable_introspection=yes
+    ],[dnl
+        AC_ARG_ENABLE(introspection,
+                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
+                                 [Enable introspection for this build]),,
+                                 [enable_introspection=auto])
+    ])dnl
+
+    INTROSPECTION_SCANNER=
+    INTROSPECTION_COMPILER=
+    INTROSPECTION_GENERATE=
+    INTROSPECTION_GIRDIR=
+    INTROSPECTION_TYPELIBDIR=
+
+    if test "x$enable_introspection" == "xno"; then
+      found_introspection="no"
+    else
+       PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], [
+           INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+           INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+           INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+           INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+           INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+           INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+           INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+           INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir 
gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+
+           AC_MSG_CHECKING([if $INTROSPECTION_SCANNER works])
+           if CFLAGS="${CFLAGS} -Wno-error" "$INTROSPECTION_SCANNER" --namespace=test --library=c /dev/null 
--output /dev/null >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
+               found_introspection=yes
+           else
+               found_introspection="no (compiler failure -- check config.log)"
+           fi
+           AC_MSG_RESULT([$found_introspection])
+       ], [found_introspection="no (not installed)"])
+
+       if test "x$enable_introspection" == "xyes"; then
+          if test "x$found_introspection" != "xyes"; then
+              AC_MSG_ERROR([introspection enabled but can't be used])
+          fi
+       elif test "x$enable_introspection" != "xauto"; then
+          AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of 
@<:@no/auto/yes@:>@])
+       fi
+    fi
+
+    AC_SUBST(INTROSPECTION_SCANNER, 'CFLAGS="${CFLAGS} -Wno-error" '"$INTROSPECTION_SCANNER")
+    AC_SUBST(INTROSPECTION_COMPILER)
+    AC_SUBST(INTROSPECTION_GENERATE)
+    AC_SUBST(INTROSPECTION_GIRDIR)
+    AC_SUBST(INTROSPECTION_TYPELIBDIR)
+    AC_SUBST(INTROSPECTION_CFLAGS)
+    AC_SUBST(INTROSPECTION_LIBS)
+    AC_SUBST(INTROSPECTION_MAKEFILE)
+
+    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
+])
+
+
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
+
+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
+[
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
+])
+
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
+
+
+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
+[
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
+])
diff --git a/meson.build b/meson.build
index fc3eacdc..31def378 100644
--- a/meson.build
+++ b/meson.build
@@ -74,6 +74,18 @@ if enable_ld_gc
   common_ldflags += test_ldflags
 endif
 
+enable_libnma_gtk4 = get_option('libnma_gtk4')
+if enable_libnma_gtk4
+  gtk4_ext_dep = dependency('gtk4', version: '>= 3.96')
+  gtk4_dep = declare_dependency(
+    dependencies: gtk4_ext_dep,
+    compile_args: [
+      '-DGTK_VERSION_MIN_REQUIRED=GTK_VERSION_3_96',
+      '-DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_96'
+    ]
+  )
+endif
+
 if nma_debug
   test_cflags = [
     '-Wdeclaration-after-statement',
@@ -96,6 +108,12 @@ if nma_debug
     '-Wvla',
   ]
 
+  # Disable extra compiler warning until GTK4 doesn't trigger it via graphene
+  # https://github.com/ebassi/graphene/issues/134
+  if not enable_libnma_gtk4 or cc.compiles('#include <gtk/gtk.h>', dependencies: gtk4_ext_dep, args: 
['-Werror=float-equal'])
+    test_cflags += '-Wfloat-equal'
+  endif
+
   common_flags += cc.get_supported_arguments(test_cflags)
 endif
 
@@ -104,10 +122,37 @@ add_project_link_arguments(common_ldflags, language: 'c')
 
 linker_script_ver = join_paths(meson.source_root(), 'linker-script-binary.ver')
 
+# Check for iso-codes for country names translation
+enable_iso_codes = get_option('iso_codes')
+message('whether to disable iso-codes at build-time: ' + enable_iso_codes.to_string())
+if enable_iso_codes
+  iso_codes_dep = dependency('iso-codes')
+
+  str = 'Consider installing the package or adjusting the PKG_CONFIG_PATH environment variable.\n'
+  str += 'You can also disable build-time check for \'iso-codes\' via -Diso_codes=false'
+  assert(iso_codes_dep.found(), str)
+
+  iso_3166 = iso_codes_dep.get_pkgconfig_variable('domains').contains('iso_3166')
+  message('whether iso-codes has iso_3166 domain: ' + iso_3166.to_string())
+
+  config_h.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_pkgconfig_variable('prefix'))
+else
+  config_h.set_quoted('ISO_CODES_PREFIX', nma_prefix)
+endif
+
+# Check for mobile-broadband-provider-info for Mobile Broadband wizard
+enable_mobile_broadband_provider_info = get_option('mobile_broadband_provider_info')
+message('whether to enable mobile-broadband-provider-info at build-time: ' + 
enable_mobile_broadband_provider_info.to_string())
+if enable_mobile_broadband_provider_info
+  mobile_broadband_provider_info_dep = dependency('mobile-broadband-provider-info')
+  config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', 
mobile_broadband_provider_info_dep.get_pkgconfig_variable('database'))
+else
+  config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_datadir, 
'mobile-broadband-provider-info', 'serviceproviders.xml'))
+endif
+
 gio_dep = dependency('gio-2.0', version: '>= 2.38')
 gmodule_export_dep = dependency('gmodule-export-2.0')
 libsecret_dep = dependency('libsecret-1', version: '>= 0.18')
-libnma_dep = dependency('libnma')
 
 m_dep = cc.find_library('m')
 
@@ -213,6 +258,85 @@ if enable_team
 endif
 config_h.set10('WITH_JANSSON', enable_team)
 
+# GCR for PKCS#11 enabled certificate chooser
+enable_gcr = get_option('gcr')
+if enable_gcr
+  deps = [
+    dependency('gcr-3', version: '>= 3.14'),
+    dependency('gck-1', version: '>= 3.14')
+  ]
+
+  cflags = [
+    '-DGCR_API_SUBJECT_TO_CHANGE',
+    '-DGCK_API_SUBJECT_TO_CHANGE'
+  ]
+
+  # GCR API is declared subject to change, do an extensive check of the prototypes
+  gcr_src = '''
+    #ifndef GCR_API_SUBJECT_TO_CHANGE
+    # define GCR_API_SUBJECT_TO_CHANGE
+    #endif
+    #ifndef GCK_API_SUBJECT_TO_CHANGE
+    # define GCK_API_SUBJECT_TO_CHANGE
+    #endif
+
+    #include <gcr/gcr.h>
+    #include <gck/gck.h>
+
+    const GckAttribute *gck_attributes_find (GckAttributes *attrs, gulong attr_type);
+    gboolean gck_attributes_find_string (GckAttributes *attrs, gulong attr_type, gchar **value);
+    gboolean gck_attributes_find_ulong (GckAttributes *attrs, gulong attr_type, gulong *value);
+    GckAttributes *gck_attributes_new_empty (gulong first_type, ...);
+    void gck_attributes_unref (gpointer attrs);
+    void gck_builder_add_all (GckBuilder *builder, GckAttributes *attrs);
+    void gck_builder_add_only (GckBuilder *builder, GckAttributes *attrs, gulong only_type, ...);
+    GckAttributes *gck_builder_end (GckBuilder *builder);
+    GckBuilder *gck_builder_new (GckBuilderFlags flags);
+    void gck_enumerator_next_async (GckEnumerator *self, gint max_objects, GCancellable *cancellable,
+                                    GAsyncReadyCallback callback, gpointer user_data);
+    GList *gck_enumerator_next_finish (GckEnumerator *self, GAsyncResult *result, GError **error);
+    void gck_list_unref_free (GList *reflist);
+    GList *gck_modules_get_slots (GList *modules, gboolean token_present);
+    void gck_modules_initialize_registered_async (GCancellable *cancellable, GAsyncReadyCallback callback,
+                                                  gpointer user_data);
+    GList *gck_modules_initialize_registered_finish (GAsyncResult *result, GError **error);
+    void gck_object_get_async (GckObject *self, const gulong *attr_types, guint n_attr_types,
+                               GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+    GckAttributes *gck_object_get_finish (GckObject *self, GAsyncResult *result, GError **error);
+    void gck_session_login_async (GckSession *self, gulong user_type, const guchar *pin,
+                                  gsize n_pin, GCancellable *cancellable,
+                                  GAsyncReadyCallback callback, gpointer user_data);
+    gboolean gck_session_login_finish (GckSession *self, GAsyncResult *result, GError **error);
+    GckSlotInfo *gck_slot_get_info (GckSlot *self);
+    GckTokenInfo *gck_slot_get_token_info (GckSlot *self);
+    void gck_slot_open_session_async (GckSlot *self, GckSessionOptions options, GCancellable *cancellable,
+                                      GAsyncReadyCallback callback, gpointer user_data);
+    GckSession *gck_slot_open_session_finish (GckSlot *self, GAsyncResult *result, GError **error);
+    void gck_token_info_free (GckTokenInfo *token_info);
+    gchar *gck_uri_build (GckUriData *uri_data, GckUriFlags flags);
+    void gck_uri_data_free (GckUriData *uri_data);
+    GckUriData *gck_uri_parse (const gchar *string, GckUriFlags flags, GError **error);
+    gchar *gcr_certificate_get_issuer_name (GcrCertificate *self);
+    gchar *gcr_certificate_get_subject_name (GcrCertificate *self);
+    GcrCertificate *gcr_simple_certificate_new (const guchar *data, gsize n_data);
+  '''
+
+  assert(cc.compiles(gcr_src, dependencies: deps), 'gcr support was requested, but the gcr library is not 
available. Use -Dgcr=false to build without it.')
+
+  gcr_dep = declare_dependency(
+    dependencies: deps,
+    compile_args: cflags
+  )
+endif
+config_h.set10('WITH_GCR', enable_gcr)
+
+# introspection support
+enable_introspection = get_option('introspection')
+if enable_introspection
+  gir_dep = dependency('gobject-introspection-1.0', version: '>= 0.9.6', required: false)
+  assert(gir_dep.found(), 'introspection support was requested, but the gobject-introspection library is not 
available. Use -Dintrospection=false to build without it.')
+endif
+
 more_asserts = get_option('more_asserts')
 if more_asserts == 'no'
   more_asserts = 0
@@ -306,6 +430,66 @@ install_data(
   install_dir: join_paths(nma_datadir, 'GConf', 'gsettings')
 )
 
+# documentation
+enable_gtk_doc = get_option('gtk_doc')
+if enable_gtk_doc
+  mod_name = 'libnma'
+
+  private_headers = [
+    'nma-cert-chooser-button.h',
+    'nma-cert-chooser-private.h',
+    'nma-pkcs11-cert-chooser-dialog.h',
+    'nma-pkcs11-token-login-dialog.h',
+    'nma-resources.h',
+    'nma-private.h',
+    'nma-version.h',
+  ]
+
+  private_sources = [
+    'nma-cert-chooser-button.c',
+    'nma-file-cert-chooser.c',
+    'nma-pkcs11-cert-chooser-dialog.c',
+    'nma-pkcs11-cert-chooser.c',
+    'nma-pkcs11-token-login-dialog.c',
+    'nma-resources.c'
+  ]
+
+  ent_conf = configuration_data()
+  ent_conf.set_quoted('PACKAGE', meson.project_name())
+  ent_conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/network-manager-applet/issues')
+  ent_conf.set_quoted('PACKAGE_NAME', nma_name)
+  ent_conf.set_quoted('PACKAGE_STRING', '@0@ @1@'.format(nma_name, nma_version))
+  ent_conf.set_quoted('PACKAGE_TARNAME', meson.project_name())
+  ent_conf.set_quoted('PACKAGE_URL', '')
+  ent_conf.set_quoted('PACKAGE_VERSION', nma_version)
+
+  ent = 'gtkdocentities.ent'
+
+  configure_file(
+    input: ent + '.in',
+    output: ent,
+    configuration: ent_conf
+  )
+
+  doc_path = join_paths(nma_datadir, 'gtk-doc', 'html', mod_name)
+
+  gnome.gtkdoc(
+    mod_name,
+    main_xml: mod_name + '-docs.xml',
+    src_dir: libnma_inc,
+    dependencies: libnma_dep,
+    scan_args: [
+      '--rebuild-types',
+      '--rebuild-sections',
+      '--ignore-headers=' + ' '.join(private_headers)
+    ],
+    mkdb_args: '--ignore-files=' + ' '.join(private_headers + private_sources),
+    gobject_typesfile: mod_name + '.types',
+    install: true,
+    install_dir: doc_path
+  )
+endif
+
 config = 'config.h'
 
 configure_file(
@@ -321,6 +505,8 @@ meson.add_install_script(
 )
 
 output = '\n'
+output += '  Build EXPERIMENTAL library libnm-gtk4 for use with GTK4: ' + enable_libnma_gtk4.to_string() + 
'\n'
+output += '  GCR: ' + enable_gcr.to_string() + '\n'
 output += '  LTO: ' + get_option('b_lto').to_string() + '\n'
 output += '  Linker garbage collection: ' + enable_ld_gc.to_string() + '\n'
 output += '  libappindicator: ' + enable_appindicator
diff --git a/meson_options.txt b/meson_options.txt
index 15f96450..01ee5aec 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,6 +1,12 @@
+option('libnma_gtk4', type: 'boolean', value: false, description: 'build EXPERIMENTAL library libnma-gtk4 
for use with GTK4')
 option('appindicator', type: 'string', value: 'no', description: 'Build with lib(ayatana-)appindicator 
support in addition to xembed systray support (no|yes|auto|ayatana|ubuntu). Default is "no", "yes" is an 
alias for "auto".')
 option('wwan', type: 'boolean', value: true, description: 'Enable WWAN support.')
 option('selinux', type: 'boolean', value: true, description: 'Enable support for adjusting SELinux labels in 
configuration editor.')
 option('team', type: 'boolean', value: true, description: 'Enable team configuration editor.')
+option('gcr', type: 'boolean', value: true, description: 'Enable advanced certificate chooser.')
 option('more_asserts', type: 'string', value: '0', description: 'Enable more assertions for debugging.')
+option('iso_codes', type: 'boolean', value: true, description: 'check for iso-codes at build-time')
+option('mobile_broadband_provider_info', type: 'boolean', value: true, description: 'check for 
mobile-broadband-provider-info at build-time')
 option('ld_gc', type: 'boolean', value: true, description: 'Enable garbage collection of unused symbols on 
linking')
+option('gtk_doc', type: 'boolean', value: true, description: 'use gtk-doc to build documentation')
+option('introspection', type: 'boolean', value: true, description: 'Enable introspection for this build')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3803b199..78b18609 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -80,6 +80,23 @@ src/connection-editor/vpn-helpers.c
 src/ethernet-dialog.c
 src/gsm-unlock.ui
 src/info.ui
+src/libnma/nma-bar-code-widget.c
+src/libnma/nma-bar-code-widget.ui
+src/libnma/nma-file-cert-chooser.c
+src/libnma/nma-mobile-providers.c
+src/libnma/nma-mobile-wizard.c
+src/libnma/nma-mobile-wizard.ui
+src/libnma/nma-cert-chooser-button.c
+src/libnma/nma-pkcs11-cert-chooser.c
+src/libnma/nma-pkcs11-cert-chooser-dialog.c
+src/libnma/nma-pkcs11-cert-chooser-dialog.ui
+src/libnma/nma-pkcs11-token-login-dialog.c
+src/libnma/nma-pkcs11-token-login-dialog.ui
+src/libnma/nma-ui-utils.c
+src/libnma/nma-vpn-password-dialog.c
+src/libnma/nma-vpn-password-dialog.ui
+src/libnma/nma-wifi-dialog.c
+src/libnma/wifi.ui
 src/main.c
 src/mb-menu-item.c
 src/mobile-helpers.c
diff --git a/po/af.po b/po/af.po
index f5360434..e6284a1c 100644
--- a/po/af.po
+++ b/po/af.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2011-04-04 08:18+0200\n"
 "Last-Translator: F Wolff <friedel translate org za>\n"
 "Language-Team: translate-discuss-af lists sourceforge net\n"
@@ -21,6 +21,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Netwerk"
 
@@ -221,15 +222,19 @@ msgstr "DSL-magtiging"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Verbind"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Netwerk-naam:"
@@ -589,7 +594,7 @@ msgstr "Selfoonbreëband (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Selfoonbreëband"
 
@@ -718,7 +723,9 @@ msgstr "DSL-magtiging"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -831,6 +838,7 @@ msgid "Error displaying connection information:"
 msgstr "Daar is 'n fout met die vertoon van verbindingsinligting:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 #, fuzzy
 msgid "LEAP"
@@ -984,7 +992,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Wagwoord:"
@@ -1011,7 +1019,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "Verbi_nding:"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 #, fuzzy
 msgid "Unknown"
 msgstr "Onbekend"
@@ -1751,6 +1760,7 @@ msgid "_Service"
 msgstr "Dien_s:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2379,6 +2389,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr ""
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr ""
 
@@ -2768,14 +2779,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "Outo-Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3086,12 +3098,12 @@ msgid ""
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3101,22 +3113,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3408,6 +3423,7 @@ msgstr ""
 "Die VPN-verbinding '%s' het misluk."
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
@@ -3625,6 +3641,8 @@ msgstr "Geen netwerkverbinding"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Verstek"
 
@@ -3839,35 +3857,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr ""
 
@@ -4022,10 +4040,12 @@ msgid "Wi-Fi connection %d"
 msgstr "VPN-verbinding het misluk"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr ""
 
@@ -4034,14 +4054,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 msgid "WPA3 Personal"
 msgstr ""
 
@@ -4117,6 +4140,477 @@ msgstr "Verbindingsinligting"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "W_agwoord:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "W_agwoord:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "My land is nie gelys nie"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Ongelys"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "My land is nie gelys nie"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Verskaffer"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Geïnstalleerde GSM-toestel"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Geïnstalleerde GSM-toestel"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Enige toetstel"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nuwe selfoon-breëbandverbinding"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Dié assistent help om maklik 'n selfoon-breëbandverbinding na 'n "
+"selfoonnetwerk (3G) op te stel."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Die volgende inligting word benodig:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Die breëbandverskaffer se naam"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Stel 'n selfoon-breëbandverbinding op"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land of streek"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Kies die verskaffer se land of streek"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "My verskaffer gebruik GSM-tegnologie (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "My verskaffer gebruik CDMA-tegnologie (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Kies die verskaffer"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "Kie_s die plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Die selfoon-breëbandverbinding is gekonfigureer met die volgende instellings:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Toestel:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Verskaffer:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Diensplan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Bevestig selfoon-breëbandinstellings"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(geen)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Onbekend"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "W_agwoord:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "Ontsl_uit"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "Vra tel_kens vir 'n wagwoord"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "'n Wagwoord word benodig om aan '%s' te verbind."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "_Wys wagwoord"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "W_agwoord:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "W_agwoord:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "W_agwoord:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Ontkoppel"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Geen"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dinamiese-WEP"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "S_kep"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Wagwoorde of enkripsiesleutels word benodig vir toegang tot die draadlose "
+"netwerk '%s'."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "Gebruikersmagtiging vereis vir draadlose netwerk '%s'..."
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "Skep nuwe draadlose netwerk"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Nuwe draadlose netwerk"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Gee 'n naam vir die draadlose netwerk om te skep."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Verbind aan verskuilde draadlose netwerk"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "Verskuilde draadlose netwerk"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Gee die naam en sekuriteitbesonderhede van die verskuilde draadlose netwerk "
+"waaraan u wil verbind."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Draadloos-sekuriteit:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Verbi_nding:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Draadlosenetwerk-p_asstuk:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Verskaffer:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Land- en streeklys:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Land of streek"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Draadloos-sekuriteit:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Netwerk-naam:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Verbi_nding:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Draadlosenetwerk-p_asstuk:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr ""
@@ -4264,25 +4758,25 @@ msgstr ""
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4320,16 +4814,16 @@ msgstr "DSL-magtiging"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4364,15 +4858,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4385,23 +4879,23 @@ msgstr ""
 msgid "Sh_ow passphrase"
 msgstr "_Wys wagwoord"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4409,7 +4903,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
@@ -4448,15 +4942,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "DSL-magtiging"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "W_agwoord:"
@@ -4465,33 +4959,33 @@ msgstr "W_agwoord:"
 msgid "_Type"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4519,235 +5013,17 @@ msgstr ""
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "W_agwoord:"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "W_agwoord:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "My land is nie gelys nie"
-
-#~ msgid "Unlisted"
-#~ msgstr "Ongelys"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "My land is nie gelys nie"
-
-#~ msgid "Provider"
-#~ msgstr "Verskaffer"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Geïnstalleerde GSM-toestel"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Geïnstalleerde GSM-toestel"
-
-#~ msgid "Any device"
-#~ msgstr "Enige toetstel"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nuwe selfoon-breëbandverbinding"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Dié assistent help om maklik 'n selfoon-breëbandverbinding na 'n "
-#~ "selfoonnetwerk (3G) op te stel."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Die volgende inligting word benodig:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Die breëbandverskaffer se naam"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Stel 'n selfoon-breëbandverbinding op"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Land of streek"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Kies die verskaffer se land of streek"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "My verskaffer gebruik GSM-tegnologie (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "My verskaffer gebruik CDMA-tegnologie (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Kies die verskaffer"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "Kie_s die plan:"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Die selfoon-breëbandverbinding is gekonfigureer met die volgende "
-#~ "instellings:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Toestel:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Verskaffer:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Diensplan:"
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Bevestig selfoon-breëbandinstellings"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(geen)"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Onbekend"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "W_agwoord:"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "Ontsl_uit"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "Vra tel_kens vir 'n wagwoord"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "'n Wagwoord word benodig om aan '%s' te verbind."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "_Wys wagwoord"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "W_agwoord:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "W_agwoord:"
-
-#~ msgid "_Password:"
-#~ msgstr "W_agwoord:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Ontkoppel"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Geen"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dinamiese-WEP"
-
-#~ msgid "C_reate"
-#~ msgstr "S_kep"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Wagwoorde of enkripsiesleutels word benodig vir toegang tot die draadlose "
-#~ "netwerk '%s'."
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Gebruikersmagtiging vereis vir draadlose netwerk '%s'..."
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Skep nuwe draadlose netwerk"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nuwe draadlose netwerk"
-
-#, 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."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Verbind aan verskuilde draadlose netwerk"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Verskuilde draadlose netwerk"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Gee die naam en sekuriteitbesonderhede van die verskuilde draadlose "
-#~ "netwerk waaraan u wil verbind."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Draadloos-sekuriteit:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Verbi_nding:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Draadlosenetwerk-p_asstuk:"
-
-#~ msgid "Provider:"
-#~ msgstr "Verskaffer:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Land- en streeklys:"
-
-#~ msgid "Country or region"
-#~ msgstr "Land of streek"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Draadloos-sekuriteit:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Netwerk-naam:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Verbi_nding:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Draadlosenetwerk-p_asstuk:"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "Verstek"
diff --git a/po/an.po b/po/an.po
index 8d9054e8..3333efea 100644
--- a/po/an.po
+++ b/po/an.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2012-09-29 13:19+0200\n"
 "Last-Translator: Daniel Martinez <entaltoaragon gmail com>\n"
 "Language-Team: Aragonés <softaragones googlegroups com>\n"
@@ -20,6 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Rete"
 
@@ -217,16 +218,20 @@ msgstr "Autenticación DSL"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 #, fuzzy
 msgid "C_onnect"
 msgstr "C_onexion:"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Nome d'o rete:"
@@ -588,7 +593,7 @@ msgstr "Banda ampla movil (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Banda ampla movil"
 
@@ -716,7 +721,9 @@ msgstr "Autenticación DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -828,6 +835,7 @@ msgid "Error displaying connection information:"
 msgstr "Ha ocurriu una error en amostrar información d'a connexión:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -979,7 +987,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Clau de paso:"
@@ -1005,7 +1013,8 @@ msgstr "Mensache VPN"
 msgid "Base Connection"
 msgstr "C_onexion:"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Desconoxida"
 
@@ -1766,6 +1775,7 @@ msgid "_Service"
 msgstr "_Servicio"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2434,6 +2444,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Permitir '_roaming' si o ret domestico no ye disponible"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "A_mostrar claus de paso"
 
@@ -2834,14 +2845,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "Ethernet automatica"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3166,12 +3178,12 @@ msgstr ""
 "qualques metodos."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3181,22 +3193,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3499,6 +3514,7 @@ msgid "Select a connection to delete"
 msgstr "Conexion cableada %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nome"
 
@@ -3734,6 +3750,8 @@ msgstr "Conexion cableada %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Predeterminau"
 
@@ -3967,35 +3985,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "O mío proveedor usa tecnolochía basada en C_DMA (eix. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4166,10 +4184,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Conexion cableada %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clau WEP 40/128-bit (Hexadecimal u ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase de paso WEP de 128 bits"
 
@@ -4178,14 +4198,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinamica (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA y WPA2 presonal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA y WPA2 enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA y WPA2 presonal"
@@ -4266,6 +4289,492 @@ msgstr "Informacion d'a conexion"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Ignorar certificau CA"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Trie un certificau CA:"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Clau pri_vada:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Clau de pase de clau _privada:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Trie un certificau CA:"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Certificau de l'_usuario"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "O mio pais no ye en a lista"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+#, fuzzy
+msgid "Unlisted"
+msgstr "Sin listar"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "O mío plan no ye en a lista…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Proveedor"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Dispositivo GSM instalau"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Dispositivo CDMA instalau"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Cualsiquier dispositivo"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Connexión de banda ampla mobil nueva"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+#, fuzzy
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Iste asistent le aduya a configurar una connexión de banda ampla mobil con "
+"un ret mobil (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+#, fuzzy
+msgid "You will need the following information:"
+msgstr "Amenesterá a siguient información:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "O nombre d'o suyo proveedor de banda ampla"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "O nombre d'o suyo plan de pres"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(En qualques casos) o suyo plan de pres APN (nombre d'o punto d'acceso)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+#, fuzzy
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Creyar una connexión para ye_te dispositivo de banda ampla mobil:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Configurar una connexión de banda ampla mobil"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Pais u rechion"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Trie o pais u la rechion d'o suyo proveedor"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+#, fuzzy
+msgid "Select your provider from a _list:"
+msgstr "Seleccionar o suyo proveedor d'a _lista:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "No puedo trobar o mío proveedor y querría introducir-lo _manualment:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "O mío proveedor usa tecnolochía GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "O mío proveedor usa tecnolochía CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Trie o suyo proveedor"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+#, fuzzy
+msgid "_Select your plan:"
+msgstr "_Seleccionar o suyo plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+#, fuzzy
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Plan _APN (nombre d'o punto d'acceso) seleccionau:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Alvertencia: seleccionar un plan incorrecto puede resultar en problemas de "
+"facturas ta la suya cuenta de banda ampla u impedir a conectividat.\n"
+"\n"
+"Si no ye seguro d'o suyo plan consulte a o suyo proveedor ta o suyo plan APN."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Trigar o suyo plan de pres"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+" A suya connexión de banda ampla mobil ye configurada con os siguients "
+"achustes:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "O suyo dispositivo:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "O suyo proveedor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "O suyo plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Agora se creyará una connexión con a suya proveedor de banda ampla mobil "
+"usando os achustes seleccionaus. Si a connexión falla u no puede accedir a "
+"os recursos d'o ret, comprebe dos vegadas os suyos achustes. Ta modificar os "
+"suyos achustes de connexión d'a banda ampla mobil, trigue \"Connexions de ret"
+"\" dende o menú Sistema » Preferencias."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmar os achustes d'a banda ampla mobil"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(denguna)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Certificau C_A:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Desconoxida"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Trie un certificau CA:"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Certificau de l'_usuario"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Editar conexions..."
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Desbloqueyar"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "_Preguntar ista clau cada vegada"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "S'amenista una clau de paso ta connectar con «%s»"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "A_mostrar claus de paso"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "Clau de _paso:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "Clau de _paso:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "Clau de _paso:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Desenchegar"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Denguna"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinamica (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_reyar"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "S'ameneste autenticación d'usuario ta la connexión de ret «%s»…"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Ret domestico"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "Ret domestico"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Seguridat inalambrica:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "C_onexion:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Cualsiquier dispositivo"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "No puedo trobar o mío proveedor y querría introducir-lo _manualment:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Proveedor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Lista de paises u rechions"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Pais u rechion"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Cableau"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Seguridat inalambrica:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nome d'o rete:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "C_onexion:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr ""
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Uso:"
@@ -4418,26 +4927,26 @@ msgstr "Ignorar certificau CA"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Trigar un fichero PAC…"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Fichers PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Totz os fichers"
 
@@ -4478,16 +4987,16 @@ msgstr "Autenticación i_nterna:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir a provisión PAC _automatica"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4524,15 +5033,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4546,24 +5055,24 @@ msgstr "Frase de paso WEP de 128 bits"
 msgid "Sh_ow passphrase"
 msgstr "A_mostrar claus de paso"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ignorar certificau CA"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4572,7 +5081,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_dentidat:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4612,15 +5121,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Autenticación:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Clau de pase de clau _privada:"
@@ -4630,33 +5139,33 @@ msgstr "Clau de pase de clau _privada:"
 msgid "_Type"
 msgstr "_Tipo:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4686,299 +5195,17 @@ msgstr "A_mostrar clau"
 msgid "WEP inde_x"
 msgstr "En_diz WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Ignorar certificau CA"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Trie un certificau CA:"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Clau pri_vada:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Clau de pase de clau _privada:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Trie un certificau CA:"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Certificau de l'_usuario"
-
-#~ msgid "My country is not listed"
-#~ msgstr "O mio pais no ye en a lista"
-
-#, fuzzy
-#~ msgid "Unlisted"
-#~ msgstr "Sin listar"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "O mío plan no ye en a lista…"
-
-#~ msgid "Provider"
-#~ msgstr "Proveedor"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Dispositivo GSM instalau"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Dispositivo CDMA instalau"
-
-#~ msgid "Any device"
-#~ msgstr "Cualsiquier dispositivo"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Connexión de banda ampla mobil nueva"
-
-#, fuzzy
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Iste asistent le aduya a configurar una connexión de banda ampla mobil "
-#~ "con un ret mobil (3G)."
-
-#, fuzzy
-#~ msgid "You will need the following information:"
-#~ msgstr "Amenesterá a siguient información:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "O nombre d'o suyo proveedor de banda ampla"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "O nombre d'o suyo plan de pres"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(En qualques casos) o suyo plan de pres APN (nombre d'o punto d'acceso)"
-
-#, fuzzy
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Creyar una connexión para ye_te dispositivo de banda ampla mobil:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Configurar una connexión de banda ampla mobil"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Pais u rechion"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Trie o pais u la rechion d'o suyo proveedor"
-
-#, fuzzy
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Seleccionar o suyo proveedor d'a _lista:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "No puedo trobar o mío proveedor y querría introducir-lo _manualment:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "O mío proveedor usa tecnolochía GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "O mío proveedor usa tecnolochía CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Trie o suyo proveedor"
-
-#, fuzzy
-#~ msgid "_Select your plan:"
-#~ msgstr "_Seleccionar o suyo plan:"
-
-#, fuzzy
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Plan _APN (nombre d'o punto d'acceso) seleccionau:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Alvertencia: seleccionar un plan incorrecto puede resultar en problemas "
-#~ "de facturas ta la suya cuenta de banda ampla u impedir a conectividat.\n"
-#~ "\n"
-#~ "Si no ye seguro d'o suyo plan consulte a o suyo proveedor ta o suyo plan "
-#~ "APN."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Trigar o suyo plan de pres"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ " A suya connexión de banda ampla mobil ye configurada con os siguients "
-#~ "achustes:"
-
-#~ msgid "Your Device:"
-#~ msgstr "O suyo dispositivo:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "O suyo proveedor:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "O suyo plan:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Agora se creyará una connexión con a suya proveedor de banda ampla mobil "
-#~ "usando os achustes seleccionaus. Si a connexión falla u no puede accedir "
-#~ "a os recursos d'o ret, comprebe dos vegadas os suyos achustes. Ta "
-#~ "modificar os suyos achustes de connexión d'a banda ampla mobil, trigue "
-#~ "\"Connexions de ret\" dende o menú Sistema » Preferencias."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Confirmar os achustes d'a banda ampla mobil"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(denguna)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certificau C_A:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Desconoxida"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Trie un certificau CA:"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Certificau de l'_usuario"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Editar conexions..."
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Desbloqueyar"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "_Preguntar ista clau cada vegada"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "S'amenista una clau de paso ta connectar con «%s»"
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "A_mostrar claus de paso"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Clau de _paso:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "Clau de _paso:"
-
-#~ msgid "_Password:"
-#~ msgstr "Clau de _paso:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Desenchegar"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Denguna"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP dinamica (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "C_reyar"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "S'ameneste autenticación d'usuario ta la connexión de ret «%s»…"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Ret domestico"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Ret domestico"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Seguridat inalambrica:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "C_onexion:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Cualsiquier dispositivo"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "No puedo trobar o mío proveedor y querría introducir-lo _manualment:"
-
-#~ msgid "Provider:"
-#~ msgstr "Proveedor:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Lista de paises u rechions"
-
-#~ msgid "Country or region"
-#~ msgstr "Pais u rechion"
-
-#~ msgid "Wired"
-#~ msgstr "Cableau"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Seguridat inalambrica:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nome d'o rete:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "C_onexion:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (Predeterminau)"
 
diff --git a/po/ar.po b/po/ar.po
index f683e795..0d1b3711 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet.network-manager-applet-0-6.ar\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2011-09-17 16:16+0300\n"
 "Last-Translator: Abdalrahim G. Fakhouri <abdilra7eem yahoo com>\n"
 "Language-Team: Arabic <doc arabeyes org>\n"
@@ -27,6 +27,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "شبكة"
 
@@ -215,15 +216,19 @@ msgstr "استيثاق 802.1X سلكي"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "ا_تّصل"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "اسم ال_شبكة:"
@@ -579,7 +584,7 @@ msgstr "شبكة هاتف محمول (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "شبكة هاتف محمول"
 
@@ -707,7 +712,9 @@ msgstr "استيثاق DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -824,6 +831,7 @@ msgid "Error displaying connection information:"
 msgstr "خطأ أثناء عرض معلومات الاتصال:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -975,7 +983,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "كلمة السر:"
@@ -1004,7 +1012,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "الات_صال:"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "مجهول"
 
@@ -1747,6 +1756,7 @@ msgid "_Service"
 msgstr "الخ_دمة:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2392,6 +2402,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr ""
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "أظهر _كلمات السر"
 
@@ -2790,14 +2801,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "إيثرنت تلقائي"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3109,12 +3121,12 @@ msgid ""
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3124,22 +3136,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3457,6 +3472,7 @@ msgid "Select a connection to delete"
 msgstr "الاتصال السلكي %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "الاسم"
 
@@ -3684,6 +3700,8 @@ msgstr "الاتصال السلكي %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "المبدئي"
 
@@ -3907,35 +3925,35 @@ msgstr "مقدم الخدمة يستخدم تقنية GSM‏ (GPRS، EDGE، UMTS
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "مقدم الخدمة يستخدم تقنية CDMA (‏1xRTT، EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4098,11 +4116,13 @@ msgid "Wi-Fi connection %d"
 msgstr "الاتصال السلكي %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "مفتاح WEP 40/128-bit"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "عبارة سر WEP 128-bit"
 
@@ -4111,14 +4131,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamic WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "‏WPA و WPA2 شخصي"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "‏WPA و WPA2 للشركات"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "‏WPA و WPA2 شخصي"
@@ -4194,6 +4217,489 @@ msgstr "معلومات الاتصال"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "ملف شهادة _سُلْطة استيثاق:"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "اختر شهادتك الشخصية..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "المفتاح ال_سري:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "كل_مة سر المفتاح السري:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "اختر شهادتك الشخصية..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "شهادة المست_خدم:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "بلدي ليست في القائمة"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "ليس في القائمة"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "ليس في القائمة..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "مقدم الخدمة"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "جهاز GSM مثبّت"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "جهاز CDMA مثبّت"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "أي جهاز"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "اتصال شبكة هاتف محمول جديد..."
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr "يساعدك هذا المعالج على إعداد اتصال بشبكة هاتف محمول."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "ستحتاج المعلومات التالية:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "اسم مقدم الخدمة"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "نظام الدفع"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(أحيانا) اسم نقطة اتصال (APN) نظام الدفع"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "أنشئ ا_تصالا لجهاز شبكة الهاتف المحمول:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "اضبط اتصال شبكة هاتف محمول"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "البلد أو المنطقة"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "اختر بلد أو منطقة مقدم الخدمة"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "اختر مقدم الخدمة من ال_قائمة:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "لم أجد مقدم الخدمة وأريد إدخال المعلومات ي_دويا:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "مقدم الخدمة يستخدم تقنية GSM‏ (GPRS، EDGE، UMTS،HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "مقدم الخدمة يستخدم تقنية CDMA (‏1xRTT، EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "اختر مقدم الخدمة"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "ا_ختر نظام الدفع:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "اسم نق_طة اتصال (APN) نظام الدفع المختار:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"تحذير: اختيار نظام دفع خطأ قد يؤدي إلى مشاكل في حساب تكاليف الاتصال أو قد "
+"يعطل الاتصال تماما.\n"
+"\n"
+"إذا لم تكن متأكدا من نظام الدفع فراجع مقدم الخدمة للحصول على اسم نقطة "
+"الاتصال (APN)."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "اختر نظام الدفع"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "اتصالك عبر شبكة المحمول مضبوط بالإعدادات التالية:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "جهازك:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "مزود الخدمة:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "نظام الدفع:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"سيُنشأ الآن اتصال بمزود الخدمة طبقا للإعدادات التي اخترتها. إذا فشل الاتصال "
+"أو لم تستطع الوصول إلى الإنترنت، فراجع الإعدادات. لتغيير الإعدادات اختر "
+"\"الاتصالات الشبكية\" من قائمة \"نظام ← تفضيلات\"."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "أكد إعدادات الاتصال عبر شبكة المحمول"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(لا شيء)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "ملف شهادة _سُلْطة استيثاق:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "مجهول"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "اختر ملفًا"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "اختر ملفًا"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "اختر شهادتك الشخصية..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "شهادة المست_خدم:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "خطأ أثناء عرض معلومات الاتصال:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "ا_فتح"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "عبارة السر للشبكة اللاسلكية %s"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "ا_طلب كلمة السر هذه في كل مرة"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "كلمة سر مطلوبة للاتصال بشبكة الهاتف المحمول '%s'."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "أظهر _كلمات السر"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_كلمة السر:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_كلمة السر:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_كلمة السر:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "لا يوجد اتصال شبكي"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "بدون"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamic WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "أن_شئ"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "كلمات السر أو مفاتيح التعمية مطلوبة للاتصال بالشبكة اللاسلكية '%s'."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "الاستيثاق من مطلوب للاتصال بالشبكة اللاسلكية"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "الاستيثاق من مطلوب للاتصال بالشبكة اللاسلكية"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "أنشئ شبكة لاسلكيّة جديدة"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "شبكة لاسلكيّة جديدة"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "أدخل اسم الشبكة اللاسلكية التي تريد إنشائها."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "اتصل بشبكة لاسلكية مخفية"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "شبكة لاسلكيّة مخفية"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"أدخل اسم والإعدادات الأمنية للشبكة اللاسلكية المخفية التي تريد الاتصال بها."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "أمن ال_لاسلكي:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "الات_صال:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "المحول ال_لاسلكي:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "لم أجد مقدم الخدمة وأريد إدخال المعلومات ي_دويا:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "مقدم الخدمة:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "قائمة البلدان والمناطق:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "البلد أو المنطقة"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "سلكي"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "أمن ال_لاسلكي:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "اسم ال_شبكة:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "الات_صال:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "المحول ال_لاسلكي:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "الاستخدام:"
@@ -4341,25 +4847,25 @@ msgstr "ملف شهادة _سُلْطة استيثاق:"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4399,16 +4905,16 @@ msgstr "الاستيثاق ال_داخلي:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4445,15 +4951,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4467,24 +4973,24 @@ msgstr "عبارة سر WEP 128-bit"
 msgid "Sh_ow passphrase"
 msgstr "أظهر عبارة السر"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "ملف شهادة _سُلْطة استيثاق:"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4493,7 +4999,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "ا_لهوية:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4533,15 +5039,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "الا_ستيثاق:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "كل_مة سر المفتاح السري:"
@@ -4551,33 +5057,33 @@ msgstr "كل_مة سر المفتاح السري:"
 msgid "_Type"
 msgstr "ال_نوع:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4607,329 +5113,17 @@ msgstr "أظهر ال_مفتاح"
 msgid "WEP inde_x"
 msgstr "_فهرس WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "ملف شهادة _سُلْطة استيثاق:"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "اختر شهادتك الشخصية..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "المفتاح ال_سري:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "كل_مة سر المفتاح السري:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "اختر شهادتك الشخصية..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "شهادة المست_خدم:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "بلدي ليست في القائمة"
-
-#~ msgid "Unlisted"
-#~ msgstr "ليس في القائمة"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "ليس في القائمة..."
-
-#~ msgid "Provider"
-#~ msgstr "مقدم الخدمة"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "جهاز GSM مثبّت"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "جهاز CDMA مثبّت"
-
-#~ msgid "Any device"
-#~ msgstr "أي جهاز"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "اتصال شبكة هاتف محمول جديد..."
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr "يساعدك هذا المعالج على إعداد اتصال بشبكة هاتف محمول."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "ستحتاج المعلومات التالية:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "اسم مقدم الخدمة"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "نظام الدفع"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(أحيانا) اسم نقطة اتصال (APN) نظام الدفع"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "أنشئ ا_تصالا لجهاز شبكة الهاتف المحمول:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "اضبط اتصال شبكة هاتف محمول"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "البلد أو المنطقة"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "اختر بلد أو منطقة مقدم الخدمة"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "اختر مقدم الخدمة من ال_قائمة:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "لم أجد مقدم الخدمة وأريد إدخال المعلومات ي_دويا:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "مقدم الخدمة يستخدم تقنية GSM‏ (GPRS، EDGE، UMTS،HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "مقدم الخدمة يستخدم تقنية CDMA (‏1xRTT، EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "اختر مقدم الخدمة"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "ا_ختر نظام الدفع:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "اسم نق_طة اتصال (APN) نظام الدفع المختار:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "تحذير: اختيار نظام دفع خطأ قد يؤدي إلى مشاكل في حساب تكاليف الاتصال أو قد "
-#~ "يعطل الاتصال تماما.\n"
-#~ "\n"
-#~ "إذا لم تكن متأكدا من نظام الدفع فراجع مقدم الخدمة للحصول على اسم نقطة "
-#~ "الاتصال (APN)."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "اختر نظام الدفع"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "اتصالك عبر شبكة المحمول مضبوط بالإعدادات التالية:"
-
-#~ msgid "Your Device:"
-#~ msgstr "جهازك:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "مزود الخدمة:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "نظام الدفع:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "سيُنشأ الآن اتصال بمزود الخدمة طبقا للإعدادات التي اخترتها. إذا فشل "
-#~ "الاتصال أو لم تستطع الوصول إلى الإنترنت، فراجع الإعدادات. لتغيير "
-#~ "الإعدادات اختر \"الاتصالات الشبكية\" من قائمة \"نظام ← تفضيلات\"."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "أكد إعدادات الاتصال عبر شبكة المحمول"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(لا شيء)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "ملف شهادة _سُلْطة استيثاق:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "مجهول"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "اختر ملفًا"
-
-#, fuzzy
-#~ msgid "Select from file…"
-#~ msgstr "اختر ملفًا"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "اختر شهادتك الشخصية..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "شهادة المست_خدم:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "خطأ أثناء عرض معلومات الاتصال:"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "ا_فتح"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "عبارة السر للشبكة اللاسلكية %s"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "ا_طلب كلمة السر هذه في كل مرة"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "كلمة سر مطلوبة للاتصال بشبكة الهاتف المحمول '%s'."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "أظهر _كلمات السر"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_كلمة السر:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_كلمة السر:"
-
-#~ msgid "_Password:"
-#~ msgstr "_كلمة السر:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "لا يوجد اتصال شبكي"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "بدون"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynamic WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "أن_شئ"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr "كلمات السر أو مفاتيح التعمية مطلوبة للاتصال بالشبكة اللاسلكية '%s'."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "الاستيثاق من مطلوب للاتصال بالشبكة اللاسلكية"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "الاستيثاق من مطلوب للاتصال بالشبكة اللاسلكية"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "أنشئ شبكة لاسلكيّة جديدة"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "شبكة لاسلكيّة جديدة"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "أدخل اسم الشبكة اللاسلكية التي تريد إنشائها."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "اتصل بشبكة لاسلكية مخفية"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "شبكة لاسلكيّة مخفية"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "أدخل اسم والإعدادات الأمنية للشبكة اللاسلكية المخفية التي تريد الاتصال "
-#~ "بها."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "أمن ال_لاسلكي:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "الات_صال:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "المحول ال_لاسلكي:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "لم أجد مقدم الخدمة وأريد إدخال المعلومات ي_دويا:"
-
-#~ msgid "Provider:"
-#~ msgstr "مقدم الخدمة:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "قائمة البلدان والمناطق:"
-
-#~ msgid "Country or region"
-#~ msgstr "البلد أو المنطقة"
-
-#~ msgid "Wired"
-#~ msgstr "سلكي"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "أمن ال_لاسلكي:"
-
-#~ msgid "_Network name:"
-#~ msgstr "اسم ال_شبكة:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "الات_صال:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "المحول ال_لاسلكي:"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "1 (المبدئي)"
diff --git a/po/as.po b/po/as.po
index b1158b0a..f7913294 100644
--- a/po/as.po
+++ b/po/as.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2014-08-20 18:20+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami redhat com>\n"
 "Language-Team: Assamese <kde-i18n-doc kde org>\n"
@@ -22,6 +22,7 @@ msgstr ""
 "X-Generator: Lokalize 1.5\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "নেটৱৰ্ক"
 
@@ -217,15 +218,19 @@ msgstr "802.1X প্ৰমাণীকৰণ"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "সংযোগ কৰা (_o)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "নেটৱৰ্কৰ নাম (_N):"
@@ -577,7 +582,7 @@ msgstr "ম'বাইল ব্ৰ'ডবেণ্ড (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড"
 
@@ -699,7 +704,9 @@ msgstr "DSL প্ৰমাণীকৰণ"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -805,6 +812,7 @@ msgid "Error displaying connection information:"
 msgstr "সঠিক তথ্য দেখুৱাওঁতে ত্ৰুটি:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -955,7 +963,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "পাছৱৰ্ড:"
@@ -980,7 +988,8 @@ msgstr "VPN বেনাৰ"
 msgid "Base Connection"
 msgstr "ভিত্তি সংযোগ"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
@@ -1757,6 +1766,7 @@ msgid "_Service"
 msgstr "সেৱা (_S):"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2417,6 +2427,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "ঘৰ নেটৱৰ্ক উপস্থিত নাথাকিলে ৰ'মিংৰ অনুমতি দিয়ক (_r)"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "পাছৱৰ্ডসমূহ দেখুৱাওক (_w)"
 
@@ -2821,13 +2832,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "ইথাৰনেট"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3151,12 +3163,12 @@ msgstr ""
 "যদি সংযোগসমূহ ব্যৰ্থ হব, কিছুমান পদ্ধতিৰ বাবে সমৰ্থন অসামৰ্থবান কৰি চাওক।"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "ব্লুটুথ"
 
@@ -3166,22 +3178,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "বান্ধনী"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "দল"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "ব্ৰিজ"
 
@@ -3478,6 +3493,7 @@ msgid "Select a connection to delete"
 msgstr "দল সংযোগ %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "নাম"
 
@@ -3701,6 +3717,8 @@ msgstr "ইথাৰনেট সংযোগ %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "অবিকল্পিত"
 
@@ -3934,35 +3952,35 @@ msgstr ""
 "মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা CDMA-ভিত্তিক প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (অৰ্থাৎ 1xRTT, "
 "EVDO) (_D)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4126,10 +4144,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi সংযোগ %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit কি (Hex অথবা ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP ১২৮-বিট পৰিচয়পংক্তি"
 
@@ -4138,14 +4158,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "ডাইনামিক WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA আৰু WPA2 ব্যক্তিগত"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA আৰু WPA2 এন্টাৰপ্ৰাইজ"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA আৰু WPA2 ব্যক্তিগত"
@@ -4221,6 +4244,481 @@ msgstr "সংযোগ তথ্য"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "ব্যক্তিগত কি' (_k):"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "ব্যক্তিগত কি' পাছৱৰ্ড (_P):"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "ব্যৱহাৰকাৰী প্ৰমাণপত্ৰ (_U):"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "মোৰ দেশ তালিকাত নাই"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "তালিকা বহিৰ্ভূত"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "মোৰ পৰিকল্পনা তালিকাভুক্ত নহয়..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "সেৱা উপলব্ধকৰ্তা"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "ইনস্টল কৰা GSM ডিভাইচ"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "ইনস্টল কৰা CDMA ডিভাইচ"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "যিকোনো ডিভাইচ"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "নতুন ম'বাইল ব্ৰডবেণ্ড সংযোগ"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"এই সহায়ক ব্যৱস্থাৰ সহায়ত এটা চেলুলাৰ (3G) নেটৱৰ্কৰ সৈতে ম'বাইল ব্ৰডবেণ্ড সংযোগ "
+"স্থাপন কৰা যাব।"
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "নিম্নলিখিত তথ্যৰ প্ৰয়োজন:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "ব্ৰডবেণ্ড সেৱা উপলব্ধকৰ্তাৰ নাম"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "ব্ৰডবেণ্ড বিলিং পৰিকল্পনাৰ নাম"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(কিছু ক্ষেত্ৰত) আপোনাৰ ব্যৱহৃত ব্ৰডবেণ্ড বিলিং পৰিকল্পনা APN (এক্সেচ পইন্ট নেম)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "এই ম'বাইল ব্ৰডবেণ্ড ডিভাইচৰ বাবে সংযোগ সৃষ্টি কৰক (_t)"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "ম'বাইল ব্ৰডবেণ্ড সংযোগ প্ৰস্তুত কৰক"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "দেশ অথবা অঞ্চল"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "আপোনাৰ প্ৰদানকাৰীৰ দেশ অথবা অঞ্চল বাছক"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "তালিকাৰ পৰা সেৱা উপলব্ধকৰ্তাৰ নাম বাছক (_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "সেৱা উপলব্ধকৰ্তাৰ নাম অনুপস্থিত আৰু মই স্বয়ং সেইটো লিখিবলৈ ইচ্ছুক (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+"মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা GSM প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা CDMA প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "সেৱা উপলব্ধকৰ্তা বাছক"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "আপোনাৰ পৰিকল্পনা বাছক (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "নিৰ্বাচিত পৰিকল্পনাৰ APN (এক্সেচ পইন্ট নেম) (_A):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"সতৰ্কবাৰ্তা: ভুল পৰিকল্পনা নিৰ্বাচন কৰিলে আপোনাৰ ব্ৰডবেণ্ড সংযোগৰ বিল আৰু সংযোগ "
+"স্থাপনত সমস্যা হ'ব।\n"
+"\n"
+"পৰিকল্পনা সম্পৰ্কে নিশ্চিত ন'হ'লে অনুগ্ৰহ কৰি সেৱা উপলব্ধকৰ্তা সৈতে যোগাযোগ কৰি "
+"আপোনাৰ ব্যৱহৃত পৰিকল্পনাৰ APN জানক।"
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "ব্যৱহৃত বিল পৰিকল্পনা বাছক"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "নিম্নলিখিত সংহতিসমূহৰ সৈতে ম'বাইল ব্ৰডবেণ্ড সংযোগ সংৰূপণ কৰা হৈছে:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "আপোনাৰ ডিভাইচ:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "আপোনাৰ সেৱা উপলব্ধকৰ্তা:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "আপোনাৰ পৰিকল্পনা:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"আপোনাৰ নিৰ্বাচিত সংহতিসমূহসমূহ প্ৰয়োগ কৰি এতিয়া আপোনাৰ ম'বাইল ব্ৰডবেণ্ড সেৱা "
+"উপলব্ধকৰ্তাৰ সৈতে সংযোগ স্থাপন কৰা হ'ব।  সংযোগ বিফল হ'লে বা নেটৱৰ্ক সম্পদ ব্যৱহাৰ "
+"কৰা সম্ভৱ ন'হ'লে, নিৰ্ধাৰিত সংহতিসমূহসমূহ পৰীক্ষা কৰক।  ম'বাইল ব্ৰডবেণ্ড সংযোগৰ "
+"সংহতিসমূহ পৰিবৰ্তন কৰাৰ বাবে প্ৰণালী >> পছন্দ তালিকাৰ পৰা \"নেটৱৰ্ক সংযোগ\" বাছক।"
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "ম'বাইল ব্ৰডবেণ্ডৰ সংহতিসমূহ নিশ্চিত কৰক"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(শূণ্য)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA প্ৰমাণপত্ৰ (_A):"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "অজ্ঞাত"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "এটা পঞ্জিকা নিৰ্বাচন কৰক"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "এটা পঞ্জিকা নিৰ্বাচন কৰক"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "ব্যৱহাৰকাৰী প্ৰমাণপত্ৰ (_U):"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "সংযোগ সম্পাদন কৰোতে ত্ৰুটি"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "আনলক কৰক (_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "পাছৱৰ্ডক কেৱল এই ব্যৱহাৰকাৰীৰ বাবে সংৰক্ষণ কৰক (_u)"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "সকলো ব্যৱহাৰকাৰীৰ বাবে পাছৱৰ্ড সংৰক্ষণ কৰক (_a)"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "প্ৰতিবাৰ এই পাছৱৰ্ড লিখাৰ অনুৰোধ কৰা হ'ব (_k)"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "'%s' লৈ সংযোগ কৰিবলৈ এটা পাছৱৰ্ডৰ প্ৰয়োজন।"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "পাছৱৰ্ডসমূহ দেখুৱাওক (_o)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "দ্বিতীয় পাছৱৰ্ড (_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "দ্বিতীয় পাছৱৰ্ড (_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "পাছৱৰ্ড (_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "বিচ্ছিন্ন কৰক"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "কোনো নহয়"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "ডাইনামিক WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "সৃষ্টি কৰক (_r)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "'%s' Wi-Fi নেটৱৰ্ক ব্যৱহাৰ কৰাৰ বাবে পাছৱৰ্ড বা এনক্ৰিপশন কি'ৰ প্ৰয়োজন।"
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi নেটৱৰ্ক প্ৰমাণীকৰণ প্ৰয়োজন"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi নেটৱৰ্কৰ দ্বাৰা প্ৰমাণীকৰণৰ প্ৰয়োজন"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "নতুন Wi-Fi নেটৱৰ্ক সৃষ্টি কৰক"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "নতুন Wi-Fi নেটৱৰ্ক"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "সৃষ্টি কৰাৰ বাবে চিহ্নিত Wi-Fi নেটৱৰ্কৰ এটা নাম নিৰ্ধাৰণ কৰক।"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "লুকুৱা Wi-Fi নেটৱৰ্কৰ সৈতে সংযোগ কৰক"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "লুকুৱা Wi-Fi নেটৱৰ্ক"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "সংযোগ কৰাৰ বাবে চিহ্নিত লুকুৱা Wi-Fi নেটৱৰ্কৰ নাম আৰু সুৰক্ষা তথ্য লিখক।"
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi সুৰক্ষা (_s):"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "সংযোগ (_o):"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi এডাপ্টাৰ (_a):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "সেৱা উপলব্ধকৰ্তাৰ নাম অনুপস্থিত আৰু মই স্বয়ং সেইটো লিখিবলৈ ইচ্ছুক (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "সেৱা উপলব্ধকৰ্তা:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "দেশ অথবা অঞ্চল তালিকা:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "দেশ অথবা অঞ্চল"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "তাঁৰযুক্ত"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC মেশ"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi সুৰক্ষা (_s):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "নেটৱৰ্কৰ নাম (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "সংযোগ (_o):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi এডাপ্টাৰ (_a):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "ব্যৱহাৰপদ্ধতি (_U):"
@@ -4371,26 +4869,26 @@ msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "এটা PAC ফাইল বাছক..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ফাইলসমূহ (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "সকলো ফাইল"
 
@@ -4429,16 +4927,16 @@ msgstr "অভ্যন্তৰীক প্ৰমাণীকৰণ (_I):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "স্বচালিত PAC যোগানৰ অনুমতি দিয়ক (_v)"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4474,15 +4972,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4496,24 +4994,24 @@ msgstr "WEP ১২৮-বিট পৰিচয়পংক্তি"
 msgid "Sh_ow passphrase"
 msgstr "পাছৱৰ্ডসমূহ দেখুৱাওক (_o)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4522,7 +5020,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "পৰিচয় (_d):"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4562,15 +5060,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "প্ৰমাণীকৰণ (_t):"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "ব্যক্তিগত কি' পাছৱৰ্ড (_P):"
@@ -4580,33 +5078,33 @@ msgstr "ব্যক্তিগত কি' পাছৱৰ্ড (_P):"
 msgid "_Type"
 msgstr "ধৰণ (_T):"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4636,342 +5134,17 @@ msgstr "কি' দেখুৱাওক (_w)"
 msgid "WEP inde_x"
 msgstr "WEP সূচী (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "ব্যক্তিগত কি' (_k):"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "ব্যক্তিগত কি' পাছৱৰ্ড (_P):"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "ব্যৱহাৰকাৰী প্ৰমাণপত্ৰ (_U):"
-
-#~ msgid "My country is not listed"
-#~ msgstr "মোৰ দেশ তালিকাত নাই"
-
-#~ msgid "Unlisted"
-#~ msgstr "তালিকা বহিৰ্ভূত"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "মোৰ পৰিকল্পনা তালিকাভুক্ত নহয়..."
-
-#~ msgid "Provider"
-#~ msgstr "সেৱা উপলব্ধকৰ্তা"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "ইনস্টল কৰা GSM ডিভাইচ"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "ইনস্টল কৰা CDMA ডিভাইচ"
-
-#~ msgid "Any device"
-#~ msgstr "যিকোনো ডিভাইচ"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "নতুন ম'বাইল ব্ৰডবেণ্ড সংযোগ"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "এই সহায়ক ব্যৱস্থাৰ সহায়ত এটা চেলুলাৰ (3G) নেটৱৰ্কৰ সৈতে ম'বাইল ব্ৰডবেণ্ড সংযোগ "
-#~ "স্থাপন কৰা যাব।"
-
-#~ msgid "You will need the following information:"
-#~ msgstr "নিম্নলিখিত তথ্যৰ প্ৰয়োজন:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "ব্ৰডবেণ্ড সেৱা উপলব্ধকৰ্তাৰ নাম"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "ব্ৰডবেণ্ড বিলিং পৰিকল্পনাৰ নাম"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(কিছু ক্ষেত্ৰত) আপোনাৰ ব্যৱহৃত ব্ৰডবেণ্ড বিলিং পৰিকল্পনা APN (এক্সেচ পইন্ট নেম)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "এই ম'বাইল ব্ৰডবেণ্ড ডিভাইচৰ বাবে সংযোগ সৃষ্টি কৰক (_t)"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "ম'বাইল ব্ৰডবেণ্ড সংযোগ প্ৰস্তুত কৰক"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "দেশ অথবা অঞ্চল"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "আপোনাৰ প্ৰদানকাৰীৰ দেশ অথবা অঞ্চল বাছক"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "তালিকাৰ পৰা সেৱা উপলব্ধকৰ্তাৰ নাম বাছক (_l):"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "সেৱা উপলব্ধকৰ্তাৰ নাম অনুপস্থিত আৰু মই স্বয়ং সেইটো লিখিবলৈ ইচ্ছুক (_m):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr ""
-#~ "মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা GSM প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা CDMA প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "সেৱা উপলব্ধকৰ্তা বাছক"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "আপোনাৰ পৰিকল্পনা বাছক (_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "নিৰ্বাচিত পৰিকল্পনাৰ APN (এক্সেচ পইন্ট নেম) (_A):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "সতৰ্কবাৰ্তা: ভুল পৰিকল্পনা নিৰ্বাচন কৰিলে আপোনাৰ ব্ৰডবেণ্ড সংযোগৰ বিল আৰু সংযোগ "
-#~ "স্থাপনত সমস্যা হ'ব।\n"
-#~ "\n"
-#~ "পৰিকল্পনা সম্পৰ্কে নিশ্চিত ন'হ'লে অনুগ্ৰহ কৰি সেৱা উপলব্ধকৰ্তা সৈতে যোগাযোগ কৰি "
-#~ "আপোনাৰ ব্যৱহৃত পৰিকল্পনাৰ APN জানক।"
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "ব্যৱহৃত বিল পৰিকল্পনা বাছক"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "নিম্নলিখিত সংহতিসমূহৰ সৈতে ম'বাইল ব্ৰডবেণ্ড সংযোগ সংৰূপণ কৰা হৈছে:"
-
-#~ msgid "Your Device:"
-#~ msgstr "আপোনাৰ ডিভাইচ:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "আপোনাৰ সেৱা উপলব্ধকৰ্তা:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "আপোনাৰ পৰিকল্পনা:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "আপোনাৰ নিৰ্বাচিত সংহতিসমূহসমূহ প্ৰয়োগ কৰি এতিয়া আপোনাৰ ম'বাইল ব্ৰডবেণ্ড সেৱা "
-#~ "উপলব্ধকৰ্তাৰ সৈতে সংযোগ স্থাপন কৰা হ'ব।  সংযোগ বিফল হ'লে বা নেটৱৰ্ক সম্পদ "
-#~ "ব্যৱহাৰ কৰা সম্ভৱ ন'হ'লে, নিৰ্ধাৰিত সংহতিসমূহসমূহ পৰীক্ষা কৰক।  ম'বাইল ব্ৰডবেণ্ড "
-#~ "সংযোগৰ সংহতিসমূহ পৰিবৰ্তন কৰাৰ বাবে প্ৰণালী >> পছন্দ তালিকাৰ পৰা \"নেটৱৰ্ক "
-#~ "সংযোগ\" বাছক।"
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "ম'বাইল ব্ৰডবেণ্ডৰ সংহতিসমূহ নিশ্চিত কৰক"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(শূণ্য)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "CA প্ৰমাণপত্ৰ (_A):"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "অজ্ঞাত"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "এটা পঞ্জিকা নিৰ্বাচন কৰক"
-
-#, fuzzy
-#~ msgid "Select from file…"
-#~ msgstr "এটা পঞ্জিকা নিৰ্বাচন কৰক"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "ব্যৱহাৰকাৰী প্ৰমাণপত্ৰ (_U):"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "সংযোগ সম্পাদন কৰোতে ত্ৰুটি"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "আনলক কৰক (_U)"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "পাছৱৰ্ডক কেৱল এই ব্যৱহাৰকাৰীৰ বাবে সংৰক্ষণ কৰক (_u)"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "সকলো ব্যৱহাৰকাৰীৰ বাবে পাছৱৰ্ড সংৰক্ষণ কৰক (_a)"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "প্ৰতিবাৰ এই পাছৱৰ্ড লিখাৰ অনুৰোধ কৰা হ'ব (_k)"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "'%s' লৈ সংযোগ কৰিবলৈ এটা পাছৱৰ্ডৰ প্ৰয়োজন।"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "পাছৱৰ্ডসমূহ দেখুৱাওক (_o)"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "দ্বিতীয় পাছৱৰ্ড (_S):"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "দ্বিতীয় পাছৱৰ্ড (_S):"
-
-#~ msgid "_Password:"
-#~ msgstr "পাছৱৰ্ড (_P):"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "বিচ্ছিন্ন কৰক"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "কোনো নহয়"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "ডাইনামিক WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "সৃষ্টি কৰক (_r)"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr "'%s' Wi-Fi নেটৱৰ্ক ব্যৱহাৰ কৰাৰ বাবে পাছৱৰ্ড বা এনক্ৰিপশন কি'ৰ প্ৰয়োজন।"
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wi-Fi নেটৱৰ্ক প্ৰমাণীকৰণ প্ৰয়োজন"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Wi-Fi নেটৱৰ্কৰ দ্বাৰা প্ৰমাণীকৰণৰ প্ৰয়োজন"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "নতুন Wi-Fi নেটৱৰ্ক সৃষ্টি কৰক"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "নতুন Wi-Fi নেটৱৰ্ক"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "সৃষ্টি কৰাৰ বাবে চিহ্নিত Wi-Fi নেটৱৰ্কৰ এটা নাম নিৰ্ধাৰণ কৰক।"
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "লুকুৱা Wi-Fi নেটৱৰ্কৰ সৈতে সংযোগ কৰক"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "লুকুৱা Wi-Fi নেটৱৰ্ক"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr "সংযোগ কৰাৰ বাবে চিহ্নিত লুকুৱা Wi-Fi নেটৱৰ্কৰ নাম আৰু সুৰক্ষা তথ্য লিখক।"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wi-Fi সুৰক্ষা (_s):"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "সংযোগ (_o):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-Fi এডাপ্টাৰ (_a):"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "সেৱা উপলব্ধকৰ্তাৰ নাম অনুপস্থিত আৰু মই স্বয়ং সেইটো লিখিবলৈ ইচ্ছুক (_m):"
-
-#~ msgid "Provider:"
-#~ msgstr "সেৱা উপলব্ধকৰ্তা:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "দেশ অথবা অঞ্চল তালিকা:"
-
-#~ msgid "Country or region"
-#~ msgstr "দেশ অথবা অঞ্চল"
-
-#~ msgid "Wired"
-#~ msgstr "তাঁৰযুক্ত"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC মেশ"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wi-Fi সুৰক্ষা (_s):"
-
-#~ msgid "_Network name:"
-#~ msgstr "নেটৱৰ্কৰ নাম (_N):"
-
-#~ msgid "C_onnection:"
-#~ msgstr "সংযোগ (_o):"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-Fi এডাপ্টাৰ (_a):"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (অবিকল্পিত)"
 
diff --git a/po/ast.po b/po/ast.po
index f2c10ca3..c088a5f5 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2011-09-07 17:48+0200\n"
 "Last-Translator: Xandru Armesto <xandru softastur org>\n"
 "Language-Team: Softastur <alministradores softastur org>\n"
@@ -21,6 +21,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Rede"
 
@@ -215,15 +216,19 @@ msgstr "Autenticación cableada 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Coneutar"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "Nome de _rede:"
@@ -581,7 +586,7 @@ msgstr "Banda ancha móvil (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Banda ancha móvil"
 
@@ -709,7 +714,9 @@ msgstr "Autenticación DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -823,6 +830,7 @@ msgid "Error displaying connection information:"
 msgstr "Fallu al amosar la información de conexón:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -974,7 +982,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Contraseña:"
@@ -1003,7 +1011,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "Co_nexón:"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 #, fuzzy
 msgid "Unknown"
 msgstr "Desconocida"
@@ -1758,6 +1767,7 @@ msgid "_Service"
 msgstr "_Serviciu:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2423,6 +2433,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Permitir «roaming» si la rede doméstica nun ta disponible"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "A_mosar les contraseñes"
 
@@ -2819,14 +2830,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "Ethernet automático"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3149,12 +3161,12 @@ msgstr ""
 "dellos métodos."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3164,22 +3176,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3479,6 +3494,7 @@ msgid "Select a connection to delete"
 msgstr "Conexón cableada %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nome"
 
@@ -3708,6 +3724,8 @@ msgstr "Conexón cableada %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Predetermináu"
 
@@ -3935,35 +3953,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "El mio fornidor usa teunoloxía basada en C_DMA (ex. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4131,10 +4149,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Conexón cableada %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clave WEP 40/128-bit (Hexadecimal o ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Fras de pasu WEP de 128 bits"
 
@@ -4143,14 +4163,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinámica (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA y WPA2 personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA y WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA y WPA2 personal"
@@ -4230,6 +4253,495 @@ msgstr "Información de la conexón"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Certificáu C_A:"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Escueyi'l to certificáu personal..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "C_lave privada:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Contraseña de clave pri_vada:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Escueyi'l to certificáu personal..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Certificáu del _usuariu:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "El mio país nun ta na llista"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Non llistáu"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "El mio plan nun ta na llista…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Fornidor"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Preséu GSM instaláu"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Preséu CDMA instaláu"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Cualisquier preséu"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Conexón de banda ancha móvil nueva"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Esti asistente ayúdate a configurar de forma cenciella una conexón de banda "
+"ancha móvil a una rede de teléfonu móvil (3G)"
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Necesitará la siguiente información:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "El nome del fornidor de banda ancha"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "El nome del to plan de precios"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(en dalgunos casos) El nome del plan de precios del to APN (nome del puntu "
+"d'accesu)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Crear una conexón pa _esti preséu móvil de banda ancha:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Configurar una conexón de banda ancha móvil"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "País o rexón"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Escueye'l país o rexón del to fornidor"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Esbillar el so proveedor d'una _llista:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Nun puedo alcontrar el mio fornidor y quiero introducilu a _man:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "El mio proveedor usa teunoloxía GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "El mio proveedor usa teunoloxía CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Esbille'l so proveedor…"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Esbillar el so plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Plan _APN (nome del puntu d'accesu) esbilláu"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Avisu: Esbillar un plan incorreutu puede traer problemes na facturación de "
+"la cuenta de banda ancha móvil o impedir la conectividá.\n"
+"\n"
+"Si nun tu ta seguru del so plan de precios, entrugue al so proveedor."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Escoyer el so plan de precios"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"La so conexón móvil de banda ancha ta configurada colos siguientes axustes:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "El to preséu:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "El to fornidor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "El to plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Agora fadráse una conexón col so proveedor de banda ancha móvil usando los "
+"axustes qu'esbilló. Si la conexón falla, o nun puede acceder a los recursos "
+"de rede, compruebe de nuevu los sos axustes. Pa modificar los sos axustes de "
+"conexón de la banda ancha móvil, esbille «Conexones de rede» dende'l menú "
+"Sistema » Preferencies."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmar los axustes de la banda ancha móvil"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(dengún)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Certificáu C_A:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Desconocida"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Escueyi'l to certificáu personal..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Certificáu del _usuariu:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Fallu al editar la conexón"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Desbloquiar"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "_Entrugar esta contraseña cada vegada"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Necesítase una contraseña pa coneutar con «%s»"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "A_mosar les contraseñes"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Contraseña:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Contraseña:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Contraseña:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Desconeutar"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Denguna"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinámica (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_rear"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Necesítense les contraseñes o les claves d'encriptación pa l'accesu a la "
+"rede inalámbrica « %s »."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Requierse autentificación pa la rede inalámbrica"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "Necesítase autentificación pa la rede inalámbrica"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "Crear Nueva Rede Wifi"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Nueva rede inalámbrica"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Introduz un nome pa la rede wifi que quies crear"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Coneutar a redes invisibles inalámbriques"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "Rede invisible inalámbrica"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Escueyi'l nome y los detalles de seguridá de la rede invisibles inalámbrica "
+"a la que te quies coneutar."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Seguridá inalámbrica:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Co_nexón:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptador Wifi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Nun puedo alcontrar el mio fornidor y quiero introducilu a _man:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Proveedor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Llista de país o rexón:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "País o rexón"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Cableada"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Seguridá inalámbrica:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Nome de _rede:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nexón:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptador Wifi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Usu:"
@@ -4382,25 +4894,25 @@ msgstr "Certificáu C_A:"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4440,16 +4952,16 @@ msgstr "Autenticación i_nterna:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4486,15 +4998,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4508,24 +5020,24 @@ msgstr "Fras de pasu WEP de 128 bits"
 msgid "Sh_ow passphrase"
 msgstr "A_mosar les contraseñes"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Certificáu C_A:"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4534,7 +5046,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_dentidá:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4574,15 +5086,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Autenticación:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Contraseña de clave pri_vada:"
@@ -4592,33 +5104,33 @@ msgstr "Contraseña de clave pri_vada:"
 msgid "_Type"
 msgstr "_Triba:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4648,326 +5160,17 @@ msgstr "A_mosar la clave"
 msgid "WEP inde_x"
 msgstr "Índ_iz WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Certificáu C_A:"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Escueyi'l to certificáu personal..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "C_lave privada:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Contraseña de clave pri_vada:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Escueyi'l to certificáu personal..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Certificáu del _usuariu:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "El mio país nun ta na llista"
-
-#~ msgid "Unlisted"
-#~ msgstr "Non llistáu"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "El mio plan nun ta na llista…"
-
-#~ msgid "Provider"
-#~ msgstr "Fornidor"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Preséu GSM instaláu"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Preséu CDMA instaláu"
-
-#~ msgid "Any device"
-#~ msgstr "Cualisquier preséu"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Conexón de banda ancha móvil nueva"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Esti asistente ayúdate a configurar de forma cenciella una conexón de "
-#~ "banda ancha móvil a una rede de teléfonu móvil (3G)"
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Necesitará la siguiente información:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "El nome del fornidor de banda ancha"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "El nome del to plan de precios"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(en dalgunos casos) El nome del plan de precios del to APN (nome del "
-#~ "puntu d'accesu)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Crear una conexón pa _esti preséu móvil de banda ancha:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Configurar una conexón de banda ancha móvil"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "País o rexón"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Escueye'l país o rexón del to fornidor"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Esbillar el so proveedor d'una _llista:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Nun puedo alcontrar el mio fornidor y quiero introducilu a _man:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "El mio proveedor usa teunoloxía GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "El mio proveedor usa teunoloxía CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Esbille'l so proveedor…"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Esbillar el so plan:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Plan _APN (nome del puntu d'accesu) esbilláu"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Avisu: Esbillar un plan incorreutu puede traer problemes na facturación "
-#~ "de la cuenta de banda ancha móvil o impedir la conectividá.\n"
-#~ "\n"
-#~ "Si nun tu ta seguru del so plan de precios, entrugue al so proveedor."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Escoyer el so plan de precios"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "La so conexón móvil de banda ancha ta configurada colos siguientes "
-#~ "axustes:"
-
-#~ msgid "Your Device:"
-#~ msgstr "El to preséu:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "El to fornidor:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "El to plan:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Agora fadráse una conexón col so proveedor de banda ancha móvil usando "
-#~ "los axustes qu'esbilló. Si la conexón falla, o nun puede acceder a los "
-#~ "recursos de rede, compruebe de nuevu los sos axustes. Pa modificar los "
-#~ "sos axustes de conexón de la banda ancha móvil, esbille «Conexones de "
-#~ "rede» dende'l menú Sistema » Preferencies."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Confirmar los axustes de la banda ancha móvil"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(dengún)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certificáu C_A:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Desconocida"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Escueyi'l to certificáu personal..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Certificáu del _usuariu:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Fallu al editar la conexón"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Desbloquiar"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "_Entrugar esta contraseña cada vegada"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Necesítase una contraseña pa coneutar con «%s»"
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "A_mosar les contraseñes"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Contraseña:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Contraseña:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Contraseña:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Desconeutar"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Denguna"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP dinámica (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "C_rear"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Necesítense les contraseñes o les claves d'encriptación pa l'accesu a la "
-#~ "rede inalámbrica « %s »."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Requierse autentificación pa la rede inalámbrica"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Necesítase autentificación pa la rede inalámbrica"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Crear Nueva Rede Wifi"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nueva rede inalámbrica"
-
-#, 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"
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Coneutar a redes invisibles inalámbriques"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Rede invisible inalámbrica"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Escueyi'l nome y los detalles de seguridá de la rede invisibles "
-#~ "inalámbrica a la que te quies coneutar."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Seguridá inalámbrica:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Co_nexón:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Adaptador Wifi:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Nun puedo alcontrar el mio fornidor y quiero introducilu a _man:"
-
-#~ msgid "Provider:"
-#~ msgstr "Proveedor:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Llista de país o rexón:"
-
-#~ msgid "Country or region"
-#~ msgstr "País o rexón"
-
-#~ msgid "Wired"
-#~ msgstr "Cableada"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Seguridá inalámbrica:"
-
-#~ msgid "_Network name:"
-#~ msgstr "Nome de _rede:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Co_nexón:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Adaptador Wifi:"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "1 (Predetermináu)"
diff --git a/po/be.po b/po/be.po
index ecba4ffb..404ab79f 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2012-08-19 00:28+0300\n"
 "Last-Translator: Ihar Hrachyshka <ihar hrachyshka gmail com>\n"
 "Language-Team: Belarusian <be-i18n-gnome googlegroups com>\n"
@@ -19,6 +19,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Сетка"
 
@@ -202,15 +203,19 @@ msgstr "Ідэнтыфікацыя 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "Да_лучыцца"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Назва сеткі:"
@@ -566,7 +571,7 @@ msgstr "Шырокапалоснае мабільнае злучэнне (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Шырокапалоснае мабільнае злучэнне"
 
@@ -692,7 +697,9 @@ msgstr "DSL-ідэнтыфікацыя"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -801,6 +808,7 @@ msgid "Error displaying connection information:"
 msgstr "Памылка паказу інфармацыі аб злучэнні:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -951,7 +959,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
@@ -976,7 +984,8 @@ msgstr "Банер VPN"
 msgid "Base Connection"
 msgstr "Асноўнае злучэнне"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Невядома"
 
@@ -1745,6 +1754,7 @@ msgid "_Service"
 msgstr "Па_слуга:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2401,6 +2411,7 @@ msgstr ""
 "Дазволіць _карыстанне роўмінг-паслугамі пры недаступнасці дамашняй сеткі"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Паказаць паролі"
 
@@ -2804,13 +2815,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3135,12 +3147,12 @@ msgstr ""
 "некаторыя з метадаў."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3150,22 +3162,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bond"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Мост"
 
@@ -3468,6 +3483,7 @@ msgid "Select a connection to delete"
 msgstr "DSL злучэнне %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Назва"
 
@@ -3698,6 +3714,8 @@ msgstr "Злучэнне Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Прадвызначана"
 
@@ -3935,35 +3953,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Мой аператар выкарыстоўвае CDMA-т_эхналогію (напрыклад, 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4134,10 +4152,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Злучэнне Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP, 40/128-бітны ключ (Hex ці ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP, 128-бітны пароль"
 
@@ -4146,14 +4166,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Дынамічны WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
@@ -4233,6 +4256,483 @@ msgstr "Інфармацыя аб злучэнні"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Ігнараваць сертыфікат CA"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Вызначэнне сертыфіката CA"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Прыватны _ключ:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_Пароль прыватнага ключа:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Вызначэнне сертыфіката CA"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_Сертыфікат карыстальніка:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Маёй краіны няма ў спісе"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Не ў спісе"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Мой тарыфны план адсутнічае ў спісе..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Аператар"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Усталяванае GSM-прыстасаванне"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Усталяванае CDMA-прыстасаванне"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Любое прыстасаванне"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Новае шырокапалоснае мабільнае злучэнне"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Гэты памочнік дапаможа вам лёгка настроіць шырокапалоснае мабільнае злучэнне "
+"з сотавай 3G-сеткай."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Вам спатрэбіцца наступная інфармацыя:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Назва вашага мабільнага аператара"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Назва вашага тарыфнага плана"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(у некаторых выпадках) Пункт доступу (APN) для вашага тарыфнага плана"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr ""
+"Стварыць злучэнне для _гэтага прыстасавання шырокапалоснай мабільнай сувязі:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Настройка шырокапалоснага мабільнага злучэння"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Краіна ці рэгіён"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Выбар краіны ці рэгіёна мабільнага аператара"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Выберыце свайго мабільнага _аператара са спіса:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "_Я не знайшоў свайго аператара і хачу вызначыць яго самастойна:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Мой аператар выкарыстоўвае GSM-тэхналогію (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Мой аператар выкарыстоўвае CDMA-тэхналогію (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Выбар мабільнага аператара"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Вызначыце тарыфны план:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_Пункт доступу тарыфнага плана (APN):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Увага: выбар няправільнага тарыфнага плана можа мець вынікам празмерныя "
+"фінансавыя страты або перашкодзіць злучэнню.\n"
+"\n"
+"Калі вы не ўпэўнены, якім тарыфным планам вы карыстаецеся, спытайце ў свайго "
+"мабільнага аператара аб патрэбным пункце доступу (APN)."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Выбар тарыфнага плана"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Ваша шырокапалоснае мабільнае злучэнне мае наступную канфігурацыю настроек:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Прыстасаванне:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Мабільны аператар:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Тарыфны план:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Зараз будзе ўсталявана злучэнне з вашым мабільным аператарам з вызначанымі "
+"вамі настройкамі. Калі злучэнне не будзе ўсталявана або вы не атрымаеце "
+"доступ да сеткавых рэсурсаў, пераправерце настройкі. Каб змяніць настройкі "
+"шырокапалоснага мабільнага злучэння, выберыце пункт \"Сеткавыя злучэнні\" ў "
+"меню \"Асабістыя настройкі\"."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Пацвярджэнне настроек шырокапалоснай мабільнай сувязі"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(няма)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "_Сертыфікат CA:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Невядома"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Вызначэнне сертыфіката CA"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Сертыфікат карыстальніка:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Памылка змянення злучэння"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Разблакіраваць"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "_Штораз запытваць гэты пароль"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Для злучэння з сеткай \"%s\" патрэбны пароль."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "_Паказаць паролі"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "П_ароль:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "П_ароль:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "П_ароль:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Адлучыцца"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Няма"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Дынамічны WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Стварыць"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "Для доступу да сеткі Wi-Fi \"%s\" патрэбны пароль або ключ шыфравання."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Патрэбна ідэнтыфікацыя для сеткі Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Патрэбна ідэнтыфікацыя для сеткі Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Стварэнне новай сеткі Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Новая сетка Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Упішыце назву новай сеткі Wi-Fi."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Злучэнне са схаванай сеткай Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Схаваная сетка Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Упішыце назву і вызначыце настройкі бяспекі для схаванай сеткі Wi-Fi, з якой "
+"трэба злучыцца."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Бяспека Wi-Fi:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "_Злучэнне:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Адаптар Wi-Fi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "_Я не знайшоў свайго аператара і хачу вызначыць яго самастойна:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Аператар:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Спіс краін і рэгіёнаў:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Краіна ці рэгіён"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Правадны"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Бяспека Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Назва сеткі:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Злучэнне:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Адаптар Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Правілы карыстання:"
@@ -4386,26 +4886,26 @@ msgstr "Ігнараваць сертыфікат CA"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Выберыце PAC-файл..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-файлы (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Усе файлы"
 
@@ -4444,16 +4944,16 @@ msgstr "_Унутраная ідэнтыфікацыя:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Дазволіць _аўтаматычнае забеспячэнне PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4490,15 +4990,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4512,24 +5012,24 @@ msgstr "WEP, 128-бітны пароль"
 msgid "Sh_ow passphrase"
 msgstr "_Паказаць паролі"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ігнараваць сертыфікат CA"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4538,7 +5038,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "Ід_энтычнасць:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4578,15 +5078,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Ід_энтыфікацыя:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_Пароль прыватнага ключа:"
@@ -4596,33 +5096,33 @@ msgstr "_Пароль прыватнага ключа:"
 msgid "_Type"
 msgstr "_Тып:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4652,334 +5152,17 @@ msgstr "_Паказаць ключ"
 msgid "WEP inde_x"
 msgstr "WEP-і_ндэкс:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Ігнараваць сертыфікат CA"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Вызначэнне сертыфіката CA"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Прыватны _ключ:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Пароль прыватнага ключа:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Вызначэнне сертыфіката CA"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Сертыфікат карыстальніка:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Маёй краіны няма ў спісе"
-
-#~ msgid "Unlisted"
-#~ msgstr "Не ў спісе"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Мой тарыфны план адсутнічае ў спісе..."
-
-#~ msgid "Provider"
-#~ msgstr "Аператар"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Усталяванае GSM-прыстасаванне"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Усталяванае CDMA-прыстасаванне"
-
-#~ msgid "Any device"
-#~ msgstr "Любое прыстасаванне"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Новае шырокапалоснае мабільнае злучэнне"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Гэты памочнік дапаможа вам лёгка настроіць шырокапалоснае мабільнае "
-#~ "злучэнне з сотавай 3G-сеткай."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Вам спатрэбіцца наступная інфармацыя:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Назва вашага мабільнага аператара"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Назва вашага тарыфнага плана"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(у некаторых выпадках) Пункт доступу (APN) для вашага тарыфнага плана"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr ""
-#~ "Стварыць злучэнне для _гэтага прыстасавання шырокапалоснай мабільнай "
-#~ "сувязі:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Настройка шырокапалоснага мабільнага злучэння"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Краіна ці рэгіён"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Выбар краіны ці рэгіёна мабільнага аператара"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Выберыце свайго мабільнага _аператара са спіса:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "_Я не знайшоў свайго аператара і хачу вызначыць яго самастойна:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Мой аператар выкарыстоўвае GSM-тэхналогію (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Мой аператар выкарыстоўвае CDMA-тэхналогію (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Выбар мабільнага аператара"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Вызначыце тарыфны план:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "_Пункт доступу тарыфнага плана (APN):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Увага: выбар няправільнага тарыфнага плана можа мець вынікам празмерныя "
-#~ "фінансавыя страты або перашкодзіць злучэнню.\n"
-#~ "\n"
-#~ "Калі вы не ўпэўнены, якім тарыфным планам вы карыстаецеся, спытайце ў "
-#~ "свайго мабільнага аператара аб патрэбным пункце доступу (APN)."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Выбар тарыфнага плана"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Ваша шырокапалоснае мабільнае злучэнне мае наступную канфігурацыю "
-#~ "настроек:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Прыстасаванне:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Мабільны аператар:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Тарыфны план:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Зараз будзе ўсталявана злучэнне з вашым мабільным аператарам з "
-#~ "вызначанымі вамі настройкамі. Калі злучэнне не будзе ўсталявана або вы не "
-#~ "атрымаеце доступ да сеткавых рэсурсаў, пераправерце настройкі. Каб "
-#~ "змяніць настройкі шырокапалоснага мабільнага злучэння, выберыце пункт "
-#~ "\"Сеткавыя злучэнні\" ў меню \"Асабістыя настройкі\"."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Пацвярджэнне настроек шырокапалоснай мабільнай сувязі"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(няма)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "_Сертыфікат CA:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Невядома"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Вызначэнне сертыфіката CA"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Сертыфікат карыстальніка:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Памылка змянення злучэння"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Разблакіраваць"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "_Штораз запытваць гэты пароль"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Для злучэння з сеткай \"%s\" патрэбны пароль."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "_Паказаць паролі"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "П_ароль:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "П_ароль:"
-
-#~ msgid "_Password:"
-#~ msgstr "П_ароль:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Адлучыцца"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Няма"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Дынамічны WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Стварыць"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Для доступу да сеткі Wi-Fi \"%s\" патрэбны пароль або ключ шыфравання."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Патрэбна ідэнтыфікацыя для сеткі Wi-Fi"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Патрэбна ідэнтыфікацыя для сеткі Wi-Fi"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Стварэнне новай сеткі Wi-Fi"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Новая сетка Wi-Fi"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Упішыце назву новай сеткі Wi-Fi."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Злучэнне са схаванай сеткай Wi-Fi"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Схаваная сетка Wi-Fi"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Упішыце назву і вызначыце настройкі бяспекі для схаванай сеткі Wi-Fi, з "
-#~ "якой трэба злучыцца."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Бяспека Wi-Fi:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "_Злучэнне:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Адаптар Wi-Fi:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "_Я не знайшоў свайго аператара і хачу вызначыць яго самастойна:"
-
-#~ msgid "Provider:"
-#~ msgstr "Аператар:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Спіс краін і рэгіёнаў:"
-
-#~ msgid "Country or region"
-#~ msgstr "Краіна ці рэгіён"
-
-#~ msgid "Wired"
-#~ msgstr "Правадны"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Бяспека Wi-Fi:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Назва сеткі:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "_Злучэнне:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Адаптар Wi-Fi:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (прадвызначана)"
 
diff --git a/po/be latin po b/po/be latin po
index 4d533abe..7bd24ce0 100644
--- a/po/be latin po
+++ b/po/be latin po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2009-02-14 12:38+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar hrachyshka gmail com>\n"
 "Language-Team: Belarusian Latin <i18n mova org>\n"
@@ -20,6 +20,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 #, fuzzy
 msgid "Network"
 msgstr "Sietka:"
@@ -205,15 +206,19 @@ msgstr "Aŭtaryzacyja dla dracianoj sietki 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Spałučy"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Nazva sietki:"
@@ -575,7 +580,7 @@ msgstr "Mobile Broadband (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mabilny Broadband"
 
@@ -706,7 +711,9 @@ msgstr "Aŭtaryzacyja DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -820,6 +827,7 @@ msgid "Error displaying connection information:"
 msgstr "Pamyłka pakazu źviestak ab spałučeńni:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -974,7 +982,7 @@ msgstr ""
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Parol:"
@@ -1003,7 +1011,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "Spałučeńnie:"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Nieviadoma"
 
@@ -1757,6 +1766,7 @@ msgid "_Service"
 msgstr "Słužba:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2402,6 +2412,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr ""
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 #, fuzzy
 msgid "Sho_w passwords"
 msgstr "Pakažy paroli"
@@ -2809,14 +2820,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "Auto Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3141,12 +3153,12 @@ msgstr ""
 "aŭtaryzacyi.</i>"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3156,22 +3168,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3479,6 +3494,7 @@ msgid "Select a connection to delete"
 msgstr "Dracianoje spałučeńnie %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nazva"
 
@@ -3708,6 +3724,8 @@ msgstr "Dracianoje spałučeńnie %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 #, fuzzy
 msgid "Default"
 msgstr "zmoŭčana"
@@ -3932,36 +3950,36 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 #, fuzzy
 msgid "CDMA"
 msgstr "CDMA (%s)"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4124,11 +4142,13 @@ msgid "Wi-Fi connection %d"
 msgstr "Dracianoje spałučeńnie %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitavy kluč"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Parolnaja fraza"
 
@@ -4137,14 +4157,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamičny WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
@@ -4220,6 +4243,484 @@ msgstr "Źviestki ab spałučeńni"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Sertyfikat CA:"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Abiary svoj persanalny sertyfikat..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Pryvatny kluč:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Parol pryvatnaha kluča:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Abiary svoj persanalny sertyfikat..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Sertyfikat karystalnika:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Zainstalavanaja pryłada GSM"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Pryłada CDMA zainstalavanaja"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+#, fuzzy
+msgid "New Mobile Broadband Connection"
+msgstr "Spałučeńnie „Mobile Broadband”"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+#, fuzzy
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Dla pryłady „Mobile Broadband” patrebny kod PIN."
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+#, fuzzy
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Spałučeńnie „Mobile Broadband”"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Abiary svoj pryvatny kluč..."
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+#, fuzzy
+msgid "Choose your Provider"
+msgstr "Abiary svoj pryvatny kluč..."
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+#, fuzzy
+msgid "Your Device:"
+msgstr "Słužba:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr ""
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+#, fuzzy
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Aŭtamatyčnaje spałučeńnie „Mobile Broadband” (GSM)"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(niama)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Sertyfikat CA:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Nieviadoma"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Abiary fajł"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+#, fuzzy
+msgid "Cancel"
+msgstr "gtk-cancel"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Abiary fajł"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Abiary svoj persanalny sertyfikat..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Sertyfikat karystalnika:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Redahavańnie spałučeńnia biaz nazvy"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Kab spałučycca z sietkaju „%s”, treba padać parol."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "Pakažy paroli"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Parol:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Parol:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Parol:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Aŭtamatyčna spałučaj"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Niama"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamičny WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Stvary"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Kab atrymać dostup da biazdrotavaj sietki \"%s\", vymahajucca paroli ci "
+"klučy šyfravańnia."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Vymahajecca aŭtaryzacyja dla biazdrotavaj sietki"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "Vymahajecca aŭtaryzacyja dla biazdrotavaj sietki"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "Stvary novuju biazdrotavuju sietku"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Novaja biazdrotavaja sietka"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Akreśl nazvu biazdrotavaj sietki, jakuju chočaš stvaryć."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Spałučy sa schavanaj biazdrotavaj sietkaju"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "Schavanaja biazdrotavaja sietka"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Akreśli nazvu j nałady biaśpieki dla schavanaj biazdrotavaj sietki, ź jakoj "
+"chočaš spałučycca."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Biazdrotavaja biaśpieka"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Spałučeńnie:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Biazdrotavy _adapter:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Dracianoje"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "Biazdrotavaja biaśpieka"
+
+#: src/libnm-gtk/wifi.ui:129
+#, fuzzy
+msgid "_Network name:"
+msgstr "_Nazva sietki:"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "Spałučeńnie:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Biazdrotavy _adapter:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr ""
@@ -4369,25 +4870,25 @@ msgstr "Abiary sertyfikat CA"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4427,16 +4928,16 @@ msgstr "Unutranaja aŭtaryzacyja:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4478,15 +4979,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4500,24 +5001,24 @@ msgstr "WEP 128-bit Parolnaja fraza"
 msgid "Sh_ow passphrase"
 msgstr "Pakažy parolnuju frazu"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Sertyfikat karystalnika:"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4526,7 +5027,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "Tojesnaść:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4566,15 +5067,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Aŭtaryzacyja:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Parol pryvatnaha kluča:"
@@ -4584,33 +5085,33 @@ msgstr "Parol pryvatnaha kluča:"
 msgid "_Type"
 msgstr "Typ:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4647,221 +5148,17 @@ msgstr "Pakažy kluč"
 msgid "WEP inde_x"
 msgstr "Indeks WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Sertyfikat CA:"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Abiary svoj persanalny sertyfikat..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Pryvatny kluč:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Parol pryvatnaha kluča:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Abiary svoj persanalny sertyfikat..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Sertyfikat karystalnika:"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Zainstalavanaja pryłada GSM"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Pryłada CDMA zainstalavanaja"
-
-#, fuzzy
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Spałučeńnie „Mobile Broadband”"
-
-#, fuzzy
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Dla pryłady „Mobile Broadband” patrebny kod PIN."
-
-#, fuzzy
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Spałučeńnie „Mobile Broadband”"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Abiary svoj pryvatny kluč..."
-
-#, fuzzy
-#~ msgid "Choose your Provider"
-#~ msgstr "Abiary svoj pryvatny kluč..."
-
-#, fuzzy
-#~ msgid "Your Device:"
-#~ msgstr "Słužba:"
-
-#, fuzzy
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Aŭtamatyčnaje spałučeńnie „Mobile Broadband” (GSM)"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(niama)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Sertyfikat CA:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Nieviadoma"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "Abiary fajł"
-
-#, fuzzy
-#~ msgid "Cancel"
-#~ msgstr "gtk-cancel"
-
-#, fuzzy
-#~ msgid "Select from file…"
-#~ msgstr "Abiary fajł"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Abiary svoj persanalny sertyfikat..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Sertyfikat karystalnika:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Redahavańnie spałučeńnia biaz nazvy"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Kab spałučycca z sietkaju „%s”, treba padać parol."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Pakažy paroli"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Parol:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Parol:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Parol:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Aŭtamatyčna spałučaj"
-
-#, fuzzy
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Niama"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynamičny WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Stvary"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Kab atrymać dostup da biazdrotavaj sietki \"%s\", vymahajucca paroli ci "
-#~ "klučy šyfravańnia."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Vymahajecca aŭtaryzacyja dla biazdrotavaj sietki"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Vymahajecca aŭtaryzacyja dla biazdrotavaj sietki"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Stvary novuju biazdrotavuju sietku"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Novaja biazdrotavaja sietka"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Akreśl nazvu biazdrotavaj sietki, jakuju chočaš stvaryć."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Spałučy sa schavanaj biazdrotavaj sietkaju"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Schavanaja biazdrotavaja sietka"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Akreśli nazvu j nałady biaśpieki dla schavanaj biazdrotavaj sietki, ź "
-#~ "jakoj chočaš spałučycca."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Biazdrotavaja biaśpieka"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Spałučeńnie:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Biazdrotavy _adapter:"
-
-#~ msgid "Wired"
-#~ msgstr "Dracianoje"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Biazdrotavaja biaśpieka"
-
-#, fuzzy
-#~ msgid "_Network name:"
-#~ msgstr "_Nazva sietki:"
-
-#, fuzzy
-#~ msgid "C_onnection:"
-#~ msgstr "Spałučeńnie:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Biazdrotavy _adapter:"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "zmoŭčana"
diff --git a/po/bg.po b/po/bg.po
index 2cc018f7..4d6723c2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2014-10-09 19:44+0300\n"
 "Last-Translator: Alexander Shopov <ash kambanaria org>\n"
 "Language-Team: Bulgarian <dict fsa-bg org>\n"
@@ -23,6 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Мрежа"
 
@@ -221,15 +222,19 @@ msgstr "Идентификация 802.1Х"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Свързване"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Име на мрежа:"
@@ -585,7 +590,7 @@ msgstr "Мобилна връзка (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Мобилна връзка"
 
@@ -707,7 +712,9 @@ msgstr "Идентификация за DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -813,6 +820,7 @@ msgid "Error displaying connection information:"
 msgstr "Грешка при показване на информацията за връзката:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -962,7 +970,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Парола:"
@@ -987,7 +995,8 @@ msgstr "Известие за ВЧМ"
 msgid "Base Connection"
 msgstr "Основна връзка"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Неопределена"
 
@@ -1773,6 +1782,7 @@ msgid "_Service"
 msgstr "_Услуга:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2435,6 +2445,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Позволяване на _роуминг, когато домашната мрежа не е налична"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Пока_зване на паролите"
 
@@ -2839,13 +2850,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3172,12 +3184,12 @@ msgstr ""
 "поддръжката на някои методи."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Безжична мрежа"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3187,22 +3199,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Свързване"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Обединяване"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Мрежов мост"
 
@@ -3502,6 +3517,7 @@ msgid "Select a connection to delete"
 msgstr "Обединена връзка %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Име"
 
@@ -3732,6 +3748,8 @@ msgstr "Жична връзка %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Стандартна"
 
@@ -3964,35 +3982,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Доставчикът използва _технология чрез CDMA (като 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4161,10 +4179,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Безжична връзка %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "40/128 битов ключ за WEP (шестнадесетичен или ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "128 битова парола за WEP"
 
@@ -4173,14 +4193,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Динамичен WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "Частна WPA & WPA2 "
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "Корпоративна WPA & WPA2"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Частна WPA & WPA2 "
@@ -4257,6 +4280,483 @@ msgstr "Информация за връзката"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "_Не е необходим сертификат от сертифициращ орган"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Избор на ваш, личен сертификат…"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Частен _ключ:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Парола за _частен ключ:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Избор на ваш, личен сертификат…"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_Потребителски сертификат:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Моята държава не е в списъка"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Не е в списъка"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Планът не е в списъка…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Доставчик"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Инсталирано устройство за GSM"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Инсталирано устройство за CDMA"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Което и да е устройство"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Нова мобилна връзка"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Този помощник ще ви помогне по-лесно да настроите връзка към мобилна (3G) "
+"мрежа."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Ще ви е нужна следната информация:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Името на вашия доставчик"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Името на вашия план за плащане"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "Име на точка за достъп на вашия план за плащане — APN (в някои случаи)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Създаване на връзка за _това устройство:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Настройване на мобилна връзка"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Държава или регион"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Изберете държавата на вашия доставчик"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Изберете вашия доставчик от _списък:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Доставчикът не е в списъка, _ръчно въвеждане:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+"Доставчикът използва технология чрез GSM (като GPRS, EDGE, UMTS, HSDPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Доставчикът използва технология чрез CDMA (като 1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Изберете вашия доставчик"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Изберете вашия план"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_Име на точка за достъп за избрания план (APN):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Предупреждение: Избирането на неправилен план може да създаде проблеми при "
+"отчитането на вашата сметка или да нямате връзка.\n"
+"\n"
+"Ако не сте сигурни за вашия план, попитайте вашия доставчик за името на "
+"точката за достъп (APN)."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Избор на вашия план за плащане"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Мобилната ви връзка е настроена по следния начин:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Устройството ви:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Доставчикът ви:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Планът ви:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Сега ще се осъществи връзка към вашия доставчик с настройките, които сте "
+"задали. Ако свързването е неуспешно или нямате достъп до мрежови ресурси, "
+"проверете отново вашите настройки. За да промените вашите настройки, "
+"изберете „Мрежови връзки“ от менюто „Система“ → „Предпочитания“."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Потвърждение на настройки на мобилна връзка"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(нищо)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "С_ертификат на CA:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Неопределена"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Избор на ваш, личен сертификат…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Потребителски сертификат:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Грешка при редактиране на връзката"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Отключване"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "_Само този потребител да ползва паролата"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "_Всички потребители да ползват паролата"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "П_итане всеки път за паролата"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "За свързване към „%s“ се изисква парола."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Пока_зване на паролите"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Втора парола:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Втора парола:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Парола:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr " Прекъсване"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Без"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Динамичен WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Създаване"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"За достъп до безжичната мрежа „%s“ са необходими пароли или криптирани "
+"ключове."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Изисква се идентификация за безжична мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Изисква се идентификация за безжична мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Създаване на нова безжична мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Нова безжична мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Въведете име на безжичната мрежа, която искате да създадете."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Свързване към скрита безжична мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Скрита безжична мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Въведете име и данни за сигурност на скритата безжична мрежа, към която "
+"искате да се свържете."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Защита на безжична мрежа:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Вр_ъзка:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Безжична _карта:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Доставчикът не е в списъка, _ръчно въвеждане:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Доставчик:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Списък с държави или региони:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Държава или регион"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Жична мрежа"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "Мрежа на OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Защита на безжична мрежа:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Име на мрежа:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Вр_ъзка:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Безжична _карта:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Употреба:"
@@ -4408,26 +4908,26 @@ msgstr "_Не е необходим сертификат от сертифици
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Избор на файл за PAC…"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Файлове за PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Всички файлове"
 
@@ -4466,16 +4966,16 @@ msgstr "В_ътрешна идентификация"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Автоматично снабдяване с PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4511,15 +5011,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4533,24 +5033,24 @@ msgstr "128 битова парола за WEP"
 msgid "Sh_ow passphrase"
 msgstr "Пока_зване на паролите"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "_Не е необходим сертификат от сертифициращ орган"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4559,7 +5059,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "И_дентичност:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4599,15 +5099,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Идентификация:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Парола за _частен ключ:"
@@ -4617,33 +5117,33 @@ msgstr "Парола за _частен ключ:"
 msgid "_Type"
 msgstr "_Вид:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4673,337 +5173,17 @@ msgstr "Пок_азване на ключа"
 msgid "WEP inde_x"
 msgstr "Индек_с в WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "_Не е необходим сертификат от сертифициращ орган"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Избор на ваш, личен сертификат…"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Частен _ключ:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Парола за _частен ключ:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Избор на ваш, личен сертификат…"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Потребителски сертификат:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Моята държава не е в списъка"
-
-#~ msgid "Unlisted"
-#~ msgstr "Не е в списъка"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Планът не е в списъка…"
-
-#~ msgid "Provider"
-#~ msgstr "Доставчик"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Инсталирано устройство за GSM"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Инсталирано устройство за CDMA"
-
-#~ msgid "Any device"
-#~ msgstr "Което и да е устройство"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Нова мобилна връзка"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Този помощник ще ви помогне по-лесно да настроите връзка към мобилна (3G) "
-#~ "мрежа."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Ще ви е нужна следната информация:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Името на вашия доставчик"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Името на вашия план за плащане"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "Име на точка за достъп на вашия план за плащане — APN (в някои случаи)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Създаване на връзка за _това устройство:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Настройване на мобилна връзка"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Държава или регион"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Изберете държавата на вашия доставчик"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Изберете вашия доставчик от _списък:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Доставчикът не е в списъка, _ръчно въвеждане:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr ""
-#~ "Доставчикът използва технология чрез GSM (като GPRS, EDGE, UMTS, HSDPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Доставчикът използва технология чрез CDMA (като 1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Изберете вашия доставчик"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Изберете вашия план"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "_Име на точка за достъп за избрания план (APN):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Предупреждение: Избирането на неправилен план може да създаде проблеми "
-#~ "при отчитането на вашата сметка или да нямате връзка.\n"
-#~ "\n"
-#~ "Ако не сте сигурни за вашия план, попитайте вашия доставчик за името на "
-#~ "точката за достъп (APN)."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Избор на вашия план за плащане"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "Мобилната ви връзка е настроена по следния начин:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Устройството ви:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Доставчикът ви:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Планът ви:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Сега ще се осъществи връзка към вашия доставчик с настройките, които сте "
-#~ "задали. Ако свързването е неуспешно или нямате достъп до мрежови ресурси, "
-#~ "проверете отново вашите настройки. За да промените вашите настройки, "
-#~ "изберете „Мрежови връзки“ от менюто „Система“ → „Предпочитания“."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Потвърждение на настройки на мобилна връзка"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(нищо)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "С_ертификат на CA:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Неопределена"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Избор на ваш, личен сертификат…"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Потребителски сертификат:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Грешка при редактиране на връзката"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Отключване"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "_Само този потребител да ползва паролата"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "_Всички потребители да ползват паролата"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "П_итане всеки път за паролата"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "За свързване към „%s“ се изисква парола."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Пока_зване на паролите"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Втора парола:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Втора парола:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Парола:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr " Прекъсване"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Без"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Динамичен WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Създаване"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "За достъп до безжичната мрежа „%s“ са необходими пароли или криптирани "
-#~ "ключове."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Изисква се идентификация за безжична мрежа"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Изисква се идентификация за безжична мрежа"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Създаване на нова безжична мрежа"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Нова безжична мрежа"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Въведете име на безжичната мрежа, която искате да създадете."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Свързване към скрита безжична мрежа"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Скрита безжична мрежа"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Въведете име и данни за сигурност на скритата безжична мрежа, към която "
-#~ "искате да се свържете."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Защита на безжична мрежа:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Вр_ъзка:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Безжична _карта:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Доставчикът не е в списъка, _ръчно въвеждане:"
-
-#~ msgid "Provider:"
-#~ msgstr "Доставчик:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Списък с държави или региони:"
-
-#~ msgid "Country or region"
-#~ msgstr "Държава или регион"
-
-#~ msgid "Wired"
-#~ msgstr "Жична мрежа"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "Мрежа на OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Защита на безжична мрежа:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Име на мрежа:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Вр_ъзка:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Безжична _карта:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (стандартно)"
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index a2f2ff6c..c82b6a65 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2014-12-02 01:55-0500\n"
 "Last-Translator: \n"
 "Language-Team: Bengali (India) <anubad lists ankur org in>\n"
@@ -24,6 +24,7 @@ msgstr ""
 "X-Generator: Zanata 3.5.1\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 #, fuzzy
 msgid "Network"
 msgstr "%s নেটওয়ার্ক"
@@ -227,15 +228,19 @@ msgstr "তারযুক্ত 802.1X অনুমোদন ব্যবস্
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "সংযোগ করুন (_o)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "নেটওয়ার্কের নাম: (_N)"
@@ -590,7 +595,7 @@ msgstr "মোবাইল ব্রড-ব্যান্ড (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "মোবাইল ব্রড-ব্যান্ড"
 
@@ -719,7 +724,9 @@ msgstr "DSL অনুমোদন"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -831,6 +838,7 @@ msgid "Error displaying connection information:"
 msgstr "সংযোগ সংক্রান্ত তথ্য প্রদর্শন করতে সমস্যা:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -984,7 +992,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "পাসওয়ার্ড:"
@@ -1013,7 +1021,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "সংযোগ: (_n)"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "অজানা"
 
@@ -1779,6 +1788,7 @@ msgid "_Service"
 msgstr "পরিসেবা: (_S)"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2440,6 +2450,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "প্রধান নেটওয়ার্ক উপলব্ধ না থাকলে রোমিং ব্যবহার করার অনুমতি প্রদান করা হবে"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
 
@@ -2845,14 +2856,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "স্বয়ংক্রিয় ইথারনেট"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3179,12 +3191,12 @@ msgstr ""
 "নিষ্ক্রিয় করুন।</i>"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3194,22 +3206,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "বন্ড"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "ব্রিজ"
 
@@ -3502,6 +3517,7 @@ msgid "Select a connection to delete"
 msgstr "তার সংযোগ %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "নাম"
 
@@ -3734,6 +3750,8 @@ msgstr "তার সংযোগ %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "ডিফল্ট"
 
@@ -3964,35 +3982,35 @@ msgstr ""
 "আপনার পরিসেবা উপলব্ধকারী দ্বারা CDMA-ভিত্তিক প্রযুক্তি ব্যবহার করা হয় (অর্থাৎ 1xRTT, "
 "EVDO) (_C)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4158,10 +4176,12 @@ msgid "Wi-Fi connection %d"
 msgstr "তার সংযোগ %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP ৪০/১২৮-বিট কি (Hex অথবা ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP ১২৮-বিট পরিচয়পংক্তি"
 
@@ -4170,14 +4190,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "ডাইনামিক WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ও WPA2 ব্যক্তিগত"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ও WPA2 এন্টারপ্রাইজ"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA ও WPA2 ব্যক্তিগত"
@@ -4256,6 +4279,496 @@ msgstr "সংযোগ সংক্রান্ত তথ্য"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "ব্যক্তিগত-কি: (_k)"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "ব্যক্তিগত কি-র পাসওয়ার্ড: (_P)"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "ব্যবহারকারীর সার্টিফিকেট: (_U)"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "আমার দেশ তালিকার মধ্যে উপস্থিত নেই"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "তালিকা বহির্ভূত"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "ব্যবহৃত প্ল্যান তালিকায় অনুপস্থিত..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "পরিসেবা উপলব্ধকারী"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "ইনস্টল করা GSM ডিভাইস"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "ইনস্টল করা CDMA ডিভাইস"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "যে কোনো ডিভাইস"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "নতুন মোবাইল ব্রড-ব্যান্ড সংযোগ"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"এই সহায়ক ব্যবস্থার সাহায্যে একটি সেলুলার (৩জি) নেটওয়ার্কের সাথে মোবাইল ব্রড-ব্যান্ড "
+"সংযোগ স্থাপন করা যাবে।"
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "নিম্নলিখিত তথ্য প্রয়োজন:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "ব্রড-ব্যান্ড পরিসেবা উপলব্ধকারীর নাম"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "ব্রড-ব্যান্ড বিলিং প্ল্যানের নাম"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(কিছু ক্ষেত্রে) আপনার ব্যবহৃত ব্রড-ব্যান্ড বিলিং প্ল্যান APN (অ্যাকসেস পয়েন্ট নেম)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "এই মোবাইল ব্রড-ব্যান্ড ডিভাইসের জন্য সংযোগ নির্মাণ করুন (_t)"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "মোবাইল ব্রড-ব্যান্ড সংযোগ প্রস্তুত করুন"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "দেশের তালিকা:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "পরিসেবা উপলব্ধকারীর দেশ নির্বাচন করুন"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "তালিকা থেকে পরিসেবা উপলব্ধকারীর নাম নির্বাচন করুন: (_l)"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "পরিসেবা উপলব্ধকারীর নাম অনুপস্থিত এবং আমি স্বয়ং তা লিখতে ইচ্ছুক: (_m)"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+"পরিসেবা উপলব্ধকারী দ্বারা GSM প্রযুক্তি ব্যবহার করা হয় (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "পরিসেবা উপলব্ধকারী দ্বারা CDMA প্রযুক্তি ব্যবহার করা হয় (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "পরিসেবা উপলব্ধকারী নির্বাচন করুন"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "ব্যবহৃত প্ল্যান নির্বাচন করুন: (_S)"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "নির্বাচিত প্ল্যানের APN (অ্যাকসেস পয়েন্ট নেম): (_A)"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"সতর্কবার্তা: ভুল প্ল্যান নির্বাচন করা হলে আপনার ব্রড-ব্যান্ড সংযোগের বিল এবং সংযোগ "
+"স্থাপনা সংক্রান্ত সমস্যা দেখা দিতে পারে।\n"
+"\n"
+"প্ল্যান সম্পর্কে নিশ্চিত না হলে অনুগ্রহ করে পরিসেবা উপলব্ধকারী সাথে যোগাযোগ করে "
+"আপনার ব্যবহৃত প্ল্যানের APN জেনে নিন।"
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "ব্যবহৃত বিল প্ল্যান নির্বাচন করুন"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "নিম্নলিখিত বৈশিষ্ট্য সহ মোবাইল ব্রড-ব্যান্ড সংযোগ কনফিগার করা হয়েছে:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "আপনার ব্যবহৃত ডিভাইস:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "পরিসেবা উপলব্ধকারী:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "আপনার ব্যবহৃত প্ল্যান:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"আপনার নির্বাচিত বৈশিষ্ট্যগুলি প্রয়োগ করে এখন আপনার মোবাইল ব্রড-ব্যান্ড পরিসেবা "
+"উপলব্ধকারীর সাথে সংযোগ স্থাপন করা হবে।  সংযোগ বিফল হলে অথবা নেটওয়ার্ক রিসোর্স "
+"ব্যবহার করা সম্ভব না হলে, নির্ধারিত বৈশিষ্ট্যগুলি পরীক্ষা করুন।  মোবাইল ব্রড-ব্যান্ড "
+"সংযোগের বৈশিষ্ট্য পরিবর্তন করার জন্য সিস্টেম >> পছন্দ মেনু থেকে \"নেটওয়ার্ক সংযোগ\" "
+"নির্বাচন করুন।"
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "মোবাইল ব্রড-ব্যান্ডের বৈশিষ্ট্য নিশ্চিত করুন"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(শূণ্য)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA সার্টিফিকেট: (_A)"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "অজানা"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "ব্যবহারকারীর সার্টিফিকেট: (_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "সংযোগ সংরক্ষণ করতে সমস্যা"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "আন-লক করুন: (_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "প্রতিবার এই পাসওয়ার্ড লেখার অনুরোধ করা হবে (_k)"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "'%s'-র সাথে সংযোগ স্থাপন করার জন্য পাসওয়ার্ড লেখা আবশ্যক।"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "পাসওয়ার্ড: (_P)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "পাসওয়ার্ড: (_P)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "পাসওয়ার্ড: (_P)"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "সংযোগ বিচ্ছিন্ন করুন"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "শূণ্য"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "ডাইনামিক WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "নির্মান করুন (_r)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "'%s' বেতার নেটওয়ার্ক ব্যবহার করার জন্য পাসওয়ার্ড অথবা এনক্রিপশন-কি প্রয়োজন।"
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "বেতার নেটওয়ার্ক অনুমোদন প্রয়োজন"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "বেতার নেটওয়ার্কের জন্য অনুমোদন প্রয়োজন"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "নতুন বেতার নেটওয়ার্ক তৈরি করুন"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "নতুন বেতার নেটওয়ার্ক"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "নির্মাণ করার উদ্দেশ্যে চিহ্নিত বেতার নেটওয়ার্কের নাম নির্ধারণ করুন।"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "গোপন বেতার নেটওয়ার্কের সাথে সংযোগ স্থাপন করুন"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "গোপন বেতার নেটওয়ার্ক"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"সংযোগ করার উদ্দেশ্যে চিহ্নিত গোপন বেতার নেটওয়ার্কের নাম ও নিরাপত্তা বিষয়ক তথ্য "
+"লিখুন।"
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "নিরাপত্তা: (_S)"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "সংযোগ: (_n)"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "বেতার অ্যাডাপ্টার: (_a)"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "পরিসেবা উপলব্ধকারীর নাম অনুপস্থিত এবং আমি স্বয়ং তা লিখতে ইচ্ছুক: (_m)"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "পরিসেবা উপলব্ধকারী:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+#, fuzzy
+msgid "Country or Region List:"
+msgstr "দেশের তালিকা:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+#, fuzzy
+msgid "Country or region"
+msgstr "দেশের তালিকা:"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "তারযুক্ত"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "নিরাপত্তা: (_S)"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "নেটওয়ার্কের নাম: (_N)"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "সংযোগ: (_n)"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "বেতার অ্যাডাপ্টার: (_a)"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "ব্যবহার:"
@@ -4408,26 +4921,26 @@ msgstr "কোনো CA সার্টিফিকেটের প্রয়ো
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "একটি PAC ফাইল বাছুন..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ফাইল (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "সর্বধরনের ফাইল"
 
@@ -4469,16 +4982,16 @@ msgstr "অভ্যন্তরীণ অনুমোদন: (_n)"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "স্বয়ংক্রিয় PAC বিশেষাধীকারের অনুমতি দিন (_A)"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4514,15 +5027,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4536,24 +5049,24 @@ msgstr "WEP ১২৮-বিট পরিচয়পংক্তি"
 msgid "Sh_ow passphrase"
 msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4562,7 +5075,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "পরিচয়: (_d)"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4602,15 +5115,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "অনুমোদন ব্যবস্থা: (_A)"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "ব্যক্তিগত কি-র পাসওয়ার্ড: (_P)"
@@ -4620,33 +5133,33 @@ msgstr "ব্যক্তিগত কি-র পাসওয়ার্ড: (_P)
 msgid "_Type"
 msgstr "ধরন: (_T)"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4687,328 +5200,17 @@ msgstr "কি প্রদর্শন করা হবে (_w)"
 msgid "WEP inde_x"
 msgstr "WEP ইন্ডেক্স: (_x)"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "ব্যক্তিগত-কি: (_k)"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "ব্যক্তিগত কি-র পাসওয়ার্ড: (_P)"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "ব্যবহারকারীর সার্টিফিকেট: (_U)"
-
-#~ msgid "My country is not listed"
-#~ msgstr "আমার দেশ তালিকার মধ্যে উপস্থিত নেই"
-
-#~ msgid "Unlisted"
-#~ msgstr "তালিকা বহির্ভূত"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "ব্যবহৃত প্ল্যান তালিকায় অনুপস্থিত..."
-
-#~ msgid "Provider"
-#~ msgstr "পরিসেবা উপলব্ধকারী"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "ইনস্টল করা GSM ডিভাইস"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "ইনস্টল করা CDMA ডিভাইস"
-
-#~ msgid "Any device"
-#~ msgstr "যে কোনো ডিভাইস"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "নতুন মোবাইল ব্রড-ব্যান্ড সংযোগ"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "এই সহায়ক ব্যবস্থার সাহায্যে একটি সেলুলার (৩জি) নেটওয়ার্কের সাথে মোবাইল ব্রড-"
-#~ "ব্যান্ড সংযোগ স্থাপন করা যাবে।"
-
-#~ msgid "You will need the following information:"
-#~ msgstr "নিম্নলিখিত তথ্য প্রয়োজন:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "ব্রড-ব্যান্ড পরিসেবা উপলব্ধকারীর নাম"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "ব্রড-ব্যান্ড বিলিং প্ল্যানের নাম"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(কিছু ক্ষেত্রে) আপনার ব্যবহৃত ব্রড-ব্যান্ড বিলিং প্ল্যান APN (অ্যাকসেস পয়েন্ট নেম)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "এই মোবাইল ব্রড-ব্যান্ড ডিভাইসের জন্য সংযোগ নির্মাণ করুন (_t)"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "মোবাইল ব্রড-ব্যান্ড সংযোগ প্রস্তুত করুন"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "দেশের তালিকা:"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "পরিসেবা উপলব্ধকারীর দেশ নির্বাচন করুন"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "তালিকা থেকে পরিসেবা উপলব্ধকারীর নাম নির্বাচন করুন: (_l)"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "পরিসেবা উপলব্ধকারীর নাম অনুপস্থিত এবং আমি স্বয়ং তা লিখতে ইচ্ছুক: (_m)"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr ""
-#~ "পরিসেবা উপলব্ধকারী দ্বারা GSM প্রযুক্তি ব্যবহার করা হয় (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "পরিসেবা উপলব্ধকারী দ্বারা CDMA প্রযুক্তি ব্যবহার করা হয় (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "পরিসেবা উপলব্ধকারী নির্বাচন করুন"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "ব্যবহৃত প্ল্যান নির্বাচন করুন: (_S)"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "নির্বাচিত প্ল্যানের APN (অ্যাকসেস পয়েন্ট নেম): (_A)"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "সতর্কবার্তা: ভুল প্ল্যান নির্বাচন করা হলে আপনার ব্রড-ব্যান্ড সংযোগের বিল এবং সংযোগ "
-#~ "স্থাপনা সংক্রান্ত সমস্যা দেখা দিতে পারে।\n"
-#~ "\n"
-#~ "প্ল্যান সম্পর্কে নিশ্চিত না হলে অনুগ্রহ করে পরিসেবা উপলব্ধকারী সাথে যোগাযোগ করে "
-#~ "আপনার ব্যবহৃত প্ল্যানের APN জেনে নিন।"
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "ব্যবহৃত বিল প্ল্যান নির্বাচন করুন"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "নিম্নলিখিত বৈশিষ্ট্য সহ মোবাইল ব্রড-ব্যান্ড সংযোগ কনফিগার করা হয়েছে:"
-
-#~ msgid "Your Device:"
-#~ msgstr "আপনার ব্যবহৃত ডিভাইস:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "পরিসেবা উপলব্ধকারী:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "আপনার ব্যবহৃত প্ল্যান:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "আপনার নির্বাচিত বৈশিষ্ট্যগুলি প্রয়োগ করে এখন আপনার মোবাইল ব্রড-ব্যান্ড পরিসেবা "
-#~ "উপলব্ধকারীর সাথে সংযোগ স্থাপন করা হবে।  সংযোগ বিফল হলে অথবা নেটওয়ার্ক রিসোর্স "
-#~ "ব্যবহার করা সম্ভব না হলে, নির্ধারিত বৈশিষ্ট্যগুলি পরীক্ষা করুন।  মোবাইল ব্রড-ব্যান্ড "
-#~ "সংযোগের বৈশিষ্ট্য পরিবর্তন করার জন্য সিস্টেম >> পছন্দ মেনু থেকে \"নেটওয়ার্ক সংযোগ"
-#~ "\" নির্বাচন করুন।"
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "মোবাইল ব্রড-ব্যান্ডের বৈশিষ্ট্য নিশ্চিত করুন"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(শূণ্য)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "CA সার্টিফিকেট: (_A)"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "অজানা"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "ব্যবহারকারীর সার্টিফিকেট: (_U)"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "সংযোগ সংরক্ষণ করতে সমস্যা"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "আন-লক করুন: (_U)"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "প্রতিবার এই পাসওয়ার্ড লেখার অনুরোধ করা হবে (_k)"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "'%s'-র সাথে সংযোগ স্থাপন করার জন্য পাসওয়ার্ড লেখা আবশ্যক।"
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "পাসওয়ার্ড: (_P)"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "পাসওয়ার্ড: (_P)"
-
-#~ msgid "_Password:"
-#~ msgstr "পাসওয়ার্ড: (_P)"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "সংযোগ বিচ্ছিন্ন করুন"
-
-#, fuzzy
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "শূণ্য"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "ডাইনামিক WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "নির্মান করুন (_r)"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "'%s' বেতার নেটওয়ার্ক ব্যবহার করার জন্য পাসওয়ার্ড অথবা এনক্রিপশন-কি প্রয়োজন।"
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "বেতার নেটওয়ার্ক অনুমোদন প্রয়োজন"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "বেতার নেটওয়ার্কের জন্য অনুমোদন প্রয়োজন"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "নতুন বেতার নেটওয়ার্ক তৈরি করুন"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "নতুন বেতার নেটওয়ার্ক"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "নির্মাণ করার উদ্দেশ্যে চিহ্নিত বেতার নেটওয়ার্কের নাম নির্ধারণ করুন।"
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "গোপন বেতার নেটওয়ার্কের সাথে সংযোগ স্থাপন করুন"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "গোপন বেতার নেটওয়ার্ক"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "সংযোগ করার উদ্দেশ্যে চিহ্নিত গোপন বেতার নেটওয়ার্কের নাম ও নিরাপত্তা বিষয়ক তথ্য "
-#~ "লিখুন।"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "নিরাপত্তা: (_S)"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "সংযোগ: (_n)"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "বেতার অ্যাডাপ্টার: (_a)"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "পরিসেবা উপলব্ধকারীর নাম অনুপস্থিত এবং আমি স্বয়ং তা লিখতে ইচ্ছুক: (_m)"
-
-#~ msgid "Provider:"
-#~ msgstr "পরিসেবা উপলব্ধকারী:"
-
-#, fuzzy
-#~ msgid "Country or Region List:"
-#~ msgstr "দেশের তালিকা:"
-
-#, fuzzy
-#~ msgid "Country or region"
-#~ msgstr "দেশের তালিকা:"
-
-#~ msgid "Wired"
-#~ msgstr "তারযুক্ত"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "নিরাপত্তা: (_S)"
-
-#~ msgid "_Network name:"
-#~ msgstr "নেটওয়ার্কের নাম: (_N)"
-
-#, fuzzy
-#~ msgid "C_onnection:"
-#~ msgstr "সংযোগ: (_n)"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "বেতার অ্যাডাপ্টার: (_a)"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "ডিফল্ট"
diff --git a/po/bs.po b/po/bs.po
index 4424b166..30a30755 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2015-02-27 10:25+0100\n"
 "Last-Translator: Samir Ribic <samir ribic etf unsa ba>\n"
 "Language-Team: Bosnian <lokal linux org ba>\n"
@@ -17,6 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build 17331)\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Mreža"
 
@@ -212,16 +213,20 @@ msgstr "Potvrđivanje identiteta za 802.1X vezu"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 #, fuzzy
 msgid "C_onnect"
 msgstr "Povezan"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Ime mreže:"
@@ -576,7 +581,7 @@ msgstr "Mobilna širokopojasna (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobilna širokopojasna"
 
@@ -700,7 +705,9 @@ msgstr "DSL autentifikacija"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -809,6 +816,7 @@ msgid "Error displaying connection information:"
 msgstr "Greška pri prikazivanju podataka o vezi:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -958,7 +966,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Lozinka:"
@@ -983,7 +991,8 @@ msgstr "VPN Banner"
 msgid "Base Connection"
 msgstr "Bazna konekcija"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Nepoznato"
 
@@ -1759,6 +1768,7 @@ msgid "_Service"
 msgstr "_Usluga:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2419,6 +2429,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Dozvoli _roaming ukoliko nema domaće mreže"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Prika_ži lozinke"
 
@@ -2823,13 +2834,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3154,12 +3166,12 @@ msgstr ""
 "metode."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3169,22 +3181,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Povez"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Tim"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Most"
 
@@ -3485,6 +3500,7 @@ msgid "Select a connection to delete"
 msgstr "Tim konekcija %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Naziv"
 
@@ -3708,6 +3724,8 @@ msgstr "Ethernet konekcija %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Podrazumijevana"
 
@@ -3937,35 +3955,35 @@ msgstr "Moj dobavljač koristi _GSM tehnologije (npr. GPRS, EDGE, UMTS, HSDPA)"
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Moj provajder koristi C_DMA-baziranu tehnologiju (i.e. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4130,10 +4148,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi konekcija %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitni ključ (Hex ili ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit lozinka"
 
@@ -4142,14 +4162,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamički WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "Lični WPA & WPA2"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "Poslovni WPA & WPA2"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Lični WPA & WPA2"
@@ -4226,6 +4249,484 @@ msgstr "Podaci o vezi"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Nema _tražene CA potvrde"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Izaberite vaš lični sertifikat..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Privatni _ključ:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "L_ozinka privatnog ključa:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Izaberite vaš lični sertifikat..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Ko_risnikov sertifikat:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Moja država nije na spisku"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Nije na listi"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Moj plan nije na spisku..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Provajder"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Instaliran GSM uređaj"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Instaliran CDMS uređaj"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Bilo koji uređaj"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nova mobilna, širokopojasna veza"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Ovaj pomoćnik vam pomaže da lako podesite mobilnu širokopojasnu vezu prema "
+"mreži mobilnih telefona (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Biće vam potrebne sljedeće informacije:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Ime vašeg provajdera širokopojasnih usluga"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Ime vašeg plana obračunavanja širokopojasnih usluga"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(u nekim slučajevima) APN (Ime Tačke Pristupa) vašeg plana obračunavanja "
+"širokopojasnih usluga"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Napravi vezu za _ovaj mobilni, širokopojasni uređaj:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Podesi mobilnu, širokopojasnu vezu"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Zemlja ili region"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Izaberi zemlju ili regiju pružaoca usluga"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Izaberite vašeg provajdera iz _spiska:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Ne mogu da pronađem provajdera i želim da ga unesem _ručno:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Moj provajder koristi GSM tehnologiju (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Moj provajder koristi CDMA tehnologiju (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Izaberite vašeg Provajdera"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Izaberite vaš plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Izabrani APN plan (Ime Tačke Pristupa):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Upozorenje: Izbor pogrešnog plana može da dovede do problema pri "
+"obračunavanju vašeg naloga širokopojasne veze ili može spriječiti "
+"povezivanje.\n"
+"\n"
+"Ako niste sigurni o vašem planu obratite se vašem provajderu za APN vašeg "
+"plana."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Izaberite vaš plan obračunavanja"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Vaša mobilna širokopojasna veza je podešena sa sljedećim parametrima:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Vaš uređaj:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Vaš provajder:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Vaš plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Biće napravljena veza sa vašim mobilnim širokopojasnim provajderom koristeći "
+"podešavanja koja ste izabrali. Ako povezivanje ne uspje, ili ne možete da "
+"pristupite mrežnim resursima, provjerite svoje postavke. Da biste izmijenili "
+"vaša podešavanja mobilne širokopojasne veze, izaberite \"Mrežne veze\" iz "
+"menija Sistem >> Podešavanja."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Potvrdite podešavanja mobilne širokopojasne veze"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ništa)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA _potvrda:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Nepoznato"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Izaberite vaš lični sertifikat..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Ko_risnikov sertifikat:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Greška prilikom uređivanja veze"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Otključaj"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "Sačuvaj lozinku samo za ovog _korisnika"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "Čuvaj lozinku za _sve korisnike"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "Uvijek mi zatraži _lozinku"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Potrebna je lozinka za povezivanje na „%s“."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Prikaži l_ozinke"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Sekundarna lozinka:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Sekundarna lozinka:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Lozinka:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Prekini vezu"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Nikakva"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dinamički WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Napravi"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Lozinke ili ključevi enkripcije su potrebni za pristup na Wi-Fi mrežu '%s'."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Potrebna Autentikacija Wi-Fi mreže"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Autentifikacija potrebna od Wi-Fi mreže"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Kreirajte Novu Wi-Fi Mrežu"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nova Wi-Fi mreža"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Unesite ime za Wi-Fi mrežu koju želite kreirati."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Konektujte se na Skrivenu Wi-Fi Mrežu"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Skrivena Wi-Fi mreža"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Unesite ime i sigurnosne detalje skrivene Wi-Fi mreže koju želite kreirati."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi _sigurnost:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "K_onekcija:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi _punjač:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Ne mogu da pronađem provajdera i želim da ga unesem _ručno:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Provajder:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Lista zemalja ili regiona:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Zemlja ili region"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Žičana"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mreža"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, fuzzy, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s:%s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi _sigurnost:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Ime mreže:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "K_onekcija:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi _punjač:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Upotreba:"
@@ -4377,26 +4878,26 @@ msgstr "Nema _tražene CA potvrde"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Izaberi PAC datoteku..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC datoteke (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Sve datoteke"
 
@@ -4435,16 +4936,16 @@ msgstr "_Unutrašnja prijava:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Dozvoli samostalno PAC _rezervisanje"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4480,15 +4981,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4502,24 +5003,24 @@ msgstr "WEP 128-bit lozinka"
 msgid "Sh_ow passphrase"
 msgstr "Prikaži l_ozinke"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Nema _tražene CA potvrde"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4528,7 +5029,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "_Identitet:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4568,15 +5069,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Po_tvrđivanje identiteta:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "L_ozinka privatnog ključa:"
@@ -4586,33 +5087,33 @@ msgstr "L_ozinka privatnog ključa:"
 msgid "_Type"
 msgstr "_Tip:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4642,340 +5143,17 @@ msgstr "P_rikaži ključ"
 msgid "WEP inde_x"
 msgstr "WEP i_ndeks:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Nema _tražene CA potvrde"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Izaberite vaš lični sertifikat..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Privatni _ključ:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "L_ozinka privatnog ključa:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Izaberite vaš lični sertifikat..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Ko_risnikov sertifikat:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Moja država nije na spisku"
-
-#~ msgid "Unlisted"
-#~ msgstr "Nije na listi"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Moj plan nije na spisku..."
-
-#~ msgid "Provider"
-#~ msgstr "Provajder"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Instaliran GSM uređaj"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Instaliran CDMS uređaj"
-
-#~ msgid "Any device"
-#~ msgstr "Bilo koji uređaj"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nova mobilna, širokopojasna veza"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Ovaj pomoćnik vam pomaže da lako podesite mobilnu širokopojasnu vezu "
-#~ "prema mreži mobilnih telefona (3G)."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Biće vam potrebne sljedeće informacije:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Ime vašeg provajdera širokopojasnih usluga"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Ime vašeg plana obračunavanja širokopojasnih usluga"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(u nekim slučajevima) APN (Ime Tačke Pristupa) vašeg plana obračunavanja "
-#~ "širokopojasnih usluga"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Napravi vezu za _ovaj mobilni, širokopojasni uređaj:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Podesi mobilnu, širokopojasnu vezu"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Zemlja ili region"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Izaberi zemlju ili regiju pružaoca usluga"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Izaberite vašeg provajdera iz _spiska:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Ne mogu da pronađem provajdera i želim da ga unesem _ručno:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Moj provajder koristi GSM tehnologiju (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Moj provajder koristi CDMA tehnologiju (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Izaberite vašeg Provajdera"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Izaberite vaš plan:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Izabrani APN plan (Ime Tačke Pristupa):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Upozorenje: Izbor pogrešnog plana može da dovede do problema pri "
-#~ "obračunavanju vašeg naloga širokopojasne veze ili može spriječiti "
-#~ "povezivanje.\n"
-#~ "\n"
-#~ "Ako niste sigurni o vašem planu obratite se vašem provajderu za APN vašeg "
-#~ "plana."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Izaberite vaš plan obračunavanja"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Vaša mobilna širokopojasna veza je podešena sa sljedećim parametrima:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Vaš uređaj:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Vaš provajder:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Vaš plan:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Biće napravljena veza sa vašim mobilnim širokopojasnim provajderom "
-#~ "koristeći podešavanja koja ste izabrali. Ako povezivanje ne uspje, ili ne "
-#~ "možete da pristupite mrežnim resursima, provjerite svoje postavke. Da "
-#~ "biste izmijenili vaša podešavanja mobilne širokopojasne veze, izaberite "
-#~ "\"Mrežne veze\" iz menija Sistem >> Podešavanja."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Potvrdite podešavanja mobilne širokopojasne veze"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(ništa)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "CA _potvrda:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Nepoznato"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Izaberite vaš lični sertifikat..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Ko_risnikov sertifikat:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Greška prilikom uređivanja veze"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Otključaj"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "Sačuvaj lozinku samo za ovog _korisnika"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "Čuvaj lozinku za _sve korisnike"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "Uvijek mi zatraži _lozinku"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Potrebna je lozinka za povezivanje na „%s“."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Prikaži l_ozinke"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Sekundarna lozinka:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Sekundarna lozinka:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Lozinka:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Prekini vezu"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Nikakva"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dinamički WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Napravi"
-
-#, 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'."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Potrebna Autentikacija Wi-Fi mreže"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Autentifikacija potrebna od Wi-Fi mreže"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Kreirajte Novu Wi-Fi Mrežu"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nova Wi-Fi mreža"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Unesite ime za Wi-Fi mrežu koju želite kreirati."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Konektujte se na Skrivenu Wi-Fi Mrežu"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Skrivena Wi-Fi mreža"
-
-#~ 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."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wi-Fi _sigurnost:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "K_onekcija:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-Fi _punjač:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Ne mogu da pronađem provajdera i želim da ga unesem _ručno:"
-
-#~ msgid "Provider:"
-#~ msgstr "Provajder:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Lista zemalja ili regiona:"
-
-#~ msgid "Country or region"
-#~ msgstr "Zemlja ili region"
-
-#~ msgid "Wired"
-#~ msgstr "Žičana"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mreža"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, fuzzy, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s:%s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wi-Fi _sigurnost:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Ime mreže:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "K_onekcija:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-Fi _punjač:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (osnovno)"
 
diff --git a/po/ca.po b/po/ca.po
index 504fb856..65fb316d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2018-06-24 20:41+0100\n"
 "Last-Translator: Carles Ferrando Garcia <carles ferrando gmail com>\n"
 "Language-Team: Catalan <kde-i18n-ca kde org>\n"
@@ -27,6 +27,7 @@ msgstr ""
 "X-Generator: Lokalize 2.0\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Xarxa"
 
@@ -231,15 +232,19 @@ msgstr "Autenticació 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "C_onnecta"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "Nom de _xarxa"
 
@@ -592,7 +597,7 @@ msgstr "Banda ampla mòbil (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Banda ampla mòbil"
 
@@ -714,7 +719,9 @@ msgstr "Autenticació DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "D'ac_ord"
 
@@ -818,6 +825,7 @@ msgid "Error displaying connection information:"
 msgstr "S'ha produït un error en mostrar la informació de la connexió:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -963,7 +971,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Punt d'accés Wi-Fi"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -987,7 +995,8 @@ msgstr "Bàner de la VPN"
 msgid "Base Connection"
 msgstr "Connexió base"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Desconeguda"
 
@@ -1745,6 +1754,7 @@ msgid "_Service"
 msgstr "_Servei"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2402,6 +2412,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Permet la _itinerància si la xarxa domèstica no està disponible"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Mo_stra les contrasenyes"
 
@@ -2817,13 +2828,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Cable"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3144,12 +3156,12 @@ msgstr ""
 "inhabilitar-ne alguns."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Sense fil"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3159,22 +3171,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Vinculada"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Equip"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Pont"
 
@@ -3464,6 +3479,7 @@ msgid "Select a connection to delete"
 msgstr "Selecciona una connexió per a eliminar"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nom"
 
@@ -3677,6 +3693,8 @@ msgstr "Connexió de xarxa amb fil %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Per defecte"
 
@@ -3909,35 +3927,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "El meu proveïdor utilitza tecnologia basada en C_DMA (és a dir, 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4097,10 +4115,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Connexió de xarxa sense fil %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clau WEP de 40/128 bits (Hex o ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Contrasenya WEP de 128 bits"
 
@@ -4109,14 +4129,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinàmic 802.1X"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA i WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA i WPA2 Personal"
@@ -4194,6 +4217,466 @@ msgstr "Informació de la connexió"
 msgid "_Close"
 msgstr "Tan_ca"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+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/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Cap certificat configurat"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Cap clau configurada"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/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/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "Clau _privada %s"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "Contrasenya de la clau _privada %s"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Trieu el vostre certificat %s"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "_Certificat %s"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "El meu país no és a la llista"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "No és a la llista"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "El meu pla no és a la llista…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Proveïdor"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Dispositiu GSM instal·lat"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Dispositiu CDMA instal·lat"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Qualsevol dispositiu"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Connexió de banda ampla mòbil nova"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"L'auxiliar us ajudarà a configurar una connexió de banda ampla mòbil a una "
+"xarxa cel·lular (3G) de manera fàcil."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Us caldrà la informació següent:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "El nom del proveïdor de banda ampla"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "El nom del pla de facturació de banda ampla"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"L'APN (Access Point Name - nom del punt d'accés) del vostre pla de "
+"facturació de banda ampla (només en alguns casos)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Crea una connexió per a aques_t dispositiu de banda ampla mòbil:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Configura una connexió de banda ampla mòbil"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "País o regió:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Trieu el país o regió del vostre proveïdor"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Seleccioneu el proveïdor des d'una _llista:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "No hi ha el proveïdor i vull configurar la connexió _manualment:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "El proveïdor utilitza tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "El proveïdor utilitza tecnologia CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Trieu el proveïdor"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Seleccioneu el vostre pla:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Access Point Name - nom del punt d'accés) del pla seleccionat:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Avís: si seleccioneu un pla incorrecte, pot ser que tingueu problemes de "
+"facturació del compte de banda ampla o que no us pugueu connectar.\n"
+"\n"
+"Si no esteu segur de quin és el vostre pla, demaneu al proveïdor que us "
+"n'indiqui l'APN («Access Point Name», nom del punt d'accés)."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Seleccioneu el pla de facturació"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"La connexió de banda ampla mòbil està configurada amb els paràmetres "
+"següents:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "El dispositiu:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "El proveïdor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "El pla:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Es durà a terme una connexió al proveïdor de banda ampla mòbil utilitzant "
+"els paràmetres que heu seleccionat. Si no es pot connectar o bé no podeu "
+"accedir als recursos de la xarxa, torneu a comprovar els paràmetres. Si "
+"voleu modificar els paràmetres de la connexió de banda ampla mòbil, trieu "
+"l'entrada «Connexions de xarxa» del menú Sistema → Preferències."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmeu els paràmetres de la banda ampla mòbil"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(cap)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Clau a %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificat a %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Desconegut)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Selecciona"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Selecciona des d'un fitxer…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Trieu el certificat %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Contrasenya del certificat %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Error en iniciar a la sessió: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "S'ha produït un error en obrir la sessió: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Desbloqueja testimoni"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Emès per"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Entra el PIN %s"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Inicia la sessió"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Recorda PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Desa la contrasenya només per a aquest usuari"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Desa la contrasenya per a tots els usuaris"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Demana la contrasenya cada vegada"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "No es requereix la contrasenya"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "M_ostra les contrasenyes"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "Contrasenya _ternària:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "Contrasenya _secundària:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Contrasenya:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Cliqueu per connectar"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Nou…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Cap"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinàmic (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_rea"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Cal una contrasenya o claus d'encriptació per accedir a la xarxa sense fil "
+"«%s»."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Cal autenticació per a la xarxa sense fil"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Cal autenticació per a la xarxa sense fil"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Crea una xarxa sense fil nova"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Xarxa sense fil nova"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Introduïu el nom de la xarxa sense fil que voleu crear."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Connecta't a la xarxa sense fil oculta"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Xarxa sense fil oculta"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Introduïu el nom i els paràmetres de seguretat de la xarxa sense fil oculta "
+"a la qual us vulgueu connectar."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Seguretat de la _xarxa sense fil"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "Co_nnexió"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptador sense fil"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "No hi ha el proveïdor i vull introduir-lo _manualment:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Proveïdor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Llista de països o regions:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "País o regió"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Amb fil"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "Malla d'OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"O bé falta la contrasenya o la connexió no és vàlida. En el segon cas heu "
+"d'editar primer la connexió amb el nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Seguretat de la _xarxa sense fil:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Nom de _xarxa:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nnexió:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptador sense fil:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Ús:"
@@ -4342,25 +4825,25 @@ msgstr "no s'ha seleccionat cap certificat de CA"
 msgid "selected CA certificate file does not exist"
 msgstr "els fitxers de certificat CA no existeix"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "falta el fitxer EAP-FAST PAC"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Seleccioneu un fitxer PAC"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Fitxers PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Tots els fitxers"
 
@@ -4397,16 +4880,16 @@ msgstr "Autenticació _interna"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Permet la provisió automàtica PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "falta el nom d'usuari EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "falta la contrasenya EAP-LEAP"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4441,15 +4924,15 @@ msgstr "Suffix del nom del certificat del servidor."
 msgid "_Domain"
 msgstr "_Domini"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "falta el nom d'usuari EAP"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "falta la clau EAP"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "manca la contrasenya de la clau privada del client EAP"
 
@@ -4461,23 +4944,23 @@ msgstr "_Contrasenya de la clau privada"
 msgid "Sh_ow passphrase"
 msgstr "M_ostra la contrasenya"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "falta la identitat EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "no s'ha seleccionat cap certificat d'usuari"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 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:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "no s'ha seleccionat cap clau"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "el fitxer de la clau seleccionada no existeix"
 
@@ -4485,7 +4968,7 @@ msgstr "el fitxer de la clau seleccionada no existeix"
 msgid "I_dentity"
 msgstr "I_dentitat"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (sense EAP)"
 
@@ -4523,15 +5006,15 @@ msgstr "Configurat externament"
 msgid "Au_thentication"
 msgstr "_Autenticació"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "falta el nom d'usuari leap"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "falta la contrasenya leap"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "falta la clau EAP"
@@ -4540,18 +5023,18 @@ msgstr "falta la clau EAP"
 msgid "_Type"
 msgstr "_Tipus"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "falta la clau wep"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4559,7 +5042,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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4568,11 +5051,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 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 "
@@ -4602,7 +5085,7 @@ msgstr "Most_ra la clau"
 msgid "WEP inde_x"
 msgstr "Índe_x WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4611,354 +5094,8 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
-
-#~ 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>"
-
-#~ msgid "No certificate set"
-#~ msgstr "Cap certificat configurat"
-
-#~ msgid "No key set"
-#~ msgstr "Cap clau configurada"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Trieu una clau per al vostre certificat %s"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Clau _privada %s"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Contrasenya de la clau _privada %s"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Trieu el vostre certificat %s"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Certificat %s"
-
-#~ msgid "My country is not listed"
-#~ msgstr "El meu país no és a la llista"
-
-#~ msgid "Unlisted"
-#~ msgstr "No és a la llista"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "El meu pla no és a la llista…"
-
-#~ msgid "Provider"
-#~ msgstr "Proveïdor"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Dispositiu GSM instal·lat"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Dispositiu CDMA instal·lat"
-
-#~ msgid "Any device"
-#~ msgstr "Qualsevol dispositiu"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Connexió de banda ampla mòbil nova"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "L'auxiliar us ajudarà a configurar una connexió de banda ampla mòbil a "
-#~ "una xarxa cel·lular (3G) de manera fàcil."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Us caldrà la informació següent:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "El nom del proveïdor de banda ampla"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "El nom del pla de facturació de banda ampla"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "L'APN (Access Point Name - nom del punt d'accés) del vostre pla de "
-#~ "facturació de banda ampla (només en alguns casos)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Crea una connexió per a aques_t dispositiu de banda ampla mòbil:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Configura una connexió de banda ampla mòbil"
-
-#~ msgid "Country or region:"
-#~ msgstr "País o regió:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Trieu el país o regió del vostre proveïdor"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Seleccioneu el proveïdor des d'una _llista:"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "No hi ha el proveïdor i vull configurar la connexió _manualment:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "El proveïdor utilitza tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "El proveïdor utilitza tecnologia CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Trieu el proveïdor"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Seleccioneu el vostre pla:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr ""
-#~ "_APN (Access Point Name - nom del punt d'accés) del pla seleccionat:"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Avís: si seleccioneu un pla incorrecte, pot ser que tingueu problemes de "
-#~ "facturació del compte de banda ampla o que no us pugueu connectar.\n"
-#~ "\n"
-#~ "Si no esteu segur de quin és el vostre pla, demaneu al proveïdor que us "
-#~ "n'indiqui l'APN («Access Point Name», nom del punt d'accés)."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Seleccioneu el pla de facturació"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "La connexió de banda ampla mòbil està configurada amb els paràmetres "
-#~ "següents:"
-
-#~ msgid "Your Device:"
-#~ msgstr "El dispositiu:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "El proveïdor:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "El pla:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Es durà a terme una connexió al proveïdor de banda ampla mòbil utilitzant "
-#~ "els paràmetres que heu seleccionat. Si no es pot connectar o bé no podeu "
-#~ "accedir als recursos de la xarxa, torneu a comprovar els paràmetres. Si "
-#~ "voleu modificar els paràmetres de la connexió de banda ampla mòbil, trieu "
-#~ "l'entrada «Connexions de xarxa» del menú Sistema → Preferències."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Confirmeu els paràmetres de la banda ampla mòbil"
-
-#~ msgid "(None)"
-#~ msgstr "(cap)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Clau a %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certificat a %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Desconegut)"
-
-#~ msgid "Select"
-#~ msgstr "Selecciona"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancel·la"
-
-#~ msgid "Select from file…"
-#~ msgstr "Selecciona des d'un fitxer…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Trieu el certificat %s"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Contrasenya del certificat %s"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Error en iniciar a la sessió: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "S'ha produït un error en obrir la sessió: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Desbloqueja testimoni"
-
-#~ msgid "Issued By"
-#~ msgstr "Emès per"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Entra el PIN %s"
-
-#~ msgid "_Login"
-#~ msgstr "_Inicia la sessió"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Recorda PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Desa la contrasenya només per a aquest usuari"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Desa la contrasenya per a tots els usuaris"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Demana la contrasenya cada vegada"
-
-#~ msgid "The password is not required"
-#~ msgstr "No es requereix la contrasenya"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "M_ostra les contrasenyes"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Contrasenya _ternària:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "Contrasenya _secundària:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Contrasenya:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Cliqueu per connectar"
-
-#~ msgid "New…"
-#~ msgstr "Nou…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Cap"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP dinàmic (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "C_rea"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Cal una contrasenya o claus d'encriptació per accedir a la xarxa sense "
-#~ "fil «%s»."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Cal autenticació per a la xarxa sense fil"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Cal autenticació per a la xarxa sense fil"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Crea una xarxa sense fil nova"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Xarxa sense fil nova"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Connecta't a la xarxa sense fil oculta"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Xarxa sense fil oculta"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Introduïu el nom i els paràmetres de seguretat de la xarxa sense fil "
-#~ "oculta a la qual us vulgueu connectar."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Seguretat de la _xarxa sense fil"
-
-#~ msgid "C_onnection"
-#~ msgstr "Co_nnexió"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Adaptador sense fil"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "No hi ha el proveïdor i vull introduir-lo _manualment:"
-
-#~ msgid "Provider:"
-#~ msgstr "Proveïdor:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Llista de països o regions:"
-
-#~ msgid "Country or region"
-#~ msgstr "País o regió"
-
-#~ msgid "Wired"
-#~ msgstr "Amb fil"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "Malla d'OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "O bé falta la contrasenya o la connexió no és vàlida. En el segon cas heu "
-#~ "d'editar primer la connexió amb el nm-connection-editor"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Seguretat de la _xarxa sense fil:"
-
-#~ msgid "_Network name:"
-#~ msgstr "Nom de _xarxa:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Co_nnexió:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Adaptador sense fil:"
diff --git a/po/ca valencia po b/po/ca valencia po
index 09298334..26cf0a4b 100644
--- a/po/ca valencia po
+++ b/po/ca valencia po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2014-09-15 21:17+0200\n"
 "Last-Translator: Gil Forcada <gilforcada guifi net>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
@@ -25,6 +25,7 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.6\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Xarxa"
 
@@ -223,16 +224,20 @@ msgstr "Autenticació 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 #, fuzzy
 msgid "C_onnect"
 msgstr "Connectat"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "Nom de _xarxa:"
@@ -594,7 +599,7 @@ msgstr "Banda ampla mòbil (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Banda ampla mòbil"
 
@@ -717,7 +722,9 @@ msgstr "Autenticació DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -824,6 +831,7 @@ msgid "Error displaying connection information:"
 msgstr "S'ha produït un error en mostrar la informació de la connexió:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -973,7 +981,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Contrasenya:"
@@ -998,7 +1006,8 @@ msgstr "Bàner de la VPN"
 msgid "Base Connection"
 msgstr "Connexió base"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Desconeguda"
 
@@ -1782,6 +1791,7 @@ msgid "_Service"
 msgstr "_Servei:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2446,6 +2456,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Permet la _itinerància si la xarxa domèstica no està disponible"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Mo_stra les contrasenyes"
 
@@ -2851,13 +2862,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Cable"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3182,12 +3194,12 @@ msgstr ""
 "inhabilitar-ne alguns."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Sense fil"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3197,22 +3209,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Vinculada"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Equip"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Pont"
 
@@ -3514,6 +3529,7 @@ msgid "Select a connection to delete"
 msgstr "Connexió en equip %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nom"
 
@@ -3740,6 +3756,8 @@ msgstr "Connexió de xarxa amb fil %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Per defecte"
 
@@ -3976,35 +3994,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "El meu proveïdor utilitza tecnologia basada en C_DMA (és a dir, 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4171,10 +4189,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Connexió de xarxa sense fil %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clau WEP de 40/128 bits (Hex o ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Contrasenya WEP de 128 bits"
 
@@ -4183,14 +4203,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinàmic 802.1X"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA i WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA i WPA2 Personal"
@@ -4269,6 +4292,487 @@ msgstr "Informació de la connexió"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "No es _requereix cap certificat de CA"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Trieu el vostre certificat personal..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Clau _privada:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Contrasenya de la clau _privada:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Trieu el vostre certificat personal..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Certificat de l'_usuari:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "El meu país no és a la llista"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "No és a la llista"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "No és a la llista..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Proveïdor"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Dispositiu GSM instal·lat"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Dispositiu CDMA instal·lat"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Qualsevol dispositiu"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Connexió de banda ampla mòbil nova"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"L'auxiliar vos ajudarà a configurar una connexió de banda ampla mòbil a una "
+"xarxa cel·lular (3G) de manera fàcil."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Vos caldrà la informació següent:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "El nom del proveïdor de banda ampla"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "El nom del pla de facturació de banda ampla"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"L'APN (Access Point Name - nom del punt d'accés) del vostre pla de "
+"facturació de banda ampla (només en alguns casos)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Crea una connexió per a aques_t dispositiu de banda ampla mòbil:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Configura una connexió de banda ampla mòbil"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "País o regió"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Trieu el país o regió del vostre proveïdor"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Seleccioneu el proveïdor des d'una _llista:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "No hi ha el proveïdor i vull introduir-lo _manualment:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "El proveïdor utilitza tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "El proveïdor utilitza tecnologia CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Trieu el proveïdor"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Seleccioneu el vostre pla:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Access Point Name - nom del punt d'accés) del pla seleccionat:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Avís: si seleccioneu un pla incorrecte, pot ser que tingueu problemes de "
+"facturació del compte de banda ampla o que no vos pugueu connectar.\n"
+"\n"
+"Si no esteu segur de quin és el vostre pla, demaneu al proveïdor que vos "
+"n'indiqui l'APN («Access Point Name», nom del punt d'accés)."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Seleccioneu el pla de facturació"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"La connexió de banda ampla mòbil està configurada amb els paràmetres "
+"següents:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "El dispositiu:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "El proveïdor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "El pla:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Es durà a terme una connexió al proveïdor de banda ampla mòbil utilitzant "
+"els paràmetres que heu seleccionat. Si no es pot connectar o bé no podeu "
+"accedir als recursos de la xarxa, torneu a comprovar els paràmetres. Si "
+"voleu modificar els paràmetres de la connexió de banda ampla mòbil, trieu "
+"l'entrada «Connexions de xarxa» del menú Sistema >> Preferències."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmeu els paràmetres de la banda ampla mòbil"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(cap)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Certificat de C_A:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Desconeguda"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Trieu el vostre certificat personal..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Certificat de l'_usuari:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "S'ha produït un error en editar la connexió"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Desbloqueja"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "Guarda la contrasenya només per este _usuari"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "Guarda la contrasenya per tots els usu_aris"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "_Demana la contrasenya cada vegada"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Cal que introduïu una contrasenya per connectar-vos a «%s»."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "M_ostra les contrasenyes"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "Contrasenya _secundària:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "Contrasenya _secundària:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Contrasenya:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Desconnecta"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Cap"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinàmic 802.1X"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_rea"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Cal una contrasenya o claus d'encriptació per accedir a la xarxa sense fil "
+"«%s»."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Cal autenticació per a la xarxa sense fil"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Cal autenticació per a la xarxa sense fil"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Crea una xarxa sense fil nova"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Xarxa sense fil nova"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Introduïu el nom de la xarxa sense fil que voleu crear."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Connecta't a la xarxa sense fil oculta"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Xarxa sense fil oculta"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Introduïu el nom i els paràmetres de seguretat de la xarxa sense fil oculta "
+"a la qual vos vulgueu connectar."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Seguretat de la _xarxa sense fil:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Co_nnexió:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptador sense fil:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "No hi ha el proveïdor i vull introduir-lo _manualment:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Proveïdor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Llista de països o regions:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "País o regió"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Amb fil"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "Malla d'OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Seguretat de la _xarxa sense fil:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Nom de _xarxa:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nnexió:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptador sense fil:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Ús:"
@@ -4419,26 +4923,26 @@ msgstr "No es _requereix cap certificat de CA"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Seleccioneu un fitxer PAC..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Fitxers PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Tots els fitxers"
 
@@ -4478,16 +4982,16 @@ msgstr "Autenticació i_nterna:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Permet la provisió automàtica PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4523,15 +5027,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4545,24 +5049,24 @@ msgstr "Contrasenya WEP de 128 bits"
 msgid "Sh_ow passphrase"
 msgstr "M_ostra les contrasenyes"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "No es _requereix cap certificat de CA"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4571,7 +5075,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_dentitat:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4611,15 +5115,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Autenticació:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Contrasenya de la clau _privada:"
@@ -4629,33 +5133,33 @@ msgstr "Contrasenya de la clau _privada:"
 msgid "_Type"
 msgstr "_Tipus:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4685,341 +5189,17 @@ msgstr "Most_ra la clau"
 msgid "WEP inde_x"
 msgstr "Índe_x WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "No es _requereix cap certificat de CA"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Trieu el vostre certificat personal..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Clau _privada:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Contrasenya de la clau _privada:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Trieu el vostre certificat personal..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Certificat de l'_usuari:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "El meu país no és a la llista"
-
-#~ msgid "Unlisted"
-#~ msgstr "No és a la llista"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "No és a la llista..."
-
-#~ msgid "Provider"
-#~ msgstr "Proveïdor"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Dispositiu GSM instal·lat"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Dispositiu CDMA instal·lat"
-
-#~ msgid "Any device"
-#~ msgstr "Qualsevol dispositiu"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Connexió de banda ampla mòbil nova"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "L'auxiliar vos ajudarà a configurar una connexió de banda ampla mòbil a "
-#~ "una xarxa cel·lular (3G) de manera fàcil."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Vos caldrà la informació següent:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "El nom del proveïdor de banda ampla"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "El nom del pla de facturació de banda ampla"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "L'APN (Access Point Name - nom del punt d'accés) del vostre pla de "
-#~ "facturació de banda ampla (només en alguns casos)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Crea una connexió per a aques_t dispositiu de banda ampla mòbil:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Configura una connexió de banda ampla mòbil"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "País o regió"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Trieu el país o regió del vostre proveïdor"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Seleccioneu el proveïdor des d'una _llista:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "No hi ha el proveïdor i vull introduir-lo _manualment:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "El proveïdor utilitza tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "El proveïdor utilitza tecnologia CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Trieu el proveïdor"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Seleccioneu el vostre pla:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr ""
-#~ "_APN (Access Point Name - nom del punt d'accés) del pla seleccionat:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Avís: si seleccioneu un pla incorrecte, pot ser que tingueu problemes de "
-#~ "facturació del compte de banda ampla o que no vos pugueu connectar.\n"
-#~ "\n"
-#~ "Si no esteu segur de quin és el vostre pla, demaneu al proveïdor que vos "
-#~ "n'indiqui l'APN («Access Point Name», nom del punt d'accés)."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Seleccioneu el pla de facturació"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "La connexió de banda ampla mòbil està configurada amb els paràmetres "
-#~ "següents:"
-
-#~ msgid "Your Device:"
-#~ msgstr "El dispositiu:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "El proveïdor:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "El pla:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Es durà a terme una connexió al proveïdor de banda ampla mòbil utilitzant "
-#~ "els paràmetres que heu seleccionat. Si no es pot connectar o bé no podeu "
-#~ "accedir als recursos de la xarxa, torneu a comprovar els paràmetres. Si "
-#~ "voleu modificar els paràmetres de la connexió de banda ampla mòbil, trieu "
-#~ "l'entrada «Connexions de xarxa» del menú Sistema >> Preferències."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Confirmeu els paràmetres de la banda ampla mòbil"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(cap)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certificat de C_A:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Desconeguda"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Trieu el vostre certificat personal..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Certificat de l'_usuari:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "S'ha produït un error en editar la connexió"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Desbloqueja"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "Guarda la contrasenya només per este _usuari"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "Guarda la contrasenya per tots els usu_aris"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "_Demana la contrasenya cada vegada"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Cal que introduïu una contrasenya per connectar-vos a «%s»."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "M_ostra les contrasenyes"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Contrasenya _secundària:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "Contrasenya _secundària:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Contrasenya:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Desconnecta"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Cap"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP dinàmic 802.1X"
-
-#~ msgid "C_reate"
-#~ msgstr "C_rea"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Cal una contrasenya o claus d'encriptació per accedir a la xarxa sense "
-#~ "fil «%s»."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Cal autenticació per a la xarxa sense fil"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Cal autenticació per a la xarxa sense fil"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Crea una xarxa sense fil nova"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Xarxa sense fil nova"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Connecta't a la xarxa sense fil oculta"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Xarxa sense fil oculta"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Introduïu el nom i els paràmetres de seguretat de la xarxa sense fil "
-#~ "oculta a la qual vos vulgueu connectar."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Seguretat de la _xarxa sense fil:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Co_nnexió:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Adaptador sense fil:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "No hi ha el proveïdor i vull introduir-lo _manualment:"
-
-#~ msgid "Provider:"
-#~ msgstr "Proveïdor:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Llista de països o regions:"
-
-#~ msgid "Country or region"
-#~ msgstr "País o regió"
-
-#~ msgid "Wired"
-#~ msgstr "Amb fil"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "Malla d'OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Seguretat de la _xarxa sense fil:"
-
-#~ msgid "_Network name:"
-#~ msgstr "Nom de _xarxa:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Co_nnexió:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Adaptador sense fil:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (predeterminat)"
 
diff --git a/po/crh.po b/po/crh.po
index dd9340c4..59ca6d86 100644
--- a/po/crh.po
+++ b/po/crh.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: nm-aplet 0.6\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2013-05-21 18:21-0500\n"
 "Last-Translator: Reşat SABIQ <tilde birlik gmail com>\n"
 "Language-Team: QIRIMTATARCA (Qırım Türkçesi) <tilde-birlik-meydan@lists."
@@ -23,6 +23,7 @@ msgstr ""
 "X-Generator: Launchpad (build 15120)\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Şebeke"
 
@@ -220,15 +221,19 @@ msgstr "802.1X sahihlenimi"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Bağlan"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "Şebeke _adı:"
@@ -587,7 +592,7 @@ msgstr "Mobil Kenişbant (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobil Kenişbant"
 
@@ -711,7 +716,9 @@ msgstr "DSL doğrulaması"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -817,6 +824,7 @@ msgid "Error displaying connection information:"
 msgstr "Bağlantı bilgisini gösterirken hata:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -968,7 +976,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Sır-söz:"
@@ -994,7 +1002,8 @@ msgstr "VPN Afişi"
 msgid "Base Connection"
 msgstr "Temel Bağlantı"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
@@ -1772,6 +1781,7 @@ msgid "_Service"
 msgstr "_Hızmet:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2445,6 +2455,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Ev şebekesi müsait degil ise _kezelemege izin ber"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Sır-sözlerni _köster"
 
@@ -2849,13 +2860,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Eternet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3186,12 +3198,12 @@ msgstr ""
 "devre dışı bırakmayı deneyin."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Telsiz-Vefa"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3201,22 +3213,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Köpür"
 
@@ -3509,6 +3524,7 @@ msgid "Select a connection to delete"
 msgstr "Telli bağlantı %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "İsim"
 
@@ -3739,6 +3755,8 @@ msgstr "Eternet bağlantısı %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Ögbelgileme"
 
@@ -3966,35 +3984,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Teminatçım _CDMA-esaslı tehnologiya qullana (yani, 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4163,10 +4181,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Telsiz-Vefa bağlantı %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Anahtarı (Onaltışarlama ya da ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Sır-ibaresi"
 
@@ -4175,14 +4195,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamik WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Kişisel"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Kurum"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Kişisel"
@@ -4259,6 +4282,487 @@ msgstr "Bağlantı Malümatı"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "CA Sertifikası Seç"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Hususiy _anahtar:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_Hususiy anahtar sır-sözü:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "CA Sertifikası Seç"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_Qullanıcı şehadetnamesi:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Ülkem listelenmegendir"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Listelenmegen"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Planım listelenmegendir..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Teminatçı"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Kurulu GSM aygıtı"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Kurulu CDMA aygıtı"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Her hangi cihaz"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Yañı Mobil Keniş-bant Bağlantısı"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Bu muavin sizge bir hüceyresel (3G) şebekege mobil keniş-bant bağlantısını "
+"qolayca ayarlamağa yardım eter."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Aşağıdaki malümatqa ihtiyacıñız olacaq:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Keniş-bant teminatçıñıznıñ adı"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Keniş-bant faturalama planıñıznıñ adı"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(bazan) Keniş-bant faturalama planıñıznıñ İrişim Noqtası Adı (İNA; APN)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "_Bu mobil keniş-bant cihazı içün bir bağlantı icat etiñiz:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Bir Mobil Keniş-bant Bağlantısını Ayarlañız"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Memleket yaki bölge"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Teminatçıñıznıñ Memleket yaki Bölgesini Saylañız"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Teminatçıñıznı bir _cedvelden saylañız:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Teminatçımnı tapalmayıım ve onı _elnen kirsetmege isteyim:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Teminatçım GSM tehnologiyasını qullana (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Teminatçım CDMA tehnologiyasını qullana (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Teminatçıñıznı Saylañız"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Planıñıznı saylañız:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Saylanğan plan İrişim Noqtası _Adı (İNA; APN):"
+
+# tüklü
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Tenbih: Yañlış bir plannıñ saylanuvı keniş-bant hesabıñız içün faturalama "
+"meselelerine yol açabilir yaki bağlanabilirlikke yol bermeybilir.\n"
+"\n"
+"Planıñız haqqında emin degil iseñiz teminatçıñızdan planıñıznıñ İrişim "
+"Noqtası Adını (İNA, APN) sorañız."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Faturalama Planıñıznı Saylañız"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Mobil keniş-bant bağlantıñız aşağıdaki ayarlar ile yapılandırılğandır:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Cihazıñız:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Teminatçıñız:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Planıñız:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Saylağanıñız ayarlarnı qullanaraq şimdi mobil keniş-bant teminatçıñızğa bir "
+"bağlantı yapılacaq.  Bağlantı muvafaqiyetsiz olsa yaki şebeke çoqraqlarını "
+"qullanalmasañız, ayarlarıñıznı çift-teşkeriñiz.  Mobil keniş-bant bağlantı "
+"ayarlarıñıznı deñiştirmek içün, Sistem >> Tercihler menüsinden \"Şebeke "
+"Bağlantıları\"nı saylañız."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Mobil Keniş-bant Ayarlarıñıznı Tasdiqlañız"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(hiçbiri)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA Şehadetnamesi:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Bilinmiyor"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Bir dosya seçin"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Bir dosya seçin"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "CA Sertifikası Seç"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Qullanıcı şehadetnamesi:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Bağlantını tahrir etkende hata"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "Kilit_sizle"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "Bu sır-söz içün her sefer _sora"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "'%s' ağına bağlanmak için parola gerekli."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Sır-sözlerni _köster"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Ekilemci Sır-söz:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Ekilemci Sır-söz:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Parola:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Bağlantını qopar"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Yoq"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dinamik WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "İcat _Et"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"'%s' Telsiz-Vefa şebekesine irişim içün sır-sözler ya da şifreleme "
+"anahtarları şarttır."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Telsiz-Vefa Şebeke Sahihlenimi Şart"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Telsiz-Vefa şebeke sahihlenimni talap ete"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Yañı Telsiz-Vefa Şebeke İcat Et"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Yañı Telsiz-Vefa şebeke"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "İcat etmege istegeniñiz Telsiz-Vefa şebeke içün bir isim kirsetiñiz."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Gizli Telsiz-Vefa Şebekege Bağlan"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Gizli Telsiz-Vefa şebeke"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Bağlanmağa istegeniñiz gizli Telsiz-Vefa şebekesiniñ ismini ve emniyet "
+"tafsilâtını kirsetiñiz."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Telsiz-Vefa _emniyeti:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "_Bağlantı:"
+
+# tüklü
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Telsiz-Vefa _uyarlayıcısı:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Teminatçımnı tapalmayıım ve onı _elnen kirsetmege isteyim:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Teminatçı:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Ülke yaki Bölge Cedveli:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Memleket yaki bölge"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Telli"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Telsiz-Vefa _emniyeti:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Şebeke _adı:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Bağlantı:"
+
+# tüklü
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Telsiz-Vefa _uyarlayıcısı:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Qullanılış:"
@@ -4412,26 +4916,26 @@ msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Bir PAC dosyesini saylañız..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC dosyeleri (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Dosyelerniñ hepsi"
 
@@ -4472,16 +4976,16 @@ msgstr "_İç sahihlenme:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Avtomatik PAC _tedarikine izin ber"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4518,15 +5022,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4540,24 +5044,24 @@ msgstr "Hususiy Anahtar Sır-sözü:"
 msgid "Sh_ow passphrase"
 msgstr "Sır-sözlerni _köster"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4566,7 +5070,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "_Kimlik:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4606,15 +5110,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Sahihlenim:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_Hususiy anahtar sır-sözü:"
@@ -4624,33 +5128,33 @@ msgstr "_Hususiy anahtar sır-sözü:"
 msgid "_Type"
 msgstr "_Tür:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4680,325 +5184,17 @@ msgstr "Anahtarnı _köster"
 msgid "WEP inde_x"
 msgstr "WEP _indeksi:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "CA Sertifikası Seç"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Hususiy _anahtar:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Hususiy anahtar sır-sözü:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "CA Sertifikası Seç"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Qullanıcı şehadetnamesi:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Ülkem listelenmegendir"
-
-#~ msgid "Unlisted"
-#~ msgstr "Listelenmegen"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Planım listelenmegendir..."
-
-#~ msgid "Provider"
-#~ msgstr "Teminatçı"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Kurulu GSM aygıtı"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Kurulu CDMA aygıtı"
-
-#~ msgid "Any device"
-#~ msgstr "Her hangi cihaz"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Yañı Mobil Keniş-bant Bağlantısı"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Bu muavin sizge bir hüceyresel (3G) şebekege mobil keniş-bant "
-#~ "bağlantısını qolayca ayarlamağa yardım eter."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Aşağıdaki malümatqa ihtiyacıñız olacaq:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Keniş-bant teminatçıñıznıñ adı"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Keniş-bant faturalama planıñıznıñ adı"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(bazan) Keniş-bant faturalama planıñıznıñ İrişim Noqtası Adı (İNA; APN)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "_Bu mobil keniş-bant cihazı içün bir bağlantı icat etiñiz:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Bir Mobil Keniş-bant Bağlantısını Ayarlañız"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Memleket yaki bölge"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Teminatçıñıznıñ Memleket yaki Bölgesini Saylañız"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Teminatçıñıznı bir _cedvelden saylañız:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Teminatçımnı tapalmayıım ve onı _elnen kirsetmege isteyim:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Teminatçım GSM tehnologiyasını qullana (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Teminatçım CDMA tehnologiyasını qullana (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Teminatçıñıznı Saylañız"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Planıñıznı saylañız:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Saylanğan plan İrişim Noqtası _Adı (İNA; APN):"
-
-# tüklü
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Tenbih: Yañlış bir plannıñ saylanuvı keniş-bant hesabıñız içün faturalama "
-#~ "meselelerine yol açabilir yaki bağlanabilirlikke yol bermeybilir.\n"
-#~ "\n"
-#~ "Planıñız haqqında emin degil iseñiz teminatçıñızdan planıñıznıñ İrişim "
-#~ "Noqtası Adını (İNA, APN) sorañız."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Faturalama Planıñıznı Saylañız"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Mobil keniş-bant bağlantıñız aşağıdaki ayarlar ile yapılandırılğandır:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Cihazıñız:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Teminatçıñız:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Planıñız:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Saylağanıñız ayarlarnı qullanaraq şimdi mobil keniş-bant teminatçıñızğa "
-#~ "bir bağlantı yapılacaq.  Bağlantı muvafaqiyetsiz olsa yaki şebeke "
-#~ "çoqraqlarını qullanalmasañız, ayarlarıñıznı çift-teşkeriñiz.  Mobil keniş-"
-#~ "bant bağlantı ayarlarıñıznı deñiştirmek içün, Sistem >> Tercihler "
-#~ "menüsinden \"Şebeke Bağlantıları\"nı saylañız."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Mobil Keniş-bant Ayarlarıñıznı Tasdiqlañız"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(hiçbiri)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "CA Şehadetnamesi:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Bilinmiyor"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "Bir dosya seçin"
-
-#, fuzzy
-#~ msgid "Select from file…"
-#~ msgstr "Bir dosya seçin"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "CA Sertifikası Seç"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Qullanıcı şehadetnamesi:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Bağlantını tahrir etkende hata"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "Kilit_sizle"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "Bu sır-söz içün her sefer _sora"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "'%s' ağına bağlanmak için parola gerekli."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Sır-sözlerni _köster"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Ekilemci Sır-söz:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Ekilemci Sır-söz:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Parola:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Bağlantını qopar"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Yoq"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dinamik WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "İcat _Et"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "'%s' Telsiz-Vefa şebekesine irişim içün sır-sözler ya da şifreleme "
-#~ "anahtarları şarttır."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Telsiz-Vefa Şebeke Sahihlenimi Şart"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Telsiz-Vefa şebeke sahihlenimni talap ete"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Yañı Telsiz-Vefa Şebeke İcat Et"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Yañı Telsiz-Vefa şebeke"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Gizli Telsiz-Vefa Şebekege Bağlan"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Gizli Telsiz-Vefa şebeke"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Bağlanmağa istegeniñiz gizli Telsiz-Vefa şebekesiniñ ismini ve emniyet "
-#~ "tafsilâtını kirsetiñiz."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Telsiz-Vefa _emniyeti:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "_Bağlantı:"
-
-# tüklü
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Telsiz-Vefa _uyarlayıcısı:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Teminatçımnı tapalmayıım ve onı _elnen kirsetmege isteyim:"
-
-#~ msgid "Provider:"
-#~ msgstr "Teminatçı:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Ülke yaki Bölge Cedveli:"
-
-#~ msgid "Country or region"
-#~ msgstr "Memleket yaki bölge"
-
-#~ msgid "Wired"
-#~ msgstr "Telli"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Telsiz-Vefa _emniyeti:"
-
-#~ msgid "_Network name:"
-#~ msgstr "Şebeke _adı:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "_Bağlantı:"
-
-# tüklü
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Telsiz-Vefa _uyarlayıcısı:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (ögbelgilengen)"
 
diff --git a/po/cs.po b/po/cs.po
index 0c054830..ee9a7223 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\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"
@@ -28,6 +28,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Síť"
 
@@ -215,15 +216,19 @@ msgstr "Ověření 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Storno"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "Přip_ojit"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Název sítě"
 
@@ -566,7 +571,7 @@ msgstr "Mobilní širokopásmová (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobilní širokopásmová"
 
@@ -688,7 +693,9 @@ msgstr "Ověření DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_Budiž"
 
@@ -793,6 +800,7 @@ msgid "Error displaying connection information:"
 msgstr "Chyba při zobrazování informací o spojení:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -938,7 +946,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Přístupový bod"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "Heslo"
 
@@ -962,7 +970,8 @@ msgstr "Úvodní text VPN"
 msgid "Base Connection"
 msgstr "Základní připojení"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Neznámé"
 
@@ -1712,6 +1721,7 @@ msgid "_Service"
 msgstr "_Služba"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2360,6 +2370,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Povolit _roaming pokud není dostupná domácí síť"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Zo_brazit hesla"
 
@@ -2767,13 +2778,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3097,12 +3109,12 @@ msgstr ""
 "ověření. Pokud připojení selže, zkuste zakázat podporu pro některé metody."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3112,22 +3124,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Svazek"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Tým"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Přemostění"
 
@@ -3422,6 +3437,7 @@ msgid "Select a connection to delete"
 msgstr "Vybrat připojení ke smazání"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Název"
 
@@ -3632,6 +3648,8 @@ msgstr "Drátové připojení %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Výchozí"
 
@@ -3860,35 +3878,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Můj poskytovatel používá technologii založenou na C_DMA (tj. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4046,10 +4064,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Připojení Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Klíč WEP 40/128 bitů (Hex nebo ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Heslo WEP 128 bitů"
 
@@ -4058,14 +4078,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamické WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
@@ -4140,6 +4163,459 @@ msgstr "Informace o spojení"
 msgid "_Close"
 msgstr "_Zavřít"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+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/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Není nastavený žádný certifikát"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Není nastavený žádný klíč"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Vyberte klíč pro certifikát %s"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "Soukromý _klíč %s"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "_Heslo klíče %s"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Vyberte certifikát %s"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "_Certifikát %s"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Moje země není v seznamu"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Není v seznamu"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Můj plán není v seznamu…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Poskytovatel"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Nainstalované zařízení GSM"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Nainstalované zařízení CDMA"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Jakékoli zařízení"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nové mobilní širokopásmové připojení"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Tento pomocník vám pomůže snadno nastavit širokopásmové připojení k mobilní "
+"(3G) síti."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Budete potřebovat tyto informace:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Název poskytovatele širokopásmového připojení"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Název vašeho tarifu"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(v některých případech) Přístupový bod (APN) pro váš tarif"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Vytvořit připojení pro _toto mobilní širokopásmové zařízení:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Nastavit mobilní širokopásmové připojení"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "Země nebo region:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Zvolte zemi nebo region svého poskytovatele"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Vybrat poskytovate_le ze seznamu:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Ne_mohu najít svého poskytovatele, chci nastavit připojení ručně:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Můj poskytovatel používá technologii GSM (GPRS, EDGE, UTMS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Můj poskytovatel používá technologii CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Vyberte svého poskytovatele"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Vybrat tarif:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Zvolený přístupový bod vašeho tarifu (_APN):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Pozor: Pokud vyberete nesprávný tarif, může dojít ke chybnému účtování "
+"vašeho účtu nebo odmítnutí připojení k síti. \n"
+"\n"
+"Nejste-li si jistí přístupovým bodem, obraťte se na svého poskytovatele."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Vyberte svůj tarif"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Vaše mobilní širokopásmové připojení je nastaveno s těmito parametry:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Vaše zařízení:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Váš poskytovatel:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Váš tarif:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"S vámi zvoleným nastavením bude navázáno spojení k vašemu poskytovateli "
+"mobilního připojení. Pokud připojení selže, nebo nemůžete přistupovat ke "
+"zdrojům v síti, zkontrolujte prosím svá nastavení. Změny v nastavení "
+"připojení provedete volbou „Připojení k síti“ z nabídky Systém → Nastavení."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Potvrdit volby širokopásmového připojení"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(žádný)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Klíč v %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certifikát v %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(neznámý)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Vybrat"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Vybrat ze souboru…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Vybrat certifikát %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Heslo certifikátu %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Záznam chyb v: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Chyba při otevirání sezení: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "Odemkno_ut tiket"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Vydal"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Zadejte PIN %s"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Přihlásit"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "Pa_matovat si PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Uložit heslo pouze pro tohoto uživatele"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Uložit heslo pro všechny uživatele"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Pokaždé se dotazovat na heslo"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Heslo není vyžadováno"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Z_obrazit hesla"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Terciální heslo:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Sekundární heslo:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Heslo:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Kliknutím se připojíte"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Nový…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Žádná"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamické WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Vytvořit"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Pro přístup k síti Wi-Fi „%s“ jsou vyžadována hesla nebo šifrovací klíče."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "K síti Wi-Fi je vyžadováno ověření"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Síť Wi-Fi vyžadovuje ověření"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Vytvořit novou síť Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nová síť Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Zadejte název sítě Wi-Fi, kterou chcete vytvořit."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Připojit se ke skryté síti Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Skrytá síť Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Zadejte název a podrobnosti o zabezpečení skryté sítě Wi-Fi, ke které se "
+"chcete připojit."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Zabezpečení _Wi-Fi"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "Přip_ojení"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptér Wi-Fi"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Ne_mohu najít svého poskytovatele, chci jej zadat ručně:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Poskytovatel:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Seznam zemí: nebo regionů:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Země nebo region"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Drátové"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "Buňka OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Chybí heslo, nebo je neplatné připojení. V druhém případě budete muset "
+"nejdříve použít nm-connection-editor pro úpravu připojení"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Zabezpečení _Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Název sítě:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Připojení:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptér Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Použití:"
@@ -4287,25 +4763,25 @@ msgstr "není vybrán žádný certifikát CA"
 msgid "selected CA certificate file does not exist"
 msgstr "vybraný soubor s certifikátem CA neexistuje"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "chybějící PAC soubor EAP-FAST"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Vyberte soubor PAC"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Soubory PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Všechny soubory"
 
@@ -4341,16 +4817,16 @@ msgstr "V_nitřní ověření"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Po_volit automatické nastavení PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "chybějící uživatelské jméno pro EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "chybějící heslo pro EAP-LEAP"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4385,15 +4861,15 @@ msgstr "Přípona názvu serverového certifikátu."
 msgid "_Domain"
 msgstr "_Doména"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "chybějící uživatelské jméno pro EAP"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "chybějící heslo pro EAP"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "chybějící heslo soukromého klíče klienta EAP"
 
@@ -4405,23 +4881,23 @@ msgstr "Heslo souk_romého klíče"
 msgid "Sh_ow passphrase"
 msgstr "Z_obrazit heslo"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "chybějící identita EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "není vybrán žádný uživatelský certifikát"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 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:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "není vybrán žádný klíč"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "vybraný soubor s klíčem neexistuje"
 
@@ -4429,7 +4905,7 @@ msgstr "vybraný soubor s klíčem neexistuje"
 msgid "I_dentity"
 msgstr "I_dentita"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP)"
 
@@ -4467,15 +4943,15 @@ msgstr "Nastaveno externě"
 msgid "Au_thentication"
 msgstr "Ověře_ní"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "chybí leap-username"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "chybí leap-password"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "chybějící heslo pro EAP"
@@ -4484,23 +4960,23 @@ msgstr "chybějící heslo pro EAP"
 msgid "_Type"
 msgstr "_Typ"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "chybí wep-key"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4509,11 +4985,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "neplatný wep-key: heslo musí být kratší než 64 znaků"
 
@@ -4541,7 +5017,7 @@ msgstr "Z_obrazit klíč"
 msgid "WEP inde_x"
 msgstr "Inde_x WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4550,351 +5026,11 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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ý"
 
-#~ 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>"
-
-#~ msgid "No certificate set"
-#~ msgstr "Není nastavený žádný certifikát"
-
-#~ msgid "No key set"
-#~ msgstr "Není nastavený žádný klíč"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Vyberte klíč pro certifikát %s"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Soukromý _klíč %s"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Heslo klíče %s"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Vyberte certifikát %s"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Certifikát %s"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Moje země není v seznamu"
-
-#~ msgid "Unlisted"
-#~ msgstr "Není v seznamu"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Můj plán není v seznamu…"
-
-#~ msgid "Provider"
-#~ msgstr "Poskytovatel"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Nainstalované zařízení GSM"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Nainstalované zařízení CDMA"
-
-#~ msgid "Any device"
-#~ msgstr "Jakékoli zařízení"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nové mobilní širokopásmové připojení"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Tento pomocník vám pomůže snadno nastavit širokopásmové připojení k "
-#~ "mobilní (3G) síti."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Budete potřebovat tyto informace:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Název poskytovatele širokopásmového připojení"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Název vašeho tarifu"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(v některých případech) Přístupový bod (APN) pro váš tarif"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Vytvořit připojení pro _toto mobilní širokopásmové zařízení:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Nastavit mobilní širokopásmové připojení"
-
-#~ msgid "Country or region:"
-#~ msgstr "Země nebo region:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Zvolte zemi nebo region svého poskytovatele"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Vybrat poskytovate_le ze seznamu:"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Ne_mohu najít svého poskytovatele, chci nastavit připojení ručně:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Můj poskytovatel používá technologii GSM (GPRS, EDGE, UTMS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Můj poskytovatel používá technologii CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Vyberte svého poskytovatele"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Vybrat tarif:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Zvolený přístupový bod vašeho tarifu (_APN):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Pozor: Pokud vyberete nesprávný tarif, může dojít ke chybnému účtování "
-#~ "vašeho účtu nebo odmítnutí připojení k síti. \n"
-#~ "\n"
-#~ "Nejste-li si jistí přístupovým bodem, obraťte se na svého poskytovatele."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Vyberte svůj tarif"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Vaše mobilní širokopásmové připojení je nastaveno s těmito parametry:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Vaše zařízení:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Váš poskytovatel:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Váš tarif:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "S vámi zvoleným nastavením bude navázáno spojení k vašemu poskytovateli "
-#~ "mobilního připojení. Pokud připojení selže, nebo nemůžete přistupovat ke "
-#~ "zdrojům v síti, zkontrolujte prosím svá nastavení. Změny v nastavení "
-#~ "připojení provedete volbou „Připojení k síti“ z nabídky Systém → "
-#~ "Nastavení."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Potvrdit volby širokopásmového připojení"
-
-#~ msgid "(None)"
-#~ msgstr "(žádný)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Klíč v %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certifikát v %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(neznámý)"
-
-#~ msgid "Select"
-#~ msgstr "Vybrat"
-
-#~ msgid "Cancel"
-#~ msgstr "Zrušit"
-
-#~ msgid "Select from file…"
-#~ msgstr "Vybrat ze souboru…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Vybrat certifikát %s"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Heslo certifikátu %s"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Záznam chyb v: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Chyba při otevirání sezení: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "Odemkno_ut tiket"
-
-#~ msgid "Issued By"
-#~ msgstr "Vydal"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Zadejte PIN %s"
-
-#~ msgid "_Login"
-#~ msgstr "_Přihlásit"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "Pa_matovat si PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Uložit heslo pouze pro tohoto uživatele"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Uložit heslo pro všechny uživatele"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Pokaždé se dotazovat na heslo"
-
-#~ msgid "The password is not required"
-#~ msgstr "Heslo není vyžadováno"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Z_obrazit hesla"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Terciální heslo:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Sekundární heslo:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Heslo:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Kliknutím se připojíte"
-
-#~ msgid "New…"
-#~ msgstr "Nový…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Žádná"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynamické WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Vytvořit"
-
-#, 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."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "K síti Wi-Fi je vyžadováno ověření"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Síť Wi-Fi vyžadovuje ověření"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Vytvořit novou síť Wi-Fi"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nová síť Wi-Fi"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Připojit se ke skryté síti Wi-Fi"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Skrytá síť Wi-Fi"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Zadejte název a podrobnosti o zabezpečení skryté sítě Wi-Fi, ke které se "
-#~ "chcete připojit."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Zabezpečení _Wi-Fi"
-
-#~ msgid "C_onnection"
-#~ msgstr "Přip_ojení"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Adaptér Wi-Fi"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Ne_mohu najít svého poskytovatele, chci jej zadat ručně:"
-
-#~ msgid "Provider:"
-#~ msgstr "Poskytovatel:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Seznam zemí: nebo regionů:"
-
-#~ msgid "Country or region"
-#~ msgstr "Země nebo region"
-
-#~ msgid "Wired"
-#~ msgstr "Drátové"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "Buňka OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Chybí heslo, nebo je neplatné připojení. V druhém případě budete muset "
-#~ "nejdříve použít nm-connection-editor pro úpravu připojení"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Zabezpečení _Wi-Fi:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Název sítě:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "_Připojení:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Adaptér Wi-Fi:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/da.po b/po/da.po
index 3c6131f1..88e254c8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -21,7 +21,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2019-08-19 19:29+0200\n"
 "Last-Translator: scootergrisen\n"
 "Language-Team: Danish <dansk dansk-gruppen dk>\n"
@@ -32,6 +32,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Netværk"
 
@@ -240,15 +241,19 @@ msgstr "802.1X-godkendelse"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Annullér"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "F_orbind"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Netværksnavn"
 
@@ -594,7 +599,7 @@ msgstr "Mobilt bredbånd (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobilt bredbånd"
 
@@ -716,7 +721,9 @@ msgstr "DSL-godkendelse"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_OK"
 
@@ -820,6 +827,7 @@ msgid "Error displaying connection information:"
 msgstr "Fejl ved visning af forbindelsesinformation:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -965,7 +973,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Hotspot"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "Adgangskode"
 
@@ -989,7 +997,8 @@ msgstr "VPN-banner"
 msgid "Base Connection"
 msgstr "Basisforbindelse"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Ukendt"
 
@@ -1749,6 +1758,7 @@ msgid "_Service"
 msgstr "_Tjeneste"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2404,6 +2414,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Tillad _roaming hvis hjemmenetværket ikke er tilgængeligt"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Vis adgangskoder"
 
@@ -2819,13 +2830,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3147,12 +3159,12 @@ msgstr ""
 "understøttelse af nogle af metoderne."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3162,22 +3174,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Binding"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Gruppe"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Bro"
 
@@ -3465,6 +3480,7 @@ msgid "Select a connection to delete"
 msgstr "Vælg en forbindelse, der skal slettes"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Navn"
 
@@ -3675,6 +3691,8 @@ msgstr "Ethernetforbindelse %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Standard"
 
@@ -3900,35 +3918,35 @@ msgstr "Min udbyder bruger _GSM-teknologi (GPRS, EDGE, UMTS, HSDPA)"
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Min udbyder bruger C_DMA-teknologi (f.eks. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4087,10 +4105,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-fi-forbindelse %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-nøgle (Hex eller ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit adgangsfrase"
 
@@ -4099,14 +4119,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamisk WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA og WPA2 personlig"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA og WPA2 personlig"
@@ -4182,6 +4205,468 @@ msgstr "Forbindelsesinformation"
 msgid "_Close"
 msgstr "_Luk"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr "Skan med din telefon eller <a href=\"nma:print\">udskriv</a>"
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Intet certifikat angivet"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Ingen nøgle angivet"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/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/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "Privat %s-nøg_le"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "Adgangskode til %s-nøgle"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Vælg %s-certifikat"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "%s-_certifikat"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Mit land er ikke på listen"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Ikke på listen"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Mit abonnement er ikke på listen …"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Udbyder"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Installeret GSM-enhed"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Installeret CDMA-enhed"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Enhver enhed"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Ny mobil bredbåndsforbindelse"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Denne guide hjælper dig med at oprette en mobil bredbåndsforbindelse til et "
+"mobilt (3G) netværk."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Du har brug for følgende oplysninger:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Navnet på din bredbåndsudbyder"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Navnet på afregningen af dit bredbåndsabonnement"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(i visse tilfælde) APN (Access Point Name) for afregning af dit "
+"bredbåndsabonnement"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Opret en forbindelse til _denne mobile bredbåndsenhed:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Opsæt en mobil bredbåndsforbindelse"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "Land eller region:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Vælg din udbyders land eller region"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Vælg din udbyder på en _liste:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"Jeg kan ikke finde min udbyder, og jeg ønsker at opsætte forbindelsen "
+"_manuelt:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Min udbyder bruger GSM-teknologi (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Min udbyder bruger CDMA-teknologi (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Vælg din udbyder"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Vælg dit abonnement:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Va_lgt abonnements APN (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Advarsel: Hvis du vælger et forkert abonnement, kan det medføre problemer "
+"med afregning af din bredbåndskonto eller forhindre forbindelse.\n"
+"\n"
+"Spørg din udbyder om dit abonnements APN, hvis du er i tvivl om dit "
+"abonnement."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Vælg abonnementsafregning"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Din mobile bredbåndsforbindelse er konfigureret med følgende indstillinger:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Din enhed:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Din udbyder:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Dit abonnement:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Der vil nu blive oprettet en forbindelse til din mobile bredbåndsudbyder med "
+"de indstillinger, du har valgt. Dobbelttjek dine indstillinger, hvis "
+"forbindelsen slår fejl, eller hvis du ikke kan tilgå netværksressourcer. "
+"Hvis du vil tilpasse dine indstillinger for mobil bredbåndsforbindelse, så "
+"vælg “Netværksforbindelser” fra menuen System → Indstillinger."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Bekræft indstillinger for mobilt bredbånd"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Ingen)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Nøgle i %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certifikat i %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Ukendt)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Vælg"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Annullér"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Vælg fra fil …"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Vælg et %s-certifikat"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "Adgangs_kode til %s-certifikat"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Fejl i forsøget på at logge ind: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Fejl ved åbning af en session: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Lås token op"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Udstedt af"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Indtast %s-PIN"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Login"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Husk PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Gem kun denne brugers adgangskode"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Gem adgangskoden til alle brugere"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Spørg efter denne adgangskode hver gang"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Adgangskode er ikke påkrævet"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "_Vis adgangskoder"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Tertiær adgangskode:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Sekundær adgangskode:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "A_dgangskode:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Klik for at forbinde"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Ny …"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ingen"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamisk WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "O_pret"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Der kræves adgangskoder eller krypteringsnøgler for at få adgang til wi-fi-"
+"netværket “%s”."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Godkendelse til wi-fi-netværket påkrævet"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Der kræves godkendelse til wi-fi-netværket"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Opret nyt wi-fi-netværk"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nyt wi-fi-netværk"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+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/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Forbind til skjult wi-fi-netværk"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Skjult wi-fi-netværk"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Indtast navn og sikkerhedsoplysninger på det wi-fi-netværk, du ønsker at "
+"forbinde til."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Wi-fi-_sikkerhed"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "Forbi_ndelse"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Wi-fi-ada_pter"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"Jeg kan ikke finde min udbyder, og jeg ønsker at indtaste den _manuelt:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Udbyder:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Land- eller regionsliste:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Land eller region"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Kablet"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC-gitter"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Enten mangler der en adgangskode eller forbindelsen er ugyldig. I det sidste "
+"tilfælde skal du først redigere forbindelsen med nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-fi-_sikkerhed:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Netværksnavn:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Forbi_ndelse:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-fi-ada_pter:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Brug:"
@@ -4330,25 +4815,25 @@ msgstr "intet CA-certifikat valgt"
 msgid "selected CA certificate file does not exist"
 msgstr "valgte CA-certifikatfil findes ikke"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "manglende EAP-FAST-PAC-fil"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Vælg en PAC-fil"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Alle filer"
 
@@ -4384,16 +4869,16 @@ msgstr "_Indre godkendelse"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillad automatisk PAC-pro_vision"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "manglende EAP-LEAP-brugernavn"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "manglende EAP-LEAP-adgangskode"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4428,15 +4913,15 @@ msgstr "Endelse på servercertifikatets navn."
 msgid "_Domain"
 msgstr "_Domæne"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "manglende EAP-brugernavn"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "manglende EAP-adgangskode"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "manglende adgangsfrase til EAP-klientens private nøgle"
 
@@ -4448,23 +4933,23 @@ msgstr "A_dgangsfrase til privat nøgle"
 msgid "Sh_ow passphrase"
 msgstr "_Vis adgangsfrase"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "manglende EAP-TLS-identitet"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "intet brugercertifikat valgt"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "valgte brugercertifikatfil findes ikke"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "ingen nøgle valgt"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "valgte nøglefil findes ikke"
 
@@ -4472,7 +4957,7 @@ msgstr "valgte nøglefil findes ikke"
 msgid "I_dentity"
 msgstr "I_dentitet"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (ingen EAP)"
 
@@ -4510,15 +4995,15 @@ msgstr "Konfigureret eksternt"
 msgid "Au_thentication"
 msgstr "_Godkendelse"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "manglende leap-brugernavn"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "manglende leap-adgangskode"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "manglende EAP-adgangskode"
@@ -4527,24 +5012,24 @@ msgstr "manglende EAP-adgangskode"
 msgid "_Type"
 msgstr "_Type"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "manglende wep-nøgle"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4553,11 +5038,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "ugyldig wep-nøgle: adgangsfrasen skal være kortere end 64 tegn"
 
@@ -4585,7 +5070,7 @@ msgstr "Vis nøg_le"
 msgid "WEP inde_x"
 msgstr "WEP-inde_ks"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4594,359 +5079,10 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
 
-#~ msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
-#~ msgstr "Skan med din telefon eller <a href=\"nma:print\">udskriv</a>"
-
-#~ msgid "No certificate set"
-#~ msgstr "Intet certifikat angivet"
-
-#~ msgid "No key set"
-#~ msgstr "Ingen nøgle angivet"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Vælg en nøgle til %s-certifikat"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Privat %s-nøg_le"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Adgangskode til %s-nøgle"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Vælg %s-certifikat"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s-_certifikat"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Mit land er ikke på listen"
-
-#~ msgid "Unlisted"
-#~ msgstr "Ikke på listen"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Mit abonnement er ikke på listen …"
-
-#~ msgid "Provider"
-#~ msgstr "Udbyder"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Installeret GSM-enhed"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Installeret CDMA-enhed"
-
-#~ msgid "Any device"
-#~ msgstr "Enhver enhed"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Ny mobil bredbåndsforbindelse"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Denne guide hjælper dig med at oprette en mobil bredbåndsforbindelse til "
-#~ "et mobilt (3G) netværk."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Du har brug for følgende oplysninger:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Navnet på din bredbåndsudbyder"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Navnet på afregningen af dit bredbåndsabonnement"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(i visse tilfælde) APN (Access Point Name) for afregning af dit "
-#~ "bredbåndsabonnement"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Opret en forbindelse til _denne mobile bredbåndsenhed:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Opsæt en mobil bredbåndsforbindelse"
-
-#~ msgid "Country or region:"
-#~ msgstr "Land eller region:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Vælg din udbyders land eller region"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Vælg din udbyder på en _liste:"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "Jeg kan ikke finde min udbyder, og jeg ønsker at opsætte forbindelsen "
-#~ "_manuelt:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Min udbyder bruger GSM-teknologi (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Min udbyder bruger CDMA-teknologi (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Vælg din udbyder"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Vælg dit abonnement:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Va_lgt abonnements APN (Access Point Name):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Advarsel: Hvis du vælger et forkert abonnement, kan det medføre problemer "
-#~ "med afregning af din bredbåndskonto eller forhindre forbindelse.\n"
-#~ "\n"
-#~ "Spørg din udbyder om dit abonnements APN, hvis du er i tvivl om dit "
-#~ "abonnement."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Vælg abonnementsafregning"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Din mobile bredbåndsforbindelse er konfigureret med følgende "
-#~ "indstillinger:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Din enhed:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Din udbyder:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Dit abonnement:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Der vil nu blive oprettet en forbindelse til din mobile bredbåndsudbyder "
-#~ "med de indstillinger, du har valgt. Dobbelttjek dine indstillinger, hvis "
-#~ "forbindelsen slår fejl, eller hvis du ikke kan tilgå netværksressourcer. "
-#~ "Hvis du vil tilpasse dine indstillinger for mobil bredbåndsforbindelse, "
-#~ "så vælg “Netværksforbindelser” fra menuen System → Indstillinger."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Bekræft indstillinger for mobilt bredbånd"
-
-#~ msgid "(None)"
-#~ msgstr "(Ingen)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Nøgle i %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certifikat i %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Ukendt)"
-
-#~ msgid "Select"
-#~ msgstr "Vælg"
-
-#~ msgid "Cancel"
-#~ msgstr "Annullér"
-
-#~ msgid "Select from file…"
-#~ msgstr "Vælg fra fil …"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Vælg et %s-certifikat"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Adgangs_kode til %s-certifikat"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Fejl i forsøget på at logge ind: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Fejl ved åbning af en session: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Lås token op"
-
-#~ msgid "Issued By"
-#~ msgstr "Udstedt af"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Indtast %s-PIN"
-
-#~ msgid "_Login"
-#~ msgstr "_Login"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Husk PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Gem kun denne brugers adgangskode"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Gem adgangskoden til alle brugere"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Spørg efter denne adgangskode hver gang"
-
-#~ msgid "The password is not required"
-#~ msgstr "Adgangskode er ikke påkrævet"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "_Vis adgangskoder"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Tertiær adgangskode:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Sekundær adgangskode:"
-
-#~ msgid "_Password:"
-#~ msgstr "A_dgangskode:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Klik for at forbinde"
-
-#~ msgid "New…"
-#~ msgstr "Ny …"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Ingen"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynamisk WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "O_pret"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Der kræves adgangskoder eller krypteringsnøgler for at få adgang til wi-"
-#~ "fi-netværket “%s”."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Godkendelse til wi-fi-netværket påkrævet"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Der kræves godkendelse til wi-fi-netværket"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Opret nyt wi-fi-netværk"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nyt wi-fi-netværk"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Forbind til skjult wi-fi-netværk"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Skjult wi-fi-netværk"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Indtast navn og sikkerhedsoplysninger på det wi-fi-netværk, du ønsker at "
-#~ "forbinde til."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wi-fi-_sikkerhed"
-
-#~ msgid "C_onnection"
-#~ msgstr "Forbi_ndelse"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-fi-ada_pter"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "Jeg kan ikke finde min udbyder, og jeg ønsker at indtaste den _manuelt:"
-
-#~ msgid "Provider:"
-#~ msgstr "Udbyder:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Land- eller regionsliste:"
-
-#~ msgid "Country or region"
-#~ msgstr "Land eller region"
-
-#~ msgid "Wired"
-#~ msgstr "Kablet"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC-gitter"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Enten mangler der en adgangskode eller forbindelsen er ugyldig. I det "
-#~ "sidste tilfælde skal du først redigere forbindelsen med nm-connection-"
-#~ "editor"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wi-fi-_sikkerhed:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Netværksnavn:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Forbi_ndelse:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-fi-ada_pter:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/de.po b/po/de.po
index a9ccbe40..41de4818 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,7 +24,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2018-08-25 23:06+0200\n"
 "Last-Translator: Mario Blättermann <mario blaettermann gmail com>\n"
 "Language-Team: Deutsch <gnome-de gnome org>\n"
@@ -36,6 +36,7 @@ msgstr ""
 "X-Generator: Poedit 2.1.1\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Netzwerk"
 
@@ -243,15 +244,19 @@ msgstr "802.1X-Legitimierung"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Netzwerkname"
 
@@ -604,7 +609,7 @@ msgstr "Mobiles Breitband (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobiles Breitband"
 
@@ -727,7 +732,9 @@ msgstr "DSL-Legitimierung"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_OK"
 
@@ -832,6 +839,7 @@ msgid "Error displaying connection information:"
 msgstr "Die Verbindungsinformationen konnten nicht angezeigt werden:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -980,7 +988,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Hotspot"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Passwort:"
@@ -1005,7 +1013,8 @@ msgstr "VPN-Banner"
 msgid "Base Connection"
 msgstr "Zugordnete Verbindung"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -1770,6 +1779,7 @@ msgid "_Service"
 msgstr "_Dienst"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2444,6 +2454,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "_Roaming erlauben, falls das Heimnetzwerk nicht verfügbar ist"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Pass_wörter anzeigen"
 
@@ -2860,13 +2871,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3190,12 +3202,12 @@ msgstr ""
 "die Unterstützung für einige Methoden zu deaktivieren."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Funknetzwerk"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3205,22 +3217,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Gebündelt"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Team"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Brücke"
 
@@ -3516,6 +3531,7 @@ msgid "Select a connection to delete"
 msgstr "Wählen Sie eine Verbindung zum Löschen"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Name"
 
@@ -3727,6 +3743,8 @@ msgstr "Ethernet-Verbindung %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Vorgabe"
 
@@ -3958,35 +3976,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Mein Dienstanbieter verwendet C_DMA-basierte Technologien (z.B. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4149,10 +4167,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Funknetzwerkverbindung %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-Schlüssel (Hexadezimal oder ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit-Passphrase"
 
@@ -4161,14 +4181,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamisches WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
@@ -4246,6 +4269,473 @@ msgstr "Verbindungsinformationen"
 msgid "_Close"
 msgstr "S_chließen"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Kein Zertifikat festgelegt"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Kein Schlüssel gesetzt"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/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/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "Geheimer %s-_Schlüssel"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "_Passwort des %s-Schlüssels"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Wählen Sie das %s-Zertifikat"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "%s-_Zertifikat"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Mein Land ist nicht aufgelistet"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Nicht aufgelistet"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Mein Abrechnungsmodus ist nicht aufgelistet …"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Dienstanbieter"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Installiertes GSM-Gerät"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Installiertes CDMA-Gerät"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Irgendein Gerät"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Neue mobile Breitbandverbindung"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Dieser Assistent hilft Ihnen bei der Einrichtung einer mobilen "
+"Breitbandverbindung über ein UMTS-(3G)-Netzwerk."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Folgende Informationen sind notwendig:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Name Ihres Breitbandanbieters"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Name des Abrechnungsmodus Ihres Dienstanbieters"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(in einigen Fällen) Name des Zugangspunktes für Ihren Abrechnungsmodus:"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Eine Verbindung für dieses mobile Brei_tbandgerät einrichten:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Eine mobile Breitbandverbindung einrichten"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land oder Region"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Land oder Region des Dienstanbieters auswählen"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Dienstanbieter aus einer _Liste auswählen:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"Ich kann meinen Dienstanbieter nicht finden und möchte ihn _manuell eingeben:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+"Mein Dienstanbieter verwendet GSM-Technologien (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Mein Dienstanbieter verwendet CDMA-Technologien (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Dienstanbieter auswählen"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "Abrechnung_smodus auswählen:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Zugangspunkt (APN) zum ausgewählten _Abrechnungsmodus:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Warnung: Die Auswahl des falschen Abrechnungsmodus könnte zu "
+"Bezahlungsproblemen für Ihren Breitbandzugang führen oder eine Verbindung "
+"verhindern.\n"
+"\n"
+"Im Zweifelsfall sollten Sie Ihren Dienstanbieter nach dem Abrechnungsmodus "
+"Ihres Zugangspunktes fragen."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Abrechnungsmodus wählen"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Ihre mobile Breitbandverbindung wurde mit den folgenden Einstellungen "
+"eingerichtet:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Ihr Gerät:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Ihr Dienstanbieter:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Ihr Abrechnungsmodus:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Eine Verbindung zu Ihrem mobilen Breitbandanbieter wird nun anhand Ihrer "
+"gewählten Einstellungen eingerichtet. Falls die Verbindung scheitert oder "
+"Sie nicht auf Netzwerkressourcen zugreifen können, überprüfen Sie Ihre "
+"Einstellungen nochmals. Um die Einstellungen für mobile "
+"Breitbandverbindungen zu ändern, wählen Sie »Netzwerkverbindungen« im Menü "
+"System → Einstellungen."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Mobile Breitbandeinstellungen bestätigen"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(keine)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Schlüssel in %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Zertifikat in %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Unbekannt)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Auswählen"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Aus _Datei auswählen …"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Wählen Sie ein %s-Zertifikat"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Passwort des %s-Zertifikats"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Fehler beim Anmelden: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Fehler beim Öffnen einer Sitzung: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "Token _entsperren"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Ausgestellt von"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Geben Sie die PIN %s ein"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Anmelden"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "PIN me_rken"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Passwort nur für diesen Benutzer speichern"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Passwort für alle Benutzer speichern"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Jedes Mal nach diesem Passwort fragen"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Das Passwort ist nicht erforderlich"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Passwörter _zeigen"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Tertiäres Passwort:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Sekundäres Passwort:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Passwort:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Klicken Sie zum Verbinden"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Neu …"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Keine"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamisches WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "E_rzeugen"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Es werden Passwörter oder Schlüssel für die Verschlüsselung benötigt, um "
+"sich mit dem Funknetzwerk »%s« zu verbinden."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Legitimierung für Funknetzwerk wird benötigt"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Legitimierung für Funknetzwerk wird benötigt"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Neues Funknetzwerk erstellen"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Neues Funknetzwerk"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr ""
+"Bitte geben Sie den Namen des Funknetzwerks ein, das Sie erstellen möchten."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Mit einem verborgenen Funknetzwerk verbinden"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Verborgenes Funknetzwerk"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Bitte geben Sie den Namen und die Sicherheitseinstellungen des verborgenen "
+"Funknetzwerks ein, mit dem Sie sich verbinden möchten."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "_Sicherheit des Funknetzwerks"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "_Verbindung"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "WLAN-_Adapter"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"Ich kann meinen Dienstanbieter nicht finden und möchte ihn _manuell eingeben:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Dienstanbieter:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Länder- oder Regionsliste:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Land oder Region"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Kabelgebunden"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC-Mesh-Netzwerk"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s-%s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Entweder fehlt ein Passwort oder die Verbindung ist ungültig. In letztem "
+"Fall müssen Sie die Verbindung zuerst mit nm-connection-editor bearbeiten"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Sicherheit des _Funknetzwerks:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Netzwerkname:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Verbindung:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Funknetzwerkk_arte:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Aufruf:"
@@ -4394,25 +4884,25 @@ msgstr "Kein CA-Zertifikat gewählt"
 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:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC-Datei fehlt"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "PAC-Datei wählen"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-Dateien (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Alle Dateien"
 
@@ -4448,16 +4938,16 @@ msgstr "I_nnere Legitimierung"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Automatische PAC-Bereitstellung erlauben"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP-Benutzername fehlt"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP-Passwort fehlt"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4492,15 +4982,15 @@ msgstr "Suffix des Namens des Serverzertifikats."
 msgid "_Domain"
 msgstr "_Domäne"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "EAP-Benutzername fehlt"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "EAP-Passwort fehlt"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4514,23 +5004,23 @@ msgstr "WEP 128-bit-Passphrase"
 msgid "Sh_ow passphrase"
 msgstr "Passwörter _zeigen"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS-Identität fehlt"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "Kein Benutzerzertifikat gewählt"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 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:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "kein Schlüssel ausgewählt"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "Die gewählte Schlüsseldatei ist nicht vorhanden"
 
@@ -4538,7 +5028,7 @@ msgstr "Die gewählte Schlüsseldatei ist nicht vorhanden"
 msgid "I_dentity"
 msgstr "_Identität"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (kein EAP)"
 
@@ -4576,15 +5066,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Legitimierung"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "LEAP-Benutzername fehlt"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "LEAP-Passwort fehlt"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "EAP-Passwort fehlt"
@@ -4593,18 +5083,18 @@ msgstr "EAP-Passwort fehlt"
 msgid "_Type"
 msgstr "_Typ"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "WEP-Schlüssel fehlt"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4612,7 +5102,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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4621,11 +5111,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 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"
 
@@ -4653,7 +5143,7 @@ msgstr "Schlüssel an_zeigen"
 msgid "WEP inde_x"
 msgstr "WEP-Inde_x"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4662,364 +5152,12 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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 "No certificate set"
-#~ msgstr "Kein Zertifikat festgelegt"
-
-#~ msgid "No key set"
-#~ msgstr "Kein Schlüssel gesetzt"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Wählen Sie einen Schlüssel für das %s-Zertifikat"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Geheimer %s-_Schlüssel"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Passwort des %s-Schlüssels"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Wählen Sie das %s-Zertifikat"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s-_Zertifikat"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Mein Land ist nicht aufgelistet"
-
-#~ msgid "Unlisted"
-#~ msgstr "Nicht aufgelistet"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Mein Abrechnungsmodus ist nicht aufgelistet …"
-
-#~ msgid "Provider"
-#~ msgstr "Dienstanbieter"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Installiertes GSM-Gerät"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Installiertes CDMA-Gerät"
-
-#~ msgid "Any device"
-#~ msgstr "Irgendein Gerät"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Neue mobile Breitbandverbindung"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Dieser Assistent hilft Ihnen bei der Einrichtung einer mobilen "
-#~ "Breitbandverbindung über ein UMTS-(3G)-Netzwerk."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Folgende Informationen sind notwendig:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Name Ihres Breitbandanbieters"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Name des Abrechnungsmodus Ihres Dienstanbieters"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(in einigen Fällen) Name des Zugangspunktes für Ihren Abrechnungsmodus:"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Eine Verbindung für dieses mobile Brei_tbandgerät einrichten:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Eine mobile Breitbandverbindung einrichten"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Land oder Region"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Land oder Region des Dienstanbieters auswählen"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Dienstanbieter aus einer _Liste auswählen:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "Ich kann meinen Dienstanbieter nicht finden und möchte ihn _manuell "
-#~ "eingeben:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr ""
-#~ "Mein Dienstanbieter verwendet GSM-Technologien (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Mein Dienstanbieter verwendet CDMA-Technologien (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Dienstanbieter auswählen"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "Abrechnung_smodus auswählen:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Zugangspunkt (APN) zum ausgewählten _Abrechnungsmodus:"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Warnung: Die Auswahl des falschen Abrechnungsmodus könnte zu "
-#~ "Bezahlungsproblemen für Ihren Breitbandzugang führen oder eine Verbindung "
-#~ "verhindern.\n"
-#~ "\n"
-#~ "Im Zweifelsfall sollten Sie Ihren Dienstanbieter nach dem "
-#~ "Abrechnungsmodus Ihres Zugangspunktes fragen."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Abrechnungsmodus wählen"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Ihre mobile Breitbandverbindung wurde mit den folgenden Einstellungen "
-#~ "eingerichtet:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Ihr Gerät:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Ihr Dienstanbieter:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Ihr Abrechnungsmodus:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Eine Verbindung zu Ihrem mobilen Breitbandanbieter wird nun anhand Ihrer "
-#~ "gewählten Einstellungen eingerichtet. Falls die Verbindung scheitert oder "
-#~ "Sie nicht auf Netzwerkressourcen zugreifen können, überprüfen Sie Ihre "
-#~ "Einstellungen nochmals. Um die Einstellungen für mobile "
-#~ "Breitbandverbindungen zu ändern, wählen Sie »Netzwerkverbindungen« im "
-#~ "Menü System → Einstellungen."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Mobile Breitbandeinstellungen bestätigen"
-
-#~ msgid "(None)"
-#~ msgstr "(keine)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Schlüssel in %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Zertifikat in %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Unbekannt)"
-
-#~ msgid "Select"
-#~ msgstr "Auswählen"
-
-#~ msgid "Cancel"
-#~ msgstr "Abbrechen"
-
-#~ msgid "Select from file…"
-#~ msgstr "Aus _Datei auswählen …"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Wählen Sie ein %s-Zertifikat"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Passwort des %s-Zertifikats"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Fehler beim Anmelden: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Fehler beim Öffnen einer Sitzung: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "Token _entsperren"
-
-#~ msgid "Issued By"
-#~ msgstr "Ausgestellt von"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Geben Sie die PIN %s ein"
-
-#~ msgid "_Login"
-#~ msgstr "_Anmelden"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "PIN me_rken"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Passwort nur für diesen Benutzer speichern"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Passwort für alle Benutzer speichern"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Jedes Mal nach diesem Passwort fragen"
-
-#~ msgid "The password is not required"
-#~ msgstr "Das Passwort ist nicht erforderlich"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Passwörter _zeigen"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Tertiäres Passwort:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Sekundäres Passwort:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Passwort:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Klicken Sie zum Verbinden"
-
-#~ msgid "New…"
-#~ msgstr "Neu …"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Keine"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynamisches WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "E_rzeugen"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Es werden Passwörter oder Schlüssel für die Verschlüsselung benötigt, um "
-#~ "sich mit dem Funknetzwerk »%s« zu verbinden."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Legitimierung für Funknetzwerk wird benötigt"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Legitimierung für Funknetzwerk wird benötigt"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Neues Funknetzwerk erstellen"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Neues Funknetzwerk"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Mit einem verborgenen Funknetzwerk verbinden"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Verborgenes Funknetzwerk"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Bitte geben Sie den Namen und die Sicherheitseinstellungen des "
-#~ "verborgenen Funknetzwerks ein, mit dem Sie sich verbinden möchten."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Sicherheit des Funknetzwerks"
-
-#~ msgid "C_onnection"
-#~ msgstr "_Verbindung"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "WLAN-_Adapter"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "Ich kann meinen Dienstanbieter nicht finden und möchte ihn _manuell "
-#~ "eingeben:"
-
-#~ msgid "Provider:"
-#~ msgstr "Dienstanbieter:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Länder- oder Regionsliste:"
-
-#~ msgid "Country or region"
-#~ msgstr "Land oder Region"
-
-#~ msgid "Wired"
-#~ msgstr "Kabelgebunden"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC-Mesh-Netzwerk"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s-%s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Entweder fehlt ein Passwort oder die Verbindung ist ungültig. In letztem "
-#~ "Fall müssen Sie die Verbindung zuerst mit nm-connection-editor bearbeiten"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Sicherheit des _Funknetzwerks:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Netzwerkname:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "_Verbindung:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Funknetzwerkk_arte:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/dz.po b/po/dz.po
index ecd1c2d5..a87909de 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet.network-manager-applet-0-6.pot\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2007-03-16 09:28+0530\n"
 "Last-Translator: sonam pelden <sonaa_peldn yahoo com>\n"
 "Language-Team: Dzongkha <pgeyleg dit gov bt>\n"
@@ -22,6 +22,7 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 #, fuzzy
 msgid "Network"
 msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
@@ -206,15 +207,19 @@ msgstr "བདེན་བཤད:"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "མཐུད། (_o)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
@@ -551,7 +556,7 @@ msgstr ""
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr ""
 
@@ -681,7 +686,9 @@ msgstr "བདེན་བཤད:"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -792,6 +799,7 @@ msgid "Error displaying connection information:"
 msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་སྟོན་འབདཝ་ད་འཛོལ་བ:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr ""
@@ -941,7 +949,7 @@ msgstr ""
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "ཆོག་ཡིག:"
@@ -969,7 +977,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr ""
 
@@ -1701,6 +1710,7 @@ msgid "_Service"
 msgstr ""
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2326,6 +2336,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr ""
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 #, fuzzy
 msgid "Sho_w passwords"
 msgstr "ཆོག་ཡིག་ཚུ་སྟོན་"
@@ -2722,13 +2733,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3042,12 +3054,12 @@ msgid ""
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3057,22 +3069,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3366,6 +3381,7 @@ msgid "Select a connection to delete"
 msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
@@ -3586,6 +3602,8 @@ msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལ
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 #, fuzzy
 msgid "Default"
 msgstr "སྔོན་སྒྲིག་འགྲུལ་ལམ:"
@@ -3805,37 +3823,37 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "པི་ཨེ་པི་"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 #, fuzzy
 msgid "CHAP"
 msgstr "MSCHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 #, fuzzy
 msgid "MSCHAPv2"
 msgstr "MSCHAPV2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3988,11 +4006,13 @@ msgid "Wi-Fi connection %d"
 msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 64/128-བིཊི་ ASCII"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-བིཊི་ཆོག་ཚིག་"
 
@@ -4002,16 +4022,19 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "ནུས་ཅན་ཌབ་ལུ་ཨི་པི་"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "WPA & WPA2 Personal"
 msgstr "WPA2 རང་དོན་"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 #, fuzzy
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA2 ཚོང་ལས་"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "ཌབ་ལུ་པི་ཨེ་རང་དོན་"
@@ -4085,6 +4108,467 @@ msgstr "མཐུད་ལམ་བརྡ་དོན་"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཡིག་སྣོད:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཆོག་ཡིག:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr ""
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr ""
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "ཅི་མེད་"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་སྟོན་འབདཝ་ད་འཛོལ་བ:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "ཆོག་ཡིག་ཚུ་སྟོན་"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཆོག་ཡིག:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "གལ་གནད་ཆུང་བ་ཌི་ཨེན་ཨེསི:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+#, fuzzy
+msgid "_Password:"
+msgstr "ཆོག་ཡིག:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "ཅི་མེད་"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "ནུས་ཅན་ཌབ་ལུ་ཨི་པི་"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ལྡེ་མིག་དགོཔ་"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད་"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "ཁྱོད་ཀྱིས་མཐུད་དགོ་མནོ་མི་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱི་མིང་འདི་ཐོ་བཀོད་འབད།"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲུལ་གཞན་མི་ལུ་མཐུད་"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"ཁྱོད་རང་བཟོ་དགོ་མནོ་དོ་བཟུམ་སྦེ་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱི་མིང་དང་སྲུང་སྐྱོབ་སྒྲིག་སྟངས་ཚུ་ཐོ་བཀོད་འབད།"
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "མཐུད། (_o)"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "རླུང་འཕྲིན་མཐུན་བྱེད: (_a)"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
+
+#: src/libnm-gtk/wifi.ui:129
+#, fuzzy
+msgid "_Network name:"
+msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "མཐུད། (_o)"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "རླུང་འཕྲིན་མཐུན་བྱེད: (_a)"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr ""
@@ -4233,25 +4717,25 @@ msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 msgid "selected CA certificate file does not exist"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད་"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "ཇི་ཊི་སི་"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4291,16 +4775,16 @@ msgstr "བདེན་བཤད:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr ""
@@ -4336,15 +4820,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4358,24 +4842,24 @@ msgstr "WEP 128-བིཊི་ཆོག་ཚིག་"
 msgid "Sh_ow passphrase"
 msgstr "ཆོག་ཚིག་སྟོན་"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4384,7 +4868,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "ངོ་རྟགས:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPV2"
@@ -4424,15 +4908,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "བདེན་བཤད:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཆོག་ཡིག:"
@@ -4442,33 +4926,33 @@ msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཆོག་ཡིག
 msgid "_Type"
 msgstr "དབྱེ་བ:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4499,137 +4983,17 @@ msgstr "ལྡེ་མིག་སྟོན་"
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཡིག་སྣོད:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཆོག་ཡིག:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "ཅི་མེད་"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་སྟོན་འབདཝ་ད་འཛོལ་བ:"
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "ཆོག་ཡིག་ཚུ་སྟོན་"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཆོག་ཡིག:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "གལ་གནད་ཆུང་བ་ཌི་ཨེན་ཨེསི:"
-
-#, fuzzy
-#~ msgid "_Password:"
-#~ msgstr "ཆོག་ཡིག:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
-
-#, fuzzy
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "ཅི་མེད་"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "ནུས་ཅན་ཌབ་ལུ་ཨི་པི་"
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ལྡེ་མིག་དགོཔ་"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད་"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "ཁྱོད་ཀྱིས་མཐུད་དགོ་མནོ་མི་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱི་མིང་འདི་ཐོ་བཀོད་འབད།"
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "རླུང་འཕྲིན་ཡོངས་འབྲུལ་གཞན་མི་ལུ་མཐུད་"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "ཁྱོད་རང་བཟོ་དགོ་མནོ་དོ་བཟུམ་སྦེ་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱི་མིང་དང་སྲུང་སྐྱོབ་སྒྲིག་སྟངས་ཚུ་ཐོ་བཀོད་འབད།"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "མཐུད། (_o)"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "རླུང་འཕྲིན་མཐུན་བྱེད: (_a)"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
-
-#, fuzzy
-#~ msgid "_Network name:"
-#~ msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
-
-#, fuzzy
-#~ msgid "C_onnection:"
-#~ msgstr "མཐུད། (_o)"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "རླུང་འཕྲིན་མཐུན་བྱེད: (_a)"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "ཅི་མེད་ (སྔོན་སྒྲིག་)"
diff --git a/po/el.po b/po/el.po
index 0918862e..edd51d28 100644
--- a/po/el.po
+++ b/po/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2014-07-21 12:37+0200\n"
 "Last-Translator: Tom Tryfonidis <tomtryf gmail com>\n"
 "Language-Team: team lists gnome gr\n"
@@ -26,6 +26,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Δίκτυο"
 
@@ -225,15 +226,19 @@ msgstr "Πιστοποίηση 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "Σύν_δεση"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "Ό_νομα δικτύου:"
@@ -586,7 +591,7 @@ msgstr "Κινητή ευρυζωνική (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Κινητή ευρυζωνική"
 
@@ -709,7 +714,9 @@ msgstr "Πιστοποίηση DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -815,6 +822,7 @@ msgid "Error displaying connection information:"
 msgstr "Σφάλμα εμφάνισης πληροφοριών σύνδεσης:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -965,7 +973,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Κωδικός πρόσβασης:"
@@ -990,7 +998,8 @@ msgstr "Κείμενο εισόδου VPN"
 msgid "Base Connection"
 msgstr "Σύνδεση βάσης"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Άγνωστο"
 
@@ -1785,6 +1794,7 @@ msgid "_Service"
 msgstr "_Υπηρεσία:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2451,6 +2461,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Να επιτρέπεται η _περιαγωγή αν το οικιακό δίκτυο δεν είναι διαθέσιμο"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Εμ_φάνιση κωδικών πρόσβασης"
 
@@ -2856,13 +2867,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3188,12 +3200,12 @@ msgstr ""
 "απενεργοποιήσετε κάποιες μεθόδους."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3203,22 +3215,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Δεσμός"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Ομάδα"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Γέφυρα"
 
@@ -3519,6 +3534,7 @@ msgid "Select a connection to delete"
 msgstr "Σύνδεση ομάδας %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Όνομα"
 
@@ -3742,6 +3758,8 @@ msgstr "Σύνδεση Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Προεπιλογή"
 
@@ -3973,35 +3991,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Ο πάροχός μου χρησιμοποιεί τεχνολογίες C_DMA (π.χ. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4166,10 +4184,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Σύνδεση Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Κλειδί WEP 40/128-bit (Hex ή ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Συνθηματική φράση WEP 128-bit"
 
@@ -4178,14 +4198,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Δυναμικό WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "Προσωπικό WPA & WPA2"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "Εταιρικό WPA & WPA2"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Προσωπικό WPA & WPA2"
@@ -4262,6 +4285,487 @@ msgstr "Πληροφορίες σύνδεσης"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Επιλέξτε πιστοποιητικό CA"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Ιδιωτικό κ_λειδί:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Κωδικός πρόσβασης _ιδιωτικού κλειδιού:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Επιλέξτε πιστοποιητικό CA"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Πιστοποιητικό _χρήστη:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Η χώρα μου δεν είναι στη λίστα"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Εκτός λίστας"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Η συνδρομή μου δεν αναφέρεται..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Πάροχος"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Εγκατεστημένη συσκευή GSM"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Εγκατεστημένη συσκευή CDMA"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Οποιαδήποτε συσκευή"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Νέα κινητή ευρυζωνική σύνδεση"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Ο βοηθός αυτός σας επιτρέπει να συνδεθείτε εύκολα σε ένα κινητό ευρυζωνικό "
+"(3G) δίκτυο."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Θα χρειαστείτε τις ακόλουθες πληροφορίες:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Το όνομα του παρόχου της σύνδεσης σας"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Το όνομα της συνδρομής σας"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(σε κάποιες περιπτώσεις) Το APN (Όνομα σημείου πρόσβασης) της ευρυζωνικής "
+"συνδρομής σας"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Δημιουργία σύνδεσης για την _ακόλουθη συσκευή:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Ρύθμιση κινητής ευρυζωνικής σύνδεσης"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Χώρα ή περιοχή"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Επιλέξτε τη χώρα ή περιοχή του παρόχου σας"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Επιλέξτε τον πάροχό σας από τη _λίστα:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Δε βρήκα τον πάροχό μου και θέλω να τον πληκτρολογήσω _χειροκίνητα:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Ο πάροχός μου χρησιμοποιεί τεχνολογίες GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Ο πάροχός μου χρησιμοποιεί τεχνολογίες CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Επιλέξτε τον πάροχό σας"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Επιλέξτε τη συνδρομή σας:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Access Point Name) επιλεγμένης συνδρομής:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Προειδοποίηση: Αν επιλέξετε λάθος συνδρομή, μπορεί να προκύψουν προβλήματα "
+"με τη χρέωση του λογαριασμού σας ή τη συνδεσιμότητα.\n"
+"\n"
+"Αν δεν είστε σίγουροι για τον τύπο συνδρομής σας, ζητήστε το APN της "
+"συνδρομής σας από τον πάροχο."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Επιλέξτε τη συνδρομή σας"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Η κινητή ευρυζωνική σας σύνδεση περιλαμβάνει τις ακόλουθες ρυθμίσεις:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Η συσκευή σας:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Ο πάροχός σας:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Η συνδρομή σας:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Τώρα θα γίνει σύνδεση στον πάροχο κινητής ευρυζωνικής σύνδεσης, "
+"χρησιμοποιώντας τις ρυθμίσεις που επιλέξατε. Αν η σύνδεση αποτύχει, ή αν δεν "
+"έχετε πρόσβαση στους πόρους του δικτύου, ελέγξτε ξανά τις ρυθμίσεις σας. Για "
+"να τροποποιήσετε τις ρυθμίσεις της κινητής ευρυζωνικής σύνδεσης, επιλέξτε "
+"\"Συνδέσεις δικτύου\" από το μενού Σύστημα >> Προτιμήσεις."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Επιβεβαίωση των ρυθμίσεων της κινητής ευρυζωνικής σύνδεσης"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(κανένα)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Πιστοποιητικό C_A:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Άγνωστο"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Επιλέξτε αρχείο"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Επιλέξτε αρχείο"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Επιλέξτε πιστοποιητικό CA"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Πιστοποιητικό _χρήστη:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Σφάλμα επεξεργασίας σύνδεσης"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Ξεκλείδωμα"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "Αποθήκευση του κωδικού πρόσβασης μόνο για αυτόν τον _χρήστη"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "Αποθήκευση του κωδικού πρόσβασης για ό_λους τους χρήστες"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "Ε_ρώτηση για κωδικό πρόσβασης κάθε φορά"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Απαιτείται κωδικός πρόσβασης για σύνδεση στο '%s'."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Εμ_φάνιση κωδικών πρόσβασης"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Δευτερεύων κωδικός πρόσβασης:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Δευτερεύων κωδικός πρόσβασης:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "Κωδικός _πρόσβασης:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Αποσύνδεση"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Κανένα"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Δυναμικό WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "Δ_ημιουργία"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Απαιτούνται κωδικοί πρόσβασης ή κλειδιά κρυπτογράφησης για πρόσβαση στο "
+"δίκτυο Wi-Fi '%s'."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Απαιτείται πιστοποίηση δικτύου Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Απαιτείται πιστοποίηση από το δίκτυο Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Δημιουργία νέου δικτύου Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Νέο δίκτυο Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Εισάγετε το όνομα του δικτύου Wi-Fi που επιθυμείτε να δημιουργήσετε."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Σύνδεση σε κρυφό δίκτυο Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Κρυφό δίκτυο Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Εισάγετε το όνομα και τις ρυθμίσεις ασφαλείας του κρυφού δικτύου Wi-Fi στο "
+"οποίο επιθυμείτε να συνδεθείτε."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Ασ_φάλεια δικτύου Wi-Fi:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Σύν_δεση:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Προσαρμογέας Wi-Fi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Δε βρήκα τον πάροχό μου και θέλω να τον πληκτρολογήσω _χειροκίνητα:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Πάροχος:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Λίστα χωρών ή περιοχών:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Χώρα ή περιοχή"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Ενσύρματη"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "Πλέγμα OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Ασ_φάλεια δικτύου Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Ό_νομα δικτύου:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Σύν_δεση:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Προσαρμογέας Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Χρήση:"
@@ -4412,26 +4916,26 @@ msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Επιλέξτε ένα αρχείο PAC..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Αρχεία PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
@@ -4470,16 +4974,16 @@ msgstr "_Εσωτερική πιστοποίηση:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Να επιτρέπεται η αυτόματη _παροχή PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4515,15 +5019,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4537,24 +5041,24 @@ msgstr "Συνθηματική φράση WEP 128-bit"
 msgid "Sh_ow passphrase"
 msgstr "Εμφάνιση συνθηματικής φράσης"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4563,7 +5067,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "_Ταυτότητα:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4603,15 +5107,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Πιστοποίηση:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Κωδικός πρόσβασης _ιδιωτικού κλειδιού:"
@@ -4621,33 +5125,33 @@ msgstr "Κωδικός πρόσβασης _ιδιωτικού κλειδιού:"
 msgid "_Type"
 msgstr "_Τύπος:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4677,348 +5181,17 @@ msgstr "Εμ_φάνιση κλειδιού"
 msgid "WEP inde_x"
 msgstr "Δείκτης _WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Επιλέξτε πιστοποιητικό CA"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Ιδιωτικό κ_λειδί:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Κωδικός πρόσβασης _ιδιωτικού κλειδιού:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Επιλέξτε πιστοποιητικό CA"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Πιστοποιητικό _χρήστη:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Η χώρα μου δεν είναι στη λίστα"
-
-#~ msgid "Unlisted"
-#~ msgstr "Εκτός λίστας"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Η συνδρομή μου δεν αναφέρεται..."
-
-#~ msgid "Provider"
-#~ msgstr "Πάροχος"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Εγκατεστημένη συσκευή GSM"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Εγκατεστημένη συσκευή CDMA"
-
-#~ msgid "Any device"
-#~ msgstr "Οποιαδήποτε συσκευή"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Νέα κινητή ευρυζωνική σύνδεση"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Ο βοηθός αυτός σας επιτρέπει να συνδεθείτε εύκολα σε ένα κινητό "
-#~ "ευρυζωνικό (3G) δίκτυο."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Θα χρειαστείτε τις ακόλουθες πληροφορίες:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Το όνομα του παρόχου της σύνδεσης σας"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Το όνομα της συνδρομής σας"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(σε κάποιες περιπτώσεις) Το APN (Όνομα σημείου πρόσβασης) της ευρυζωνικής "
-#~ "συνδρομής σας"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Δημιουργία σύνδεσης για την _ακόλουθη συσκευή:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Ρύθμιση κινητής ευρυζωνικής σύνδεσης"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Χώρα ή περιοχή"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Επιλέξτε τη χώρα ή περιοχή του παρόχου σας"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Επιλέξτε τον πάροχό σας από τη _λίστα:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Δε βρήκα τον πάροχό μου και θέλω να τον πληκτρολογήσω _χειροκίνητα:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Ο πάροχός μου χρησιμοποιεί τεχνολογίες GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Ο πάροχός μου χρησιμοποιεί τεχνολογίες CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Επιλέξτε τον πάροχό σας"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Επιλέξτε τη συνδρομή σας:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "_APN (Access Point Name) επιλεγμένης συνδρομής:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Προειδοποίηση: Αν επιλέξετε λάθος συνδρομή, μπορεί να προκύψουν "
-#~ "προβλήματα με τη χρέωση του λογαριασμού σας ή τη συνδεσιμότητα.\n"
-#~ "\n"
-#~ "Αν δεν είστε σίγουροι για τον τύπο συνδρομής σας, ζητήστε το APN της "
-#~ "συνδρομής σας από τον πάροχο."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Επιλέξτε τη συνδρομή σας"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Η κινητή ευρυζωνική σας σύνδεση περιλαμβάνει τις ακόλουθες ρυθμίσεις:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Η συσκευή σας:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Ο πάροχός σας:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Η συνδρομή σας:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Τώρα θα γίνει σύνδεση στον πάροχο κινητής ευρυζωνικής σύνδεσης, "
-#~ "χρησιμοποιώντας τις ρυθμίσεις που επιλέξατε. Αν η σύνδεση αποτύχει, ή αν "
-#~ "δεν έχετε πρόσβαση στους πόρους του δικτύου, ελέγξτε ξανά τις ρυθμίσεις "
-#~ "σας. Για να τροποποιήσετε τις ρυθμίσεις της κινητής ευρυζωνικής σύνδεσης, "
-#~ "επιλέξτε \"Συνδέσεις δικτύου\" από το μενού Σύστημα >> Προτιμήσεις."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Επιβεβαίωση των ρυθμίσεων της κινητής ευρυζωνικής σύνδεσης"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(κανένα)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Πιστοποιητικό C_A:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Άγνωστο"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "Επιλέξτε αρχείο"
-
-#, fuzzy
-#~ msgid "Select from file…"
-#~ msgstr "Επιλέξτε αρχείο"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Επιλέξτε πιστοποιητικό CA"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Πιστοποιητικό _χρήστη:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Σφάλμα επεξεργασίας σύνδεσης"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Ξεκλείδωμα"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "Αποθήκευση του κωδικού πρόσβασης μόνο για αυτόν τον _χρήστη"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "Αποθήκευση του κωδικού πρόσβασης για ό_λους τους χρήστες"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "Ε_ρώτηση για κωδικό πρόσβασης κάθε φορά"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Απαιτείται κωδικός πρόσβασης για σύνδεση στο '%s'."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Εμ_φάνιση κωδικών πρόσβασης"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Δευτερεύων κωδικός πρόσβασης:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Δευτερεύων κωδικός πρόσβασης:"
-
-#~ msgid "_Password:"
-#~ msgstr "Κωδικός _πρόσβασης:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Αποσύνδεση"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Κανένα"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Δυναμικό WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "Δ_ημιουργία"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Απαιτούνται κωδικοί πρόσβασης ή κλειδιά κρυπτογράφησης για πρόσβαση στο "
-#~ "δίκτυο Wi-Fi '%s'."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Απαιτείται πιστοποίηση δικτύου Wi-Fi"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Απαιτείται πιστοποίηση από το δίκτυο Wi-Fi"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Δημιουργία νέου δικτύου Wi-Fi"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Νέο δίκτυο Wi-Fi"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr ""
-#~ "Εισάγετε το όνομα του δικτύου Wi-Fi που επιθυμείτε να δημιουργήσετε."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Σύνδεση σε κρυφό δίκτυο Wi-Fi"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Κρυφό δίκτυο Wi-Fi"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Εισάγετε το όνομα και τις ρυθμίσεις ασφαλείας του κρυφού δικτύου Wi-Fi "
-#~ "στο οποίο επιθυμείτε να συνδεθείτε."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Ασ_φάλεια δικτύου Wi-Fi:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Σύν_δεση:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Προσαρμογέας Wi-Fi:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Δε βρήκα τον πάροχό μου και θέλω να τον πληκτρολογήσω _χειροκίνητα:"
-
-#~ msgid "Provider:"
-#~ msgstr "Πάροχος:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Λίστα χωρών ή περιοχών:"
-
-#~ msgid "Country or region"
-#~ msgstr "Χώρα ή περιοχή"
-
-#~ msgid "Wired"
-#~ msgstr "Ενσύρματη"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "Πλέγμα OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Ασ_φάλεια δικτύου Wi-Fi:"
-
-#~ msgid "_Network name:"
-#~ msgstr "Ό_νομα δικτύου:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Σύν_δεση:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Προσαρμογέας Wi-Fi:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (προεπιλογή)"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 14b34ae3..ae621944 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2005-09-06 14:52-0400\n"
 "Last-Translator: Adam Weinberger <adamw gnome org>\n"
 "Language-Team: Canadian English <adamw gnome org>\n"
@@ -20,6 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 #, fuzzy
 msgid "Network"
 msgstr "_Wired Network"
@@ -204,15 +205,19 @@ msgstr "Authentication:"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Network Name:"
@@ -549,7 +554,7 @@ msgstr ""
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr ""
 
@@ -675,7 +680,9 @@ msgstr "Authentication:"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -787,6 +794,7 @@ msgid "Error displaying connection information:"
 msgstr "Error displaying connection information:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr ""
@@ -936,7 +944,7 @@ msgstr ""
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Password:"
@@ -964,7 +972,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "VPN Connections"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr ""
 
@@ -1693,6 +1702,7 @@ msgid "_Service"
 msgstr ""
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2314,6 +2324,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr ""
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr ""
 
@@ -2706,13 +2717,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3023,12 +3035,12 @@ msgid ""
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3038,22 +3050,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3349,6 +3364,7 @@ msgid "Select a connection to delete"
 msgstr "VPN connection '%s' said:"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
@@ -3571,6 +3587,8 @@ msgstr "Delete VPN connection \"%s\"?"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 #, fuzzy
 msgid "Default"
 msgstr "Default Route:"
@@ -3790,35 +3808,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr ""
 
@@ -3971,11 +3989,13 @@ msgid "Wi-Fi connection %d"
 msgstr "VPN connection '%s' said:"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit ASCII"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 #, fuzzy
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP Passphrase"
@@ -3985,15 +4005,18 @@ msgid "Dynamic WEP (802.1X)"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "WPA & WPA2 Personal"
 msgstr "WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA Personal"
@@ -4067,6 +4090,465 @@ msgstr "Connection Information"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Password:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Password:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr ""
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr ""
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "none"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Password:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Error retrieving VPN connection '%s'"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "Password:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "Secondary DNS:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+#, fuzzy
+msgid "_Password:"
+msgstr "Password:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Wired network connection"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "None"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wireless Network Key Required"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "Create New Wireless Network"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Enter the name of the wireless network to which you wish to connect."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Connect to Other Wireless Network"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Enter the name and security settings of the wireless network you wish to "
+"create."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Wireless Security:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "C_onnect"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wireless _adapter:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Wireless Security:"
+
+#: src/libnm-gtk/wifi.ui:129
+#, fuzzy
+msgid "_Network name:"
+msgstr "_Network Name:"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "C_onnect"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Wireless _adapter:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr ""
@@ -4213,25 +4695,25 @@ msgstr ""
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4269,16 +4751,16 @@ msgstr "Authentication:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr ""
@@ -4313,15 +4795,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4335,23 +4817,23 @@ msgstr "WEP Passphrase"
 msgid "Sh_ow passphrase"
 msgstr "Passphrase:"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4359,7 +4841,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
@@ -4398,15 +4880,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Authentication:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Password:"
@@ -4416,33 +4898,33 @@ msgstr "Password:"
 msgid "_Type"
 msgstr "Type:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4472,111 +4954,17 @@ msgstr ""
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Password:"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Password:"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "none"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Password:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Error retrieving VPN connection '%s'"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Password:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "Secondary DNS:"
-
-#, fuzzy
-#~ msgid "_Password:"
-#~ msgstr "Password:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Wired network connection"
-
-#, fuzzy
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "None"
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wireless Network Key Required"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Create New Wireless Network"
-
-#, 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."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Connect to Other Wireless Network"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Enter the name and security settings of the wireless network you wish to "
-#~ "create."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Wireless Security:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "C_onnect"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wireless _adapter:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Wireless Security:"
-
-#, fuzzy
-#~ msgid "_Network name:"
-#~ msgstr "_Network Name:"
-
-#, fuzzy
-#~ msgid "C_onnection:"
-#~ msgstr "C_onnect"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wireless _adapter:"
-
 #, fuzzy
 #~ msgid "Failed to update connection secrets due to an unknown error."
 #~ msgstr "Could not start the VPN connection '%s' due to a connection error."
diff --git a/po/en_GB.po b/po/en_GB.po
index 4d0cb01a..320776b9 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2013-03-26 18:11+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
@@ -20,6 +20,7 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Network"
 
@@ -213,15 +214,19 @@ msgstr "802.1X authentication"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Network name:"
@@ -579,7 +584,7 @@ msgstr "Mobile Broadband (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobile Broadband"
 
@@ -702,7 +707,9 @@ msgstr "DSL authentication"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -812,6 +819,7 @@ msgid "Error displaying connection information:"
 msgstr "Error displaying connection information:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -963,7 +971,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Password:"
@@ -988,7 +996,8 @@ msgstr "VPN Banner"
 msgid "Base Connection"
 msgstr "Base Connection"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -1765,6 +1774,7 @@ msgid "_Service"
 msgstr "_Service:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2425,6 +2435,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Allow _roaming if home network is not available"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Sho_w passwords"
 
@@ -2834,13 +2845,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3166,12 +3178,12 @@ msgstr ""
 "methods.  If connections fail, try disabling support for some methods."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3181,22 +3193,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bond"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Bridge"
 
@@ -3496,6 +3511,7 @@ msgid "Select a connection to delete"
 msgstr "DSL connection %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Name"
 
@@ -3721,6 +3737,8 @@ msgstr "Ethernet connection %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Default"
 
@@ -3948,35 +3966,35 @@ msgstr "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4143,10 +4161,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi connection %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Key (Hex or ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
@@ -4155,14 +4175,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamic WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
@@ -4238,6 +4261,492 @@ msgstr "Connection Information"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Ignore CA certificate"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Choose CA Certificate"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Private _key:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_Private key password:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Choose CA Certificate"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_User certificate:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "My country is not listed"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Unlisted"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "My plan is not listed…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Provider"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Installed GSM device"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Installed CDMA device"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Any device"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "New Mobile Broadband Connection"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"mobile (3G) network."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "You will need the following information:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Your broadband provider's name"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Your broadband billing plan name"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(in some cases) Your broadband billing plan APN (Access Point Name)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Create a connection for _this mobile broadband device:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Set up a Mobile Broadband Connection"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Country or region"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Choose your Provider's Country or Region"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Select your provider from a _list:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "I can't find my provider and I wish to enter it _manually:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "My provider uses CDMA technology (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Choose your Provider"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Select your plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Selected plan _APN (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan's APN."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Choose your Billing Plan"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Your mobile broadband connection is configured with the following settings:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Your Device:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Your Provider:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Your Plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected.  If the connection fails or you cannot access network "
+"resources, double-check your settings.  To modify your mobile broadband "
+"connection settings, choose \"Network Connections\" from the System >> "
+"Preferences menu."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirm Mobile Broadband Settings"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(none)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A certificate:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Unknown"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Select A File"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Select A File"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Choose CA Certificate"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_User certificate:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Error editing connection"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Unlock"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "As_k for this password every time"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "A password is required to connect to '%s'."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "Sho_w passwords"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Password:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Password:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Password:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Disconnect"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "None"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamic WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_reate"
+
+#
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi Network Authentication Required"
+
+#
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Authentication required by Wi-Fi network"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Create New Wi-Fi Network"
+
+#
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "New Wi-Fi network"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Enter a name for the Wi-Fi network you wish to create."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Connect to Hidden Wi-Fi Network"
+
+#
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Hidden Wi-Fi network"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+
+#
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi _security:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Co_nnection:"
+
+#
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi _adapter:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "I can't find my provider and I wish to enter it _manually:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Provider:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Country or Region List:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Country or region"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Wired"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi _security:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Network name:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nnection:"
+
+#
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi _adapter:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Usage:"
@@ -4389,26 +4898,26 @@ msgstr "Ignore CA certificate"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Choose a PAC file…"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC files (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "All files"
 
@@ -4447,16 +4956,16 @@ msgstr "_Inner authentication:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Allow automatic PAC pro_visioning"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4493,15 +5002,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4515,24 +5024,24 @@ msgstr "WEP 128-bit Passphrase"
 msgid "Sh_ow passphrase"
 msgstr "Show passphrase"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ignore CA certificate"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4541,7 +5050,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_dentity:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4581,15 +5090,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Au_thentication:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_Private key password:"
@@ -4599,33 +5108,33 @@ msgstr "_Private key password:"
 msgid "_Type"
 msgstr "_Type:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4655,348 +5164,17 @@ msgstr "Sho_w key"
 msgid "WEP inde_x"
 msgstr "WEP inde_x:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Ignore CA certificate"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Choose CA Certificate"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Private _key:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Private key password:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Choose CA Certificate"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_User certificate:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "My country is not listed"
-
-#~ msgid "Unlisted"
-#~ msgstr "Unlisted"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "My plan is not listed…"
-
-#~ msgid "Provider"
-#~ msgstr "Provider"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Installed GSM device"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Installed CDMA device"
-
-#~ msgid "Any device"
-#~ msgstr "Any device"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "New Mobile Broadband Connection"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "mobile (3G) network."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "You will need the following information:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Your broadband provider's name"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Your broadband billing plan name"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(in some cases) Your broadband billing plan APN (Access Point Name)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Create a connection for _this mobile broadband device:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Set up a Mobile Broadband Connection"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Country or region"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Choose your Provider's Country or Region"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Select your provider from a _list:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "I can't find my provider and I wish to enter it _manually:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "My provider uses CDMA technology (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Choose your Provider"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Select your plan:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Selected plan _APN (Access Point Name):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan's "
-#~ "APN."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Choose your Billing Plan"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Your Device:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Your Provider:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Your Plan:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected.  If the connection fails or you cannot access "
-#~ "network resources, double-check your settings.  To modify your mobile "
-#~ "broadband connection settings, choose \"Network Connections\" from the "
-#~ "System >> Preferences menu."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Confirm Mobile Broadband Settings"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(none)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "C_A certificate:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Unknown"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "Select A File"
-
-#, fuzzy
-#~ msgid "Select from file…"
-#~ msgstr "Select A File"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Choose CA Certificate"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_User certificate:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Error editing connection"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Unlock"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "As_k for this password every time"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "A password is required to connect to '%s'."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Sho_w passwords"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Password:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Password:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Password:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Disconnect"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "None"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynamic WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "C_reate"
-
-#
-#, 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'."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wi-Fi Network Authentication Required"
-
-#
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Authentication required by Wi-Fi network"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Create New Wi-Fi Network"
-
-#
-#~ msgid "New Wi-Fi network"
-#~ msgstr "New Wi-Fi network"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Connect to Hidden Wi-Fi Network"
-
-#
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Hidden Wi-Fi network"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-
-#
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wi-Fi _security:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Co_nnection:"
-
-#
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-Fi _adapter:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "I can't find my provider and I wish to enter it _manually:"
-
-#~ msgid "Provider:"
-#~ msgstr "Provider:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Country or Region List:"
-
-#~ msgid "Country or region"
-#~ msgstr "Country or region"
-
-#~ msgid "Wired"
-#~ msgstr "Wired"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wi-Fi _security:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Network name:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Co_nnection:"
-
-#
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-Fi _adapter:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (default)"
 
diff --git a/po/eo.po b/po/eo.po
index e99e7c20..2ca4d7f5 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2018-01-06 01:51+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan schmidt googlemail com>\n"
 "Language-Team: Esperanto <gnome-eo-list gnome org>\n"
@@ -26,6 +26,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Reto"
 
@@ -215,15 +216,19 @@ msgstr "802.1X-aŭtentigo"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "K_onekti"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "Ret_nomo:"
@@ -568,7 +573,7 @@ msgstr "Poŝtelefona larĝkapacita reto (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Poŝtelefona larĝkapacita reto"
 
@@ -692,7 +697,9 @@ msgstr "DSL-aŭtentigo"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -799,6 +806,7 @@ msgid "Error displaying connection information:"
 msgstr "Eraro montrante konekt-informojn:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -949,7 +957,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Pasvorto:"
@@ -974,7 +982,8 @@ msgstr "VPN-rubando"
 msgid "Base Connection"
 msgstr "Baza konekto"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Nekonata"
 
@@ -1728,6 +1737,7 @@ msgid "_Service"
 msgstr "_Servo:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2386,6 +2396,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Permesi _retmigradon se la hejma reto ne disponeblas"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Montri pasvortojn"
 
@@ -2780,13 +2791,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Eterreto"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3109,12 +3121,12 @@ msgstr ""
 "kelkaj metodoj."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3124,22 +3136,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3432,6 +3447,7 @@ msgid "Select a connection to delete"
 msgstr "Elektu konekton por forigi"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nomo"
 
@@ -3654,6 +3670,8 @@ msgstr "Drata konekto %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Defaŭlte"
 
@@ -3883,35 +3901,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Mia provizanto uzas C_DMA-bazitan teĥnologion (ekz. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4078,10 +4096,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Drata konekto %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bita ŝlosilo (Deksesuma aŭ ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "128-bita WEP-pasfrazo"
 
@@ -4090,14 +4110,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamika WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA kaj WPA2 por personoj"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA kaj WPA2 por enterprenoj"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA kaj WPA2 por personoj"
@@ -4176,6 +4199,480 @@ msgstr "Konektinformoj"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Atestilo ne estas agordita"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Elektu atestilon de %s"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "%s privata ŝ_losilo:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "%s _pasvorto por ŝlosilo:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Elektu atestilon de %s"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "%s _atestilo:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Mia lando ne estas listigita"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Nelistigite"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Mia plano estas nelistigite…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Provizanto"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Instalis GSM-aparaton"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Instalis CDMA-aparaton"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Iu aparato"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nova poŝtelefona larĝkapacita konekto"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Ĉi tiu asistanto helpas vin facile agordi poŝtelefonan larĝkapacitan "
+"konekton al portebla (3G) reto."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Vi bezonos la sekvajn informojn:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "La nomon de via larĝkapacita provizanto"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "La nomon de la fakturplano de via larĝkapacita provizanto"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(en kelkaj kazoj) la APN-n (Access Point Name, nomo de retkaptejo) de la "
+"fakturplano"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Krei konekton por _tiu ĉi larĝkapacita aparato:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Agordi poŝtelefonan larĝkapacitan konekton"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Lando aŭ regiono"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Elekti la landon aŭ regionon de via provizanto"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Elekti vian provizanton el _listo:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Mi ne povas trovi mian provizanton kaj mi deziras enigi ĝin _mane:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Mia provizanto uzas GSM-teĥnologion (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Mia provizanto uzas CDMA-teĥnologion (1XRRT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Elekti vian provizanton"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Elekti vian planon:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Elekti planon - _APN (Access Point Name, nomo de retkaptejo):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Atenton: Elekto de neĝusta plano povas kaŭzi fakturajn problemojn kun via "
+"larĝkapacita konto, aŭ eble preventas konekteblon.\n"
+"\n"
+"Se vi ne certas kiun planon elekti, bonvolu demandi vian provizanton por la "
+"APN de via plano."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Elekti vian fakturo-planon"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Via poŝtelefona larĝkapacita konekto estas agordita per la sekvaj agordoj:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Via aparato:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Via provizanto:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Via faktura reĝimo:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Konekto estos nun farata al via poŝtelefona larĝkapacita provizanto uzante "
+"la de vi elektitajn agordojn. Se la konekto malsukcesas aŭ vi ne povas "
+"atingi retajn fontojn, rekontrolu viajn agordojn. Por modifi viajn agordojn "
+"por poŝtelefona larĝkapacita konekto, elektu “Retkonektoj”-n el la menuo "
+"Sistemo → Agordoj."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Konfirmi agordojn por poŝtelefona larĝkapacita reto"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(Neniu)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Atestilo in %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Nekonate)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Elektu atestilon de %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "%s permesila _pasvorto:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Eraro dum malfermo de seanco: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Malŝlosi"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Ĉiam postuli tiun pasvorton"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "La pasvorto ne estas bezonata"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "M_ontri pasvortojn"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Duaranga pasvorto:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Duaranga pasvorto:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Pasvorto:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Malkonekti"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Neniu"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dinamika WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "K_rei"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Pasvortoj aŭ ĉifroŝlosiloj estas postulataj por atingi la sendratan reton "
+"“%s”."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Aŭtentigo por sendrata reto estas postulata"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Sendrata reto postulas aŭtentigon"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Krei novan sendratan reton"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nova sendrata reto"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Entajpu nomon por la sendrata reto kiun vi volas krei."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Konekti al kaŝita sendrata reto"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Kaŝita sendrata reto"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Entajpu la nomon kaj sekurecdetalojn de la kaŝita sendrata reto al kiu vi "
+"volas konekti."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Sendrata _sekureco:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Ko_nekto:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Sendrata _adaptilo:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Mi ne povas trovi mian provizanton kaj mi deziras enigi ĝin _mane:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Provizanto:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Landa aŭ regiona listo:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Lando aŭ regiono"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Drata"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Sendrata _sekureco:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Ret_nomo:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Ko_nekto:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Sendrata _adaptilo:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Uzo:"
@@ -4326,25 +4823,25 @@ msgstr "neniu CA-atestilo estas elektita"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Elekti PAC-dosieron"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-dosieroj (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
@@ -4383,16 +4880,16 @@ msgstr "_Ena aŭtentigo:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permesi aŭtomatan PAC-pro_vizadon"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4428,15 +4925,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4450,23 +4947,23 @@ msgstr "128-bita WEP-pasfrazo"
 msgid "Sh_ow passphrase"
 msgstr "M_ontri pasvortojn"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "neniu uzanto-atestilo estas elektita"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4475,7 +4972,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_dento:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (sen EAP)"
 
@@ -4514,15 +5011,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Aŭ_tentigo:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "%s _pasvorto por ŝlosilo:"
@@ -4532,33 +5029,33 @@ msgstr "%s _pasvorto por ŝlosilo:"
 msgid "_Type"
 msgstr "_Tipo:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4588,310 +5085,17 @@ msgstr "_Montri ŝlosilon"
 msgid "WEP inde_x"
 msgstr "WEP-inde_kso:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#~ msgid "No certificate set"
-#~ msgstr "Atestilo ne estas agordita"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Elektu atestilon de %s"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "%s privata ŝ_losilo:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "%s _pasvorto por ŝlosilo:"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Elektu atestilon de %s"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s _atestilo:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Mia lando ne estas listigita"
-
-#~ msgid "Unlisted"
-#~ msgstr "Nelistigite"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Mia plano estas nelistigite…"
-
-#~ msgid "Provider"
-#~ msgstr "Provizanto"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Instalis GSM-aparaton"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Instalis CDMA-aparaton"
-
-#~ msgid "Any device"
-#~ msgstr "Iu aparato"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nova poŝtelefona larĝkapacita konekto"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Ĉi tiu asistanto helpas vin facile agordi poŝtelefonan larĝkapacitan "
-#~ "konekton al portebla (3G) reto."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Vi bezonos la sekvajn informojn:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "La nomon de via larĝkapacita provizanto"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "La nomon de la fakturplano de via larĝkapacita provizanto"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(en kelkaj kazoj) la APN-n (Access Point Name, nomo de retkaptejo) de la "
-#~ "fakturplano"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Krei konekton por _tiu ĉi larĝkapacita aparato:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Agordi poŝtelefonan larĝkapacitan konekton"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Lando aŭ regiono"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Elekti la landon aŭ regionon de via provizanto"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Elekti vian provizanton el _listo:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Mi ne povas trovi mian provizanton kaj mi deziras enigi ĝin _mane:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Mia provizanto uzas GSM-teĥnologion (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Mia provizanto uzas CDMA-teĥnologion (1XRRT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Elekti vian provizanton"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Elekti vian planon:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Elekti planon - _APN (Access Point Name, nomo de retkaptejo):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Atenton: Elekto de neĝusta plano povas kaŭzi fakturajn problemojn kun via "
-#~ "larĝkapacita konto, aŭ eble preventas konekteblon.\n"
-#~ "\n"
-#~ "Se vi ne certas kiun planon elekti, bonvolu demandi vian provizanton por "
-#~ "la APN de via plano."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Elekti vian fakturo-planon"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Via poŝtelefona larĝkapacita konekto estas agordita per la sekvaj agordoj:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Via aparato:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Via provizanto:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Via faktura reĝimo:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Konekto estos nun farata al via poŝtelefona larĝkapacita provizanto "
-#~ "uzante la de vi elektitajn agordojn. Se la konekto malsukcesas aŭ vi ne "
-#~ "povas atingi retajn fontojn, rekontrolu viajn agordojn. Por modifi viajn "
-#~ "agordojn por poŝtelefona larĝkapacita konekto, elektu “Retkonektoj”-n el "
-#~ "la menuo Sistemo → Agordoj."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Konfirmi agordojn por poŝtelefona larĝkapacita reto"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(Neniu)"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Atestilo in %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Nekonate)"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Elektu atestilon de %s"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "%s permesila _pasvorto:"
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Eraro dum malfermo de seanco: "
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Malŝlosi"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Ĉiam postuli tiun pasvorton"
-
-#~ msgid "The password is not required"
-#~ msgstr "La pasvorto ne estas bezonata"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "M_ontri pasvortojn"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Duaranga pasvorto:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Duaranga pasvorto:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Pasvorto:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Malkonekti"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Neniu"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dinamika WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "K_rei"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Pasvortoj aŭ ĉifroŝlosiloj estas postulataj por atingi la sendratan reton "
-#~ "“%s”."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Aŭtentigo por sendrata reto estas postulata"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Sendrata reto postulas aŭtentigon"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Krei novan sendratan reton"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nova sendrata reto"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Entajpu nomon por la sendrata reto kiun vi volas krei."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Konekti al kaŝita sendrata reto"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Kaŝita sendrata reto"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Entajpu la nomon kaj sekurecdetalojn de la kaŝita sendrata reto al kiu vi "
-#~ "volas konekti."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Sendrata _sekureco:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Ko_nekto:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Sendrata _adaptilo:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Mi ne povas trovi mian provizanton kaj mi deziras enigi ĝin _mane:"
-
-#~ msgid "Provider:"
-#~ msgstr "Provizanto:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Landa aŭ regiona listo:"
-
-#~ msgid "Country or region"
-#~ msgstr "Lando aŭ regiono"
-
-#~ msgid "Wired"
-#~ msgstr "Drata"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Sendrata _sekureco:"
-
-#~ msgid "_Network name:"
-#~ msgstr "Ret_nomo:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Ko_nekto:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Sendrata _adaptilo:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (defaŭlte)"
 
diff --git a/po/es.po b/po/es.po
index 5a080834..aa72ed2d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: networkmanager-applet.master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2019-09-09 09:18+0200\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: Spanish - Spain <gnome-es-list gnome org>\n"
@@ -28,6 +28,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Red"
 
@@ -232,15 +233,19 @@ msgstr "Autenticación 802.1x"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Nombre de red"
 
@@ -585,7 +590,7 @@ msgstr "Banda ancha móvil (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Banda ancha móvil"
 
@@ -708,7 +713,9 @@ msgstr "Autenticación DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_Aceptar"
 
@@ -814,6 +821,7 @@ msgid "Error displaying connection information:"
 msgstr "Ha ocurrido un error al mostrar información de la conexión:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -959,7 +967,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Punto de acceso"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "Contraseña"
 
@@ -983,7 +991,8 @@ msgstr "Mensaje VPN"
 msgid "Base Connection"
 msgstr "Conexión base"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Desconocida"
 
@@ -1745,6 +1754,7 @@ msgid "_Service"
 msgstr "_Servicio"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2400,6 +2410,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Permitir «_roaming» si la red doméstica no está disponible"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Mostrar las contraseñas"
 
@@ -2813,13 +2824,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Cableada"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3143,12 +3155,12 @@ msgstr ""
 "soporte para algunos métodos."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Inalámbrica"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3158,22 +3170,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bond"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Unir"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Puente"
 
@@ -3461,6 +3476,7 @@ msgid "Select a connection to delete"
 msgstr "Seleccionar la conexión que eliminar"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nombre"
 
@@ -3671,6 +3687,8 @@ msgstr "Conexión cableada %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -3898,35 +3916,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Mi proveedor usa tecnología basada en C_DMA (ej. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4084,10 +4102,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Conexión inalámbrica %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clave WEP 40/128-bit (Hexadecimal o ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase de paso WEP de 128 bits"
 
@@ -4096,14 +4116,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinámica (802.1x)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA y WPA2 personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA y WPA2 enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA y WPA2 personal"
@@ -4179,6 +4202,463 @@ msgstr "Información de la conexión"
 msgid "_Close"
 msgstr "_Cerrar"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+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/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "No hay ningún certificado configurado"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "No hay clave establecida"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Elija una clave para el certificado %s"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "clave privada %s"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "contraseña de clave %s"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Elija un certificado %s"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "_certificado %s"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Mi país no está en la lista"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Sin listar"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Mi plan no está en la lista…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Proveedor"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Dispositivo GSM instalado"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Dispositivo CDMA instalado"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Cualquier dispositivo"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Conexión de banda ancha móvil nueva"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Este asistente le ayuda a configurar una conexión de banda ancha móvil con "
+"una red móvil (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Necesitará la siguiente información:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "El nombre de su proveedor de banda ancha"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "El nombre de su plan de precios"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(En algunos casos) su plan de precios APN (nombre del punto de acceso)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Crear una conexión para es_te dispositivo de banda ancha móvil:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Configurar una conexión de banda ancha móvil"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "País o región:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Elegir el país o la región de su proveedor"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Seleccionar su proveedor de la _lista:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"No puedo encontrar mi proveedor y quiero configurar la conexión _manualmente:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Mi proveedor usa tecnología GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Mi proveedor usa tecnología CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Elegir su proveedor"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Seleccionar su plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Plan _APN (nombre del punto de acceso) seleccionado:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Advertencia: seleccionar un plan incorrecto puede resultar en problemas de "
+"facturas para su cuenta de banda ancha o impedir la conectividad.\n"
+"\n"
+"Si no está seguro de su plan consulte a su proveedor para su plan APN."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Elegir su plan de precios"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Su conexión de banda ancha móvil está configurada con los siguientes ajustes:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Su dispositivo:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Su proveedor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Su plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Ahora se creará una conexión con su proveedor de banda ancha móvil usando "
+"los ajustes seleccionados. Si la conexión falla o no puede acceder a los "
+"recursos de la red, compruebe dos veces sus ajustes. Para modificar sus "
+"ajustes de conexión de la banda ancha móvil, elija \"«Conexiones de red» "
+"desde el menú Sistema → Preferencias."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmar los ajustes de la banda ancha móvil"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(ninguno)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Clave en %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificado en %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Desconocido)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Seleccionar"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Seleccionar desde un archivo…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Elija un certificado %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_contraseña del certificado %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Error al iniciar sesión."
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Error al abrir una sesión: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "Desbloq_uear testigo"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Emitido por"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Introduzca el PIN de %s"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Iniciar sesión"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_recordar PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Guardar la contraseña sólo para este usuario"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Guardar la contraseña para todos los usuarios"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Preguntar esta contraseña cada vez"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "No se necesita la contraseña"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "M_ostrar las contraseñas"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "Contraseña _ternaria:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "Contraseña _secundaria:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "Contrase_ña:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Pulse para conectar"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Nueva…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ninguna"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinámica (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_rear"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Se necesitan contraseñas o claves de cifrado para acceder a la red "
+"inalámbrica «%s»."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Se requiere autenticación para la red inalámbrica"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "La red inalámbrica necesita autenticación"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Crear una red inalámbrica"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Red inalámbrica nueva"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Introduzca un nombre para la red inalámbrica que quiere crear."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Conectar con una red inalámbrica oculta"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Red inalámbrica oculta"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Introduzca el nombre y los detalles de seguridad de la red inalámbrica "
+"oculta a la que quiere conectarse."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "_Seguridad inalámbrica"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "Co_nexión"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptador inalámbrico"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "No puedo encontrar mi proveedor y querría introducirlo _manualmente:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Proveedor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Lista de países o regiones:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "País o región"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Cableado"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Falta la contraseña o la conexión no es válida. En el último caso, debe "
+"editar primero la conexión con nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Seguridad inalámbrica:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nombre de red:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nexión:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptador inalámbrico:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Uso:"
@@ -4327,25 +4807,25 @@ msgstr "No se seleccionado ningún certificado CA"
 msgid "selected CA certificate file does not exist"
 msgstr "el archivo de certificado CA seleccionado no existe"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "falta el archivo PAC de EAP-LEAP"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Elegir un archivo PAC"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Archivos PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Todos los archivos"
 
@@ -4381,16 +4861,16 @@ msgstr "Autenticación i_nterna"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir la provisión PAC _automática"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "falta el nombre de usuario de EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "falta la contraseña de EAP-LEAP"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4425,15 +4905,15 @@ msgstr "Sufijo del nombre del servidor de certificados."
 msgid "_Domain"
 msgstr "_Dominio"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "falta el usuario EAP"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "falta la contraseña EAP"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "falta la frase de contraseña de la clave privada del cliente EAP"
 
@@ -4445,23 +4925,23 @@ msgstr "Frase de paso de la clave p_rivada"
 msgid "Sh_ow passphrase"
 msgstr "M_ostrar frase de paso"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "falta la identidad EAP"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "No se seleccionado ningún certificado de usuario"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "el certificado de usuario seleccionado no existe"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "ninguna clave seleccionada"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "el archivo de clave seleccionado no existe"
 
@@ -4469,7 +4949,7 @@ msgstr "el archivo de clave seleccionado no existe"
 msgid "I_dentity"
 msgstr "I_dentidad"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (no EAP)"
 
@@ -4507,15 +4987,15 @@ msgstr "Configurada externamente"
 msgid "Au_thentication"
 msgstr "_Autenticación"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "falta el nombre de usuario leap"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "falta la contraseña leap"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "falta la contraseña EAP"
@@ -4524,18 +5004,18 @@ msgstr "falta la contraseña EAP"
 msgid "_Type"
 msgstr "_Tipo"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "falta la clave wep"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4543,7 +5023,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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4552,11 +5032,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 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"
@@ -4585,7 +5065,7 @@ msgstr "_Mostrar la clave"
 msgid "WEP inde_x"
 msgstr "Ín_dice WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4594,358 +5074,12 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
 
-#~ 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>"
-
-#~ msgid "No certificate set"
-#~ msgstr "No hay ningún certificado configurado"
-
-#~ msgid "No key set"
-#~ msgstr "No hay clave establecida"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Elija una clave para el certificado %s"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "clave privada %s"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "contraseña de clave %s"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Elija un certificado %s"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_certificado %s"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Mi país no está en la lista"
-
-#~ msgid "Unlisted"
-#~ msgstr "Sin listar"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Mi plan no está en la lista…"
-
-#~ msgid "Provider"
-#~ msgstr "Proveedor"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Dispositivo GSM instalado"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Dispositivo CDMA instalado"
-
-#~ msgid "Any device"
-#~ msgstr "Cualquier dispositivo"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Conexión de banda ancha móvil nueva"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Este asistente le ayuda a configurar una conexión de banda ancha móvil "
-#~ "con una red móvil (3G)."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Necesitará la siguiente información:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "El nombre de su proveedor de banda ancha"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "El nombre de su plan de precios"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(En algunos casos) su plan de precios APN (nombre del punto de acceso)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Crear una conexión para es_te dispositivo de banda ancha móvil:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Configurar una conexión de banda ancha móvil"
-
-#~ msgid "Country or region:"
-#~ msgstr "País o región:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Elegir el país o la región de su proveedor"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Seleccionar su proveedor de la _lista:"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "No puedo encontrar mi proveedor y quiero configurar la conexión "
-#~ "_manualmente:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Mi proveedor usa tecnología GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Mi proveedor usa tecnología CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Elegir su proveedor"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Seleccionar su plan:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Plan _APN (nombre del punto de acceso) seleccionado:"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Advertencia: seleccionar un plan incorrecto puede resultar en problemas "
-#~ "de facturas para su cuenta de banda ancha o impedir la conectividad.\n"
-#~ "\n"
-#~ "Si no está seguro de su plan consulte a su proveedor para su plan APN."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Elegir su plan de precios"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Su conexión de banda ancha móvil está configurada con los siguientes "
-#~ "ajustes:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Su dispositivo:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Su proveedor:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Su plan:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Ahora se creará una conexión con su proveedor de banda ancha móvil usando "
-#~ "los ajustes seleccionados. Si la conexión falla o no puede acceder a los "
-#~ "recursos de la red, compruebe dos veces sus ajustes. Para modificar sus "
-#~ "ajustes de conexión de la banda ancha móvil, elija \"«Conexiones de red» "
-#~ "desde el menú Sistema → Preferencias."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Confirmar los ajustes de la banda ancha móvil"
-
-#~ msgid "(None)"
-#~ msgstr "(ninguno)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Clave en %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certificado en %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Desconocido)"
-
-#~ msgid "Select"
-#~ msgstr "Seleccionar"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid "Select from file…"
-#~ msgstr "Seleccionar desde un archivo…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Elija un certificado %s"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_contraseña del certificado %s"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Error al iniciar sesión."
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Error al abrir una sesión: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "Desbloq_uear testigo"
-
-#~ msgid "Issued By"
-#~ msgstr "Emitido por"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Introduzca el PIN de %s"
-
-#~ msgid "_Login"
-#~ msgstr "_Iniciar sesión"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_recordar PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Guardar la contraseña sólo para este usuario"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Guardar la contraseña para todos los usuarios"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Preguntar esta contraseña cada vez"
-
-#~ msgid "The password is not required"
-#~ msgstr "No se necesita la contraseña"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "M_ostrar las contraseñas"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Contraseña _ternaria:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "Contraseña _secundaria:"
-
-#~ msgid "_Password:"
-#~ msgstr "Contrase_ña:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Pulse para conectar"
-
-#~ msgid "New…"
-#~ msgstr "Nueva…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Ninguna"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP dinámica (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "C_rear"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Se necesitan contraseñas o claves de cifrado para acceder a la red "
-#~ "inalámbrica «%s»."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Se requiere autenticación para la red inalámbrica"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "La red inalámbrica necesita autenticación"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Crear una red inalámbrica"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Red inalámbrica nueva"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Conectar con una red inalámbrica oculta"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Red inalámbrica oculta"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Introduzca el nombre y los detalles de seguridad de la red inalámbrica "
-#~ "oculta a la que quiere conectarse."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Seguridad inalámbrica"
-
-#~ msgid "C_onnection"
-#~ msgstr "Co_nexión"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Adaptador inalámbrico"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "No puedo encontrar mi proveedor y querría introducirlo _manualmente:"
-
-#~ msgid "Provider:"
-#~ msgstr "Proveedor:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Lista de países o regiones:"
-
-#~ msgid "Country or region"
-#~ msgstr "País o región"
-
-#~ msgid "Wired"
-#~ msgstr "Cableado"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Falta la contraseña o la conexión no es válida. En el último caso, debe "
-#~ "editar primero la conexión con nm-connection-editor"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Seguridad inalámbrica:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nombre de red:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Co_nexión:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Adaptador inalámbrico:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/et.po b/po/et.po
index 58f38443..3b8d0461 100644
--- a/po/et.po
+++ b/po/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: Network Manager MASTER\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2013-03-13 02:52+0300\n"
 "Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
 "Language-Team: Estonian <>\n"
@@ -27,6 +27,7 @@ msgstr ""
 "X-Poedit-Country: ESTONIAN\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Võrk"
 
@@ -214,15 +215,19 @@ msgstr "802.1X autentimine"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "Ü_hendu"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Võrgu nimi:"
@@ -574,7 +579,7 @@ msgstr "Mobiiliühendus (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobiiliühendus"
 
@@ -696,7 +701,9 @@ msgstr "DSL autentimine"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -802,6 +809,7 @@ msgid "Error displaying connection information:"
 msgstr "Viga ühenduse andmete kuvamisel:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -952,7 +960,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Parool:"
@@ -977,7 +985,8 @@ msgstr "VPN-i pealkiri (banner)"
 msgid "Base Connection"
 msgstr "Baasühendus"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Tundmatu"
 
@@ -1744,6 +1753,7 @@ msgid "_Service"
 msgstr "_Teenus:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2404,6 +2414,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "_Roaming on lubatud, kui koduvõrk pole saadaval"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Näita paroole"
 
@@ -2807,13 +2818,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3138,12 +3150,12 @@ msgstr ""
 "ühendus siiski nurjub, proovi mõne viisi keelamist."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3153,22 +3165,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Liitühendus (bond)"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Sild"
 
@@ -3468,6 +3483,7 @@ msgid "Select a connection to delete"
 msgstr "DSL-ühendus %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nimi"
 
@@ -3692,6 +3708,8 @@ msgstr "Ethernet võrgu ühendus %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Vaikimisi"
 
@@ -3922,35 +3940,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Minu teenusepakkuja kasutab C_DMA-l põhinevat tehnoloogiat (nt 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4116,10 +4134,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi ühendus %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitine võti (Hex või ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bitine parool"
 
@@ -4128,14 +4148,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dünaamiline WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 isiklik"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ettevõtte"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 isiklik"
@@ -4213,6 +4236,480 @@ msgstr "Ühenduse andmed"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Vali sertifitseerimiskeskuse sertifikaat"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Privaat_võti:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_Privaatvõtme parool:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Vali sertifitseerimiskeskuse sertifikaat"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_Kasutaja sertifikaart:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Minu riik pole loetelus"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Pole loetelus"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Minu makseplaan pole loetelus..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Teenusepakkuja"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Paigaldatud GSM-seade"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Paigaldatud CDMA-seade"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Iga seade"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Uus mobiiliühendus"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr "See abiline teeb mobiilivõrgu (3G) ühenduse seadistamise lihtsaks."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Vaja on alljärgnevat teavet:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Sinu teenusepakkuja nimi"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Sinu ühenduse makseplaani nimi"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(Mõnel juhul) sinu ühenduse makseplaani APN (Access Point Name, "
+"pöörduspunkti nimi)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Ühenduse loomine _selle mobiiliühenduse seadmega:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Mobiiliühenduse seadistamine"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Riik või piirkond"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Teenusepakkuja asukohariigi või -regiooni valimine"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Vali oma teenusepakkuja _loetelust:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Ma ei leidnud oma teenusepakkujat, ma tahan selle sisestada _käsitsi:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+"Minu teenusepakkuja kasutab _GSM-tehnoloogiat (GPRS, EDGE, UMTS, HSDPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Minu teenusepakkuja kasutab _CDMA-tehnoloogiat (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Vali teenusepakkuja"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Vali oma plaan:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Valitud plaani _APN (Access Point Name, pöörduspunkti nimi):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Hoiatus: vale plaani valimine võib põhjustada makseprobleeme või tõkestada "
+"ühenduse loomist.\n"
+"\n"
+"Kui sa pole kindel, küsi oma teenusepakkujalt õige plaani APN (Access Point "
+"Name, pöörduspunkti nimi)."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Makseplaani valimine"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Sinu mobiiliühendus on seadistatud järgmiselt:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Sinu seade:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Sinu teenusepakkuja:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Sinu makseplaan:"
+
+# Ubuntul on siin "Arvuti > Eelistused"
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Nüüd luuakse ühendus sinu teenusepakkuja võrguga kasutades sinu valitud "
+"sätteid.  Kui ühendus nurjub või sa ei pääse võrgule ligi, kontrolli "
+"sätteid.  Mobiiliühenduse muutmiseks vali \"Võrguühendused\" menüüst Süsteem "
+"> Eelistused."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Mobiiliühenduse sätete kinnitamine"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(puudub)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Sertifitseerimis_keskuse sert:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Tundmatu"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Vali sertifitseerimiskeskuse sertifikaat"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Kasutaja sertifikaart:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Viga ühenduse muutmisel"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Võta lukust lahti"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "_Seda parooli küsitakse iga kord"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Võrku '%s' ühendumiseks on vaja parooli."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "_Näita paroole"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Parool:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Parool:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Parool:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Katkesta ühendus"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Puudub"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dünaamiline WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Loo"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "Ligipääsuks Wi-Fi võrgule '%s' on vaja parooli või krüpteerimisvõtit."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi võrk nõuab salasõna"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi võrgu jaoks on vaja salasõna"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Uue Wi-Fi võrgu loomine"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Uus Wi-Fi võrk"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Sisesta loodava Wi-Fi võrgu nimi."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Varjatud Wi-Fi võrku ühendumine"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Varjatud Wi-Fi võrk"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "Sisesta varjatud Wi-Fi võrgu nimi ja parool."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi _turvalisus:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Ü_hendus:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi _adapter:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Ma ei leidnud oma teenusepakkujat, ma tahan selle sisestada _käsitsi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Teenusepakkuja:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Riikide ja piirkondade nimekiri:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Riik või piirkond"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Juhtmega"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC võrk"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi _turvalisus:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Võrgu nimi:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Ü_hendus:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi _adapter:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Kasutus:"
@@ -4365,26 +4862,26 @@ msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC-faili lubamine..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC failid (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Kõik failid"
 
@@ -4423,16 +4920,16 @@ msgstr "_Sise-autentimine:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Automaatsed _PAC-klauslid on lubatud"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4469,15 +4966,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4491,24 +4988,24 @@ msgstr "WEP 128-bitine parool"
 msgid "Sh_ow passphrase"
 msgstr "_Näita paroole"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4517,7 +5014,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_dentiteet:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4557,15 +5054,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Autentimine:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_Privaatvõtme parool:"
@@ -4575,33 +5072,33 @@ msgstr "_Privaatvõtme parool:"
 msgid "_Type"
 msgstr "_Liik:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4631,330 +5128,17 @@ msgstr "_Näita võtit"
 msgid "WEP inde_x"
 msgstr "WEP inde_ks:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Vali sertifitseerimiskeskuse sertifikaat"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Privaat_võti:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Privaatvõtme parool:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Vali sertifitseerimiskeskuse sertifikaat"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Kasutaja sertifikaart:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Minu riik pole loetelus"
-
-#~ msgid "Unlisted"
-#~ msgstr "Pole loetelus"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Minu makseplaan pole loetelus..."
-
-#~ msgid "Provider"
-#~ msgstr "Teenusepakkuja"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Paigaldatud GSM-seade"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Paigaldatud CDMA-seade"
-
-#~ msgid "Any device"
-#~ msgstr "Iga seade"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Uus mobiiliühendus"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr "See abiline teeb mobiilivõrgu (3G) ühenduse seadistamise lihtsaks."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Vaja on alljärgnevat teavet:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Sinu teenusepakkuja nimi"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Sinu ühenduse makseplaani nimi"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(Mõnel juhul) sinu ühenduse makseplaani APN (Access Point Name, "
-#~ "pöörduspunkti nimi)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Ühenduse loomine _selle mobiiliühenduse seadmega:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Mobiiliühenduse seadistamine"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Riik või piirkond"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Teenusepakkuja asukohariigi või -regiooni valimine"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Vali oma teenusepakkuja _loetelust:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "Ma ei leidnud oma teenusepakkujat, ma tahan selle sisestada _käsitsi:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr ""
-#~ "Minu teenusepakkuja kasutab _GSM-tehnoloogiat (GPRS, EDGE, UMTS, HSDPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Minu teenusepakkuja kasutab _CDMA-tehnoloogiat (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Vali teenusepakkuja"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Vali oma plaan:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Valitud plaani _APN (Access Point Name, pöörduspunkti nimi):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Hoiatus: vale plaani valimine võib põhjustada makseprobleeme või "
-#~ "tõkestada ühenduse loomist.\n"
-#~ "\n"
-#~ "Kui sa pole kindel, küsi oma teenusepakkujalt õige plaani APN (Access "
-#~ "Point Name, pöörduspunkti nimi)."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Makseplaani valimine"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "Sinu mobiiliühendus on seadistatud järgmiselt:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Sinu seade:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Sinu teenusepakkuja:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Sinu makseplaan:"
-
-# Ubuntul on siin "Arvuti > Eelistused"
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Nüüd luuakse ühendus sinu teenusepakkuja võrguga kasutades sinu valitud "
-#~ "sätteid.  Kui ühendus nurjub või sa ei pääse võrgule ligi, kontrolli "
-#~ "sätteid.  Mobiiliühenduse muutmiseks vali \"Võrguühendused\" menüüst "
-#~ "Süsteem > Eelistused."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Mobiiliühenduse sätete kinnitamine"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(puudub)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Sertifitseerimis_keskuse sert:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Tundmatu"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Vali sertifitseerimiskeskuse sertifikaat"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Kasutaja sertifikaart:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Viga ühenduse muutmisel"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Võta lukust lahti"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "_Seda parooli küsitakse iga kord"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Võrku '%s' ühendumiseks on vaja parooli."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "_Näita paroole"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Parool:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Parool:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Parool:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Katkesta ühendus"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Puudub"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dünaamiline WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Loo"
-
-#, 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."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wi-Fi võrk nõuab salasõna"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Wi-Fi võrgu jaoks on vaja salasõna"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Uue Wi-Fi võrgu loomine"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Uus Wi-Fi võrk"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Sisesta loodava Wi-Fi võrgu nimi."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Varjatud Wi-Fi võrku ühendumine"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Varjatud Wi-Fi võrk"
-
-#~ 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."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wi-Fi _turvalisus:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Ü_hendus:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-Fi _adapter:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "Ma ei leidnud oma teenusepakkujat, ma tahan selle sisestada _käsitsi:"
-
-#~ msgid "Provider:"
-#~ msgstr "Teenusepakkuja:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Riikide ja piirkondade nimekiri:"
-
-#~ msgid "Country or region"
-#~ msgstr "Riik või piirkond"
-
-#~ msgid "Wired"
-#~ msgstr "Juhtmega"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC võrk"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wi-Fi _turvalisus:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Võrgu nimi:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Ü_hendus:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-Fi _adapter:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (vaikimisi)"
 
diff --git a/po/eu.po b/po/eu.po
index 6c35a003..d1d3d38b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2015-01-08 16:41+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo zundan com>\n"
 "Language-Team: Basque <librezale librezale org>\n"
@@ -21,6 +21,7 @@ msgstr ""
 "X-Generator: Lokalize 1.4\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Sarea"
 
@@ -219,15 +220,19 @@ msgstr "802.1X autentifikazioa"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Konektatu"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Sarearen izena:"
@@ -582,7 +587,7 @@ msgstr "Bandazabal mugikorra (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Bandazabal mugikorra"
 
@@ -708,7 +713,9 @@ msgstr "DSL autentifikazioa"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -814,6 +821,7 @@ msgid "Error displaying connection information:"
 msgstr "Errorea konexioaren informazioa bistaratzean:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -964,7 +972,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Pasahitza:"
@@ -989,7 +997,8 @@ msgstr "VPNren iragarkia"
 msgid "Base Connection"
 msgstr "Oinarrizko konexioa"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Ezezaguna"
 
@@ -1770,6 +1779,7 @@ msgid "_Service"
 msgstr "_Zerbitzua:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2430,6 +2440,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Baimendu '_ibiltaritza' etxeko sarea ez badago erabilgarri"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Erakutsi _pasahitzak"
 
@@ -2834,13 +2845,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3165,12 +3177,12 @@ msgstr ""
 "batzuentzako euskarria desgaituz."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wifia"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3180,22 +3192,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Lotu"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Taldea"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Zubia"
 
@@ -3497,6 +3512,7 @@ msgid "Select a connection to delete"
 msgstr "%d talde-konexioa"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Izena"
 
@@ -3720,6 +3736,8 @@ msgstr "Etherneten %d konexio"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Lehenetsia"
 
@@ -3953,35 +3971,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Hornitzaileak C_DMAn oinarritutako teknologia darabil (adib. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4146,10 +4164,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wifien %d konexio"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 bit-eko gakoa (hamaseitarra edo ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bit-eko pasaesaldia"
 
@@ -4158,14 +4178,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinamikoa (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA eta WPA2 pertsonala"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA eta WPA2 enpresa"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA eta WPA2 pertsonala"
@@ -4243,6 +4266,482 @@ msgstr "Konexioaren informazioa"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Ez da ZE ziurtagiririk _behar"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Aukeratu ZE ziurtagiria"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "_Gako pribatua:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_Gako pribatuaren pasahitza:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Aukeratu ZE ziurtagiria"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Erabiltzailearen _ziurtagiria:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Nire herrialdea ez dago zerrendatuta"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Zerrendatu gabea"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Nire plana ez dago zerrendatuta..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Hornitzailea"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Instalatutako GSM gailua"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Instalatutako CDMA gailua"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Edozein gailu"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Bandazabal mugikorraren konexio berria"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Morroi honek banda-zabal mugikorraren konexioa mugikorren sarera (3G) "
+"konfiguratzen lagunduko dizu."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Honako informazioa beharko duzu:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Bandazabalaren hornitzailearen izena"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Bandazabaleko prezioen planaren izena"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(zenbait kasutan) banda-zabalaren APN prezioen plana"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Sortu konexio bat banda-zabal mugikor gailu _honentzako:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Konfiguratu banda-zabal mugikorraren konexioa"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Herrialde edo eskualdea"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Aukeratu hornitzailearen herrialde edo eskualdea"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Hautatu hornitzailea _zerrendatik:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Ezin dut hornitzailea aurkitu eta _eskuz sartzea nahiko nuke:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Hornitzaileak GSM teknologia darabil (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Hornitzaileak CDMA teknologia darabil (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Aukeratu hornitzailea"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Hautatu zure plana:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Hautatu _APL (sarbidetzeko puntuaren izena) plana:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Abisua: okerreko plan bat hautatzeak zure banda-zabaleraren kontuaren "
+"fakturan arazoak eragin lezake, edo ezin konektatu izatea.\n"
+"\n"
+"Ez bazaude ziur planari buruz, galdetu ezaiozu hornitzaileari planaren "
+"APLari buruz."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Aukeratu prezioen plana"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Bandazabal mugikorraren konexioa honako ezarpenekin konfiguratu da:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Gailua:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Hornitzailea:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Plana:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Hautatutako ezarpenekin banda-zabal mugikorraren hornitzailearekin konexioa "
+"egin daiteke. Konexioak huts egiten badu, edo ezin baduzu sareko "
+"baliabideetara sarbidetu, begiratu itzazu ezarpenak. Bandazabal mugikorreko "
+"konexioaren ezarpenak aldatzeko, aukeratu Sistema >> Hobespenak menuko "
+"\"Sareko konexioak\" elementua."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Berretsi banda-zabal mugikorraren ezarpenak"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(bat ere ez)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "_ZE ziurtagiria:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Ezezaguna"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Aukeratu ZE ziurtagiria"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Erabiltzailearen _ziurtagiria:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Errorea konexioa editatzean"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Desblokeatu"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "Gorde pasahitza soilik erabiltzaile _honentzako"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "Gorde pasahitza erabiltzaile _guztientzako"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "Eskatu pasahitz hau aldiro"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Pasahitza behar da '%s'(e)ra konektatzeko."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Erakutsi _pasahitzak"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Bigarren pasahitza:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Bigarren pasahitza:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Pasahitza:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Deskonektatu"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Bat ere ez"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinamikoa (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Sortu"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Pasahitzak edo enkriptatze-gakoak behar dira '%s' wifi sarera sarbidetzeko."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wifi sarearen autentifikazioa beharrezkoa"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wifi sareak autentifikazioa eskatzen du"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Sortu wifi sare berria"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Wifi sare berria"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Sartu wifi sarearen izena sortzeko."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Konektatu ezkutuko wifi sarera"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Ezkutuko wifi sarea"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Sartu konektatzea nahi duzun ezkutuko wifi sarearen izena eta segurtasuneko "
+"xehetasunak."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Wifiaren segurtasuna:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "_Konexioa:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wifiaren _moldagailua:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Ezin dut hornitzailea aurkitu eta _eskuz sartzea nahiko nuke:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Hornitzailea:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Herrialde edo eskualdearen zerrenda:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Herrialde edo eskualdea"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Hariduna"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC maila"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "[%s] %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Wifiaren segurtasuna:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Sarearen izena:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Konexioa:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wifiaren _moldagailua:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Erabilera:"
@@ -4393,26 +4892,26 @@ msgstr "Ez da ZE ziurtagiririk _behar"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Aukeratu PAC fitxategia..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC fitxategiak (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
@@ -4451,16 +4950,16 @@ msgstr "_Barneko autentifikazioa:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Baimendu PAC automatikoa _aldi baterako"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4496,15 +4995,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4518,24 +5017,24 @@ msgstr "WEP 128 bit-eko pasaesaldia"
 msgid "Sh_ow passphrase"
 msgstr "Erakutsi _pasahitzak"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ez da ZE ziurtagiririk _behar"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4544,7 +5043,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "_Identitatea:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4584,15 +5083,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Autentifikazioa:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_Gako pribatuaren pasahitza:"
@@ -4602,33 +5101,33 @@ msgstr "_Gako pribatuaren pasahitza:"
 msgid "_Type"
 msgstr "_Mota:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4658,336 +5157,17 @@ msgstr "E_rakutsi gakoa"
 msgid "WEP inde_x"
 msgstr "WEP _indizea:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Ez da ZE ziurtagiririk _behar"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Aukeratu ZE ziurtagiria"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "_Gako pribatua:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Gako pribatuaren pasahitza:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Aukeratu ZE ziurtagiria"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Erabiltzailearen _ziurtagiria:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Nire herrialdea ez dago zerrendatuta"
-
-#~ msgid "Unlisted"
-#~ msgstr "Zerrendatu gabea"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Nire plana ez dago zerrendatuta..."
-
-#~ msgid "Provider"
-#~ msgstr "Hornitzailea"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Instalatutako GSM gailua"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Instalatutako CDMA gailua"
-
-#~ msgid "Any device"
-#~ msgstr "Edozein gailu"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Bandazabal mugikorraren konexio berria"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Morroi honek banda-zabal mugikorraren konexioa mugikorren sarera (3G) "
-#~ "konfiguratzen lagunduko dizu."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Honako informazioa beharko duzu:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Bandazabalaren hornitzailearen izena"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Bandazabaleko prezioen planaren izena"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(zenbait kasutan) banda-zabalaren APN prezioen plana"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Sortu konexio bat banda-zabal mugikor gailu _honentzako:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Konfiguratu banda-zabal mugikorraren konexioa"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Herrialde edo eskualdea"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Aukeratu hornitzailearen herrialde edo eskualdea"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Hautatu hornitzailea _zerrendatik:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Ezin dut hornitzailea aurkitu eta _eskuz sartzea nahiko nuke:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Hornitzaileak GSM teknologia darabil (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Hornitzaileak CDMA teknologia darabil (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Aukeratu hornitzailea"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Hautatu zure plana:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Hautatu _APL (sarbidetzeko puntuaren izena) plana:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Abisua: okerreko plan bat hautatzeak zure banda-zabaleraren kontuaren "
-#~ "fakturan arazoak eragin lezake, edo ezin konektatu izatea.\n"
-#~ "\n"
-#~ "Ez bazaude ziur planari buruz, galdetu ezaiozu hornitzaileari planaren "
-#~ "APLari buruz."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Aukeratu prezioen plana"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "Bandazabal mugikorraren konexioa honako ezarpenekin konfiguratu da:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Gailua:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Hornitzailea:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Plana:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Hautatutako ezarpenekin banda-zabal mugikorraren hornitzailearekin "
-#~ "konexioa egin daiteke. Konexioak huts egiten badu, edo ezin baduzu sareko "
-#~ "baliabideetara sarbidetu, begiratu itzazu ezarpenak. Bandazabal "
-#~ "mugikorreko konexioaren ezarpenak aldatzeko, aukeratu Sistema >> "
-#~ "Hobespenak menuko \"Sareko konexioak\" elementua."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Berretsi banda-zabal mugikorraren ezarpenak"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(bat ere ez)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "_ZE ziurtagiria:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Ezezaguna"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Aukeratu ZE ziurtagiria"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Erabiltzailearen _ziurtagiria:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Errorea konexioa editatzean"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Desblokeatu"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "Gorde pasahitza soilik erabiltzaile _honentzako"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "Gorde pasahitza erabiltzaile _guztientzako"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "Eskatu pasahitz hau aldiro"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Pasahitza behar da '%s'(e)ra konektatzeko."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Erakutsi _pasahitzak"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Bigarren pasahitza:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Bigarren pasahitza:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Pasahitza:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Deskonektatu"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Bat ere ez"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP dinamikoa (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Sortu"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Pasahitzak edo enkriptatze-gakoak behar dira '%s' wifi sarera "
-#~ "sarbidetzeko."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wifi sarearen autentifikazioa beharrezkoa"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Wifi sareak autentifikazioa eskatzen du"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Sortu wifi sare berria"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Wifi sare berria"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Sartu wifi sarearen izena sortzeko."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Konektatu ezkutuko wifi sarera"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Ezkutuko wifi sarea"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Sartu konektatzea nahi duzun ezkutuko wifi sarearen izena eta "
-#~ "segurtasuneko xehetasunak."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Wifiaren segurtasuna:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "_Konexioa:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wifiaren _moldagailua:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Ezin dut hornitzailea aurkitu eta _eskuz sartzea nahiko nuke:"
-
-#~ msgid "Provider:"
-#~ msgstr "Hornitzailea:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Herrialde edo eskualdearen zerrenda:"
-
-#~ msgid "Country or region"
-#~ msgstr "Herrialde edo eskualdea"
-
-#~ msgid "Wired"
-#~ msgstr "Hariduna"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC maila"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "[%s] %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Wifiaren segurtasuna:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Sarearen izena:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "_Konexioa:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wifiaren _moldagailua:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (lehenetsia)"
 
diff --git a/po/fa.po b/po/fa.po
index 3380854d..d35db6db 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2012-10-12 20:48+0330\n"
 "Last-Translator: Arash Mousavi <mousavi arash gmail com>\n"
 "Language-Team: Persian\n"
@@ -22,6 +22,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "شبکه"
 
@@ -220,15 +221,19 @@ msgstr "تصدیق هویت ۸۰۲.۱x کابلی"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_اتصال"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "نام _شبکه:"
@@ -587,7 +592,7 @@ msgstr "شبکه پهن‌باند تلفن همراه (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "پهن‌باند تلفن همراه"
 
@@ -714,7 +719,9 @@ msgstr "تصدیق هویت دی‌اس‌ال"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -825,6 +832,7 @@ msgid "Error displaying connection information:"
 msgstr "خطا در هنگام نمایش اطلاعات اتصال:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -976,7 +984,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "گذرواژه:"
@@ -1001,7 +1009,8 @@ msgstr "نشان وی‌پی‌ان"
 msgid "Base Connection"
 msgstr "ارتباط پایه"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "ناشناس"
 
@@ -1752,6 +1761,7 @@ msgid "_Service"
 msgstr "_خدمات:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2409,6 +2419,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "چنانچه شبکه خانگی موجود نبود اجازه‌ی _رومینگ بده"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_نمایش گذرواژه‌ها"
 
@@ -2805,14 +2816,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "اترنت خودکار"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3135,12 +3147,12 @@ msgstr ""
 "می‌کنند.  اگر اتصال شکست خورد، غیرفعال کردن تعدادی از روش‌ها را امتحان کنید."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3150,22 +3162,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3468,6 +3483,7 @@ msgid "Select a connection to delete"
 msgstr "اتصال سیمی %Id"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "نام"
 
@@ -3696,6 +3712,8 @@ msgstr "اتصال سیمی %Id"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "پیش‌فرض"
 
@@ -3924,35 +3942,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ارائه‌دهنده من از فناوری C_DMA-based استفاده می‌کند (i.e. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "جی‌اس‌ام"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4120,10 +4138,12 @@ msgid "Wi-Fi connection %d"
 msgstr "اتصال سیمی %Id"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "کلید وپ ۴۰/۱۲۸ بیتی (Hex یا ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "عبارت عبور وپ ۱۲۸ بیتی"
 
@@ -4132,14 +4152,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "وپ پویا (x02.1x)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 شخصی"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 شخصی"
@@ -4219,6 +4242,494 @@ msgstr "اطلاعات اتصال"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "نادیده گرفتن گواهینامه‌ی CA"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "مجوز CA انتخاب کنید"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "کلید خصوصی"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "گذرواژه کلید _خصوصی:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "مجوز CA انتخاب کنید"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "مجوز _کاربر:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "کشور من در فهرست نیست"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "فهرست نشده"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "پلان من در فهرست نیست..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "ارائه‌دهنده"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "دستگاه GSM نصب شده"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "دستگاه CDMA نصب شده"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "هر دستگاهی"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "اتصال جدید شبکه تلفن همراه پهن‌باند"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"این دستیار کمک می‌کند تا شما به راحتی یک ارتباط باند پهن تلفن همراه را به "
+"عنوان تلفن همراه (3G) راه‌اندازی کنید."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "شما به اطلاعات زیر نیاز خواهید داشت:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "نام ارائه‌دهنده شبکه پهن‌باند"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "نام پلان مالی شبکه پهن‌باند"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(در بعضی موارد) هزینه‌ی استفاده از شبکه پهن‌باند APN (نام نقطه دسترسی)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "یک اتصال برای ا_ین شبکه پهن‌باند تلفن همراه بساز:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "برپاسازی اتصال شبکه تلفن همراه پهن‌باند"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "کشور یا منطقه"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "کشور یا منطقه ارائه‌دهنده خود را انتخاب کنید"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "ارائه‌دهنده خود را از یک _فهرست انتخاب کنید:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"من نمی توانم ارائه‌دهنده خود را پیدا کنم و می خواهم به طور _دستی آن را وارد "
+"نمایم:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "ارائه‌دهنده من از فناوری GSM استفاده می‌کند (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "ارائه‌دهنده من از فناوری CDMA استفاده می‌کند. (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "ارائه‌دهنده خود را انتخاب کنید"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "پلان خود را _انتخاب کنید"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "پلان انتخاب _شده APN (نام Access Point)"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"هشدار: انتخاب پلان نادرست ممکن است در مسائل مربوط به صدور صورت حساب برای "
+"حساب پهن‌باند شما تاثیر بگذارد و یا از ارتباط جلوگیری کند.\n"
+"\n"
+"اگر شما از پلان خود مطمئن نیستید، از ارائه‌دهنده خود در مورد APN پلان خود "
+"بپرسید."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "پلان مالی خود را انتخاب کنید"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "شبکه پهن‌باند تلفن همراه شما با تنظیمات مقابل پیکربندی شده است:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "دستگاه شما:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "ارئه‌دهنده شما:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "پلان شما:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"هم‌اکنون یک اتصال به ارائه کننده پهن‌باند شما با تنظیماتی که انتخاب کرده‌اید "
+"ایجاد می‌شود. اگر ایجاد اتصال شکست خورد یا نمی‌توانید به منابع شبکه دسترسی "
+"پیدا کنید، تنظیمات خود را دوباره بررسی کنید. برای تغییر تنظیمات اتصال "
+"پهن‌باند تلفن همراه، «اتصال‌های شبکه» را از منوی سیستم >> ترجیحات انتخاب کنید."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "تایید تنظیمات شبکه پهن‌باند تلفن همراه"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(هیچکدام)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "_مجوز CA:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "ناشناس"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "مجوز CA انتخاب کنید"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "مجوز _کاربر:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "خطا در هنگام ویرایش ارتباط"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_بازکردن قفل"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "این گذرواژه هر بار پرسیده شود"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "برای اتصال با «%s» به کلمه عبور نیاز دارید."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "_نمایش گذرواژه‌ها"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_گذرواژه:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_گذرواژه:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_گذرواژه:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "ارتباط قطع شده"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "هیچکدام"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "وپ پویا (x02.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_ساخت"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"برای دسترسی به شبکه بی‌سیم «%s»، گذرواژه‌ها یا کلیدهای رمز نگاری شده نیاز است."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "شبکه بی‌سیم به تصدیق هویت نیاز دارد"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "شبکه بی‌سیم به تصدیق هویت نیاز دارد"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "ساخت یک شبکه بی‌سیم جدید"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "شبکه بی‌سیم جدید"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "نام شبکه بی‌سیمی را که می خواهید بسازید وارد کنید."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "اتصال به شبکه بی‌سیم مخفی "
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "شبکه‌های بی‌سیم مخفی"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"نام و جزئیات امنیتی شبکه مخفی که می‌خواهید به آن متصل شوید را وارد کنید."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "ا_منیت بی‌سیم:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "ا_رتباط:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "آ_داپتور بی‌سیم:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"من نمی توانم ارائه‌دهنده خود را پیدا کنم و می خواهم به طور _دستی آن را وارد "
+"نمایم:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "ارئه دهنده:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "فهرست کشور یا منطقه:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "کشور یا منطقه"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "سیمی"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "ا_منیت بی‌سیم:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "نام _شبکه:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "ا_رتباط:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "آ_داپتور بی‌سیم:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "کاربرد:"
@@ -4371,26 +4882,26 @@ msgstr "نادیده گرفتن گواهینامه‌ی CA"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "یک پرونده PAC انتخاب کنید..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "پرونده‌های PAC"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "تمام پرونده‌ها"
 
@@ -4429,16 +4940,16 @@ msgstr "تصدیق هویت _درونی:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "استفاده از تامینِ خودکار PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4475,15 +4986,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4497,24 +5008,24 @@ msgstr "عبارت عبور وپ ۱۲۸ بیتی"
 msgid "Sh_ow passphrase"
 msgstr "_نمایش گذرواژه‌ها"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "نادیده گرفتن گواهینامه‌ی CA"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4523,7 +5034,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "_هویت:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4563,15 +5074,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_تصدیق هویت:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "گذرواژه کلید _خصوصی:"
@@ -4581,33 +5092,33 @@ msgstr "گذرواژه کلید _خصوصی:"
 msgid "_Type"
 msgstr "_نوع:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4637,327 +5148,17 @@ msgstr "_نمایش کلید"
 msgid "WEP inde_x"
 msgstr "_نمایه وپ:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "نادیده گرفتن گواهینامه‌ی CA"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "مجوز CA انتخاب کنید"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "کلید خصوصی"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "گذرواژه کلید _خصوصی:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "مجوز CA انتخاب کنید"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "مجوز _کاربر:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "کشور من در فهرست نیست"
-
-#~ msgid "Unlisted"
-#~ msgstr "فهرست نشده"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "پلان من در فهرست نیست..."
-
-#~ msgid "Provider"
-#~ msgstr "ارائه‌دهنده"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "دستگاه GSM نصب شده"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "دستگاه CDMA نصب شده"
-
-#~ msgid "Any device"
-#~ msgstr "هر دستگاهی"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "اتصال جدید شبکه تلفن همراه پهن‌باند"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "این دستیار کمک می‌کند تا شما به راحتی یک ارتباط باند پهن تلفن همراه را به "
-#~ "عنوان تلفن همراه (3G) راه‌اندازی کنید."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "شما به اطلاعات زیر نیاز خواهید داشت:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "نام ارائه‌دهنده شبکه پهن‌باند"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "نام پلان مالی شبکه پهن‌باند"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(در بعضی موارد) هزینه‌ی استفاده از شبکه پهن‌باند APN (نام نقطه دسترسی)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "یک اتصال برای ا_ین شبکه پهن‌باند تلفن همراه بساز:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "برپاسازی اتصال شبکه تلفن همراه پهن‌باند"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "کشور یا منطقه"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "کشور یا منطقه ارائه‌دهنده خود را انتخاب کنید"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "ارائه‌دهنده خود را از یک _فهرست انتخاب کنید:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "من نمی توانم ارائه‌دهنده خود را پیدا کنم و می خواهم به طور _دستی آن را "
-#~ "وارد نمایم:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "ارائه‌دهنده من از فناوری GSM استفاده می‌کند (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "ارائه‌دهنده من از فناوری CDMA استفاده می‌کند. (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "ارائه‌دهنده خود را انتخاب کنید"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "پلان خود را _انتخاب کنید"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "پلان انتخاب _شده APN (نام Access Point)"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "هشدار: انتخاب پلان نادرست ممکن است در مسائل مربوط به صدور صورت حساب برای "
-#~ "حساب پهن‌باند شما تاثیر بگذارد و یا از ارتباط جلوگیری کند.\n"
-#~ "\n"
-#~ "اگر شما از پلان خود مطمئن نیستید، از ارائه‌دهنده خود در مورد APN پلان خود "
-#~ "بپرسید."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "پلان مالی خود را انتخاب کنید"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "شبکه پهن‌باند تلفن همراه شما با تنظیمات مقابل پیکربندی شده است:"
-
-#~ msgid "Your Device:"
-#~ msgstr "دستگاه شما:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "ارئه‌دهنده شما:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "پلان شما:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "هم‌اکنون یک اتصال به ارائه کننده پهن‌باند شما با تنظیماتی که انتخاب کرده‌اید "
-#~ "ایجاد می‌شود. اگر ایجاد اتصال شکست خورد یا نمی‌توانید به منابع شبکه دسترسی "
-#~ "پیدا کنید، تنظیمات خود را دوباره بررسی کنید. برای تغییر تنظیمات اتصال "
-#~ "پهن‌باند تلفن همراه، «اتصال‌های شبکه» را از منوی سیستم >> ترجیحات انتخاب "
-#~ "کنید."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "تایید تنظیمات شبکه پهن‌باند تلفن همراه"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(هیچکدام)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "_مجوز CA:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "ناشناس"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "مجوز CA انتخاب کنید"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "مجوز _کاربر:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "خطا در هنگام ویرایش ارتباط"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_بازکردن قفل"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "این گذرواژه هر بار پرسیده شود"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "برای اتصال با «%s» به کلمه عبور نیاز دارید."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "_نمایش گذرواژه‌ها"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_گذرواژه:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_گذرواژه:"
-
-#~ msgid "_Password:"
-#~ msgstr "_گذرواژه:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "ارتباط قطع شده"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "هیچکدام"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "وپ پویا (x02.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "_ساخت"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "برای دسترسی به شبکه بی‌سیم «%s»، گذرواژه‌ها یا کلیدهای رمز نگاری شده نیاز "
-#~ "است."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "شبکه بی‌سیم به تصدیق هویت نیاز دارد"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "شبکه بی‌سیم به تصدیق هویت نیاز دارد"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "ساخت یک شبکه بی‌سیم جدید"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "شبکه بی‌سیم جدید"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "نام شبکه بی‌سیمی را که می خواهید بسازید وارد کنید."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "اتصال به شبکه بی‌سیم مخفی "
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "شبکه‌های بی‌سیم مخفی"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "نام و جزئیات امنیتی شبکه مخفی که می‌خواهید به آن متصل شوید را وارد کنید."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "ا_منیت بی‌سیم:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "ا_رتباط:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "آ_داپتور بی‌سیم:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "من نمی توانم ارائه‌دهنده خود را پیدا کنم و می خواهم به طور _دستی آن را "
-#~ "وارد نمایم:"
-
-#~ msgid "Provider:"
-#~ msgstr "ارئه دهنده:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "فهرست کشور یا منطقه:"
-
-#~ msgid "Country or region"
-#~ msgstr "کشور یا منطقه"
-
-#~ msgid "Wired"
-#~ msgstr "سیمی"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "ا_منیت بی‌سیم:"
-
-#~ msgid "_Network name:"
-#~ msgstr "نام _شبکه:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "ا_رتباط:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "آ_داپتور بی‌سیم:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (پیش‌فرض)"
 
diff --git a/po/fi.po b/po/fi.po
index 4ffd7507..45e60805 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2016-03-13 18:15+0200\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
@@ -30,6 +30,7 @@ msgstr ""
 "X-POT-Import-Date: 2012-02-19 15:25:27+0000\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Verkko"
 
@@ -225,15 +226,19 @@ msgstr "802.1X-tunnistautuminen"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Yhdistä"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Verkon nimi:"
@@ -587,7 +592,7 @@ msgstr "Mobiililaajakaista (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobiililaajakaista"
 
@@ -709,7 +714,9 @@ msgstr "DSL-todentaminen"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_OK"
 
@@ -815,6 +822,7 @@ msgid "Error displaying connection information:"
 msgstr "Virhe näytettäessä yhteyden tietoja:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -964,7 +972,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Yhteyspiste"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Salasana:"
@@ -989,7 +997,8 @@ msgstr "VPN-selite"
 msgid "Base Connection"
 msgstr "Yhteys"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -1752,6 +1761,7 @@ msgid "_Service"
 msgstr "_Palvelu:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2413,6 +2423,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Salli verkkovierailu (_roaming), jos kotiverkkoa ei ole saatavilla"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Näy_tä salasanat"
 
@@ -2817,13 +2828,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3149,12 +3161,12 @@ msgstr ""
 "joitain tunnistautumistapoja."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3164,22 +3176,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Sidonta"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Tiimi"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Silta"
 
@@ -3471,6 +3486,7 @@ msgid "Select a connection to delete"
 msgstr "Tiimiyhteys %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nimi"
 
@@ -3688,6 +3704,8 @@ msgstr "Ethernet-yhteys %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Oletus"
 
@@ -3916,35 +3934,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Toimittaja käyttää _CDMA-pohjaista tekniikkaa (mm. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4107,10 +4125,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wifi-yhteys %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-avain (hexa tai ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bittinen tunnuslause"
 
@@ -4119,14 +4139,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynaaminen WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 (henkilökohtainen)"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 (henkilökohtainen)"
@@ -4203,6 +4226,476 @@ msgstr "Tietoja yhteydestä"
 msgid "_Close"
 msgstr "_Sulje"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "_CA-varmennetta ei vaadita"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Valitse CA-varmenne"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Y_ksityinen avain:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_Yksityisen avaimen salasana:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Valitse CA-varmenne"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_Käyttäjän varmenne:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Maani ei ole luettelossa"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Ei luettelossa"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Ei luettelossa…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Tarjoaja"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Asennettiin GSM-laite"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Asennettiin CDMA-laite"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Mikä tahansa laite"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Uusi mobiililaajakaistayhteys"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Tämä apulainen mahdollistaa matkapuhelinverkon mobiililaajakaistan helpon "
+"käyttöönoton."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Seuraavat tiedot tarvitaan:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Laajakaistan tarjoajan nimi"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Laajakaistan laskutustyypin nimi"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(joissain tapauksissa) Laajakaistan laskutustyypin APN (Access Point Name)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Luo yhteys _tähän mobiililaajakaistalaitteeseen:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Mobiililaajakaistayhteyden asetukset"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Maa tai alue"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Valitse palveluntarjoajasi maa tai alue"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Valitse palveluntarjoaja _luettelosta:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Palveluntarjoajaa ei löydy, haluan syöttää tarjoajan _manuaalisesti:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Palveluntarjoaja käyttää GSM-tekniikkaa (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Palveluntarjoaja käyttää CDMA-tekniikkaa (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Valitse palveluntarjoaja"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Valitse liittymä:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Valitun liittymän _APN (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Varoitus: Virheellisen liittymätyypin valinta voi johtaa laajakaistatilin "
+"laskutusongelmiin tai saattaa estää yhteyden toimivuuden.\n"
+"\n"
+"Jos olet epävarma liittymän tyypistä, kysy palveluntarjoajalta liittymäsi "
+"APN."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Valitse laskutustyyppi"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Mobiililaajakaistayhteys on nyt luotu seuraavilla asetuksilla:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Laite:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Palveluntarjoaja:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Liittymä:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Mobiililaajakaistan tarjoajaan luodaan nyt yhteys valituilla asetuksilla. "
+"Jos yhteys epäonnistuu tai et pääse verkkoon, tarkista asetukset uudelleen. "
+"Muokataksesi mobiililaajakaistayhteyden asetuksia, valitse ”Verkkoyhteydet” "
+"valikosta Järjestelmä >> Asetukset."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Vahvista mobiililaajakaistan asetukset"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ei mitään)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A-varmenne"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Tuntematon"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+#, fuzzy
+msgid "Cancel"
+msgstr "_Peru"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Valitse CA-varmenne"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Käyttäjän varmenne:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Virhe yhteyttä muokattaessa"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "Avaa l_ukitus"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Tallenna salasana vain tälle käyttäjälle"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Tallenna salasana kaikille käyttäjille"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Kysy tätä salasanaa joka kerta"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Salasanaa ei vaadita"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Näy_tä salasanat"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Toissijainen salasana:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Toissijainen salasana:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Salasana:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Napsauta yhdistääksesi"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ei salausta"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynaaminen WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Luo"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Salasanoja tai salausavaimia tarvitaan wifi-verkkoon ”%s” pääsemiseksi."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wifi-verkon salaustiedot vaaditaan"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wifi-verkko vaatii salaustietoja"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Luo uusi wifi-verkko"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Uusi wifi-verkko"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Syötä sen wifi-verkon nimi, jonka haluat luoda."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Yhdistä piilotettuun wifi-verkkoon"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Piilotettu wifi-verkko"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "Syötä yhdistettävän piilotetun wifi-verkon nimi ja salaustiedot."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Wifi-tietoturva:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Yh_teys:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wifi-verkkol_aite:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Palveluntarjoajaa ei löydy, haluan syöttää tarjoajan _manuaalisesti:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Tarjoaja:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Maa- tai aluelista:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Maa tai alue"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Kiinteä"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Wifi-tietoturva:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Verkon nimi:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Yh_teys:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wifi-verkkol_aite:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Käyttö:"
@@ -4353,26 +4846,26 @@ msgstr "_CA-varmennetta ei vaadita"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "puuttuva EAP-FAST PAC -tiedosto"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Valitse PAC-tiedosto..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-tiedostot (* .pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
@@ -4411,16 +4904,16 @@ msgstr "_Sisempi tunnistautuminen:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Salli automaattinen PAC-hankinta"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "puuttuva EAP-LEAP-käyttäjätunnus"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "puuttuva EAP-LEAP-salasana"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4456,15 +4949,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "puuttuva EAP-käyttäjätunnus"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "puuttuva EAP-salasana"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4478,24 +4971,24 @@ msgstr "WEP 128-bittinen tunnuslause"
 msgid "Sh_ow passphrase"
 msgstr "Näy_tä salasanat"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "_CA-varmennetta ei vaadita"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4504,7 +4997,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_dentiteetti:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4544,15 +5037,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Todentaminen:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "puuttuva EAP-salasana"
@@ -4562,33 +5055,33 @@ msgstr "puuttuva EAP-salasana"
 msgid "_Type"
 msgstr "_Tyyppi:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "wep-avain puuttuu"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4618,334 +5111,17 @@ msgstr "Nä_ytä avain"
 msgid "WEP inde_x"
 msgstr "WEP-inde_ksi"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "_CA-varmennetta ei vaadita"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Valitse CA-varmenne"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Y_ksityinen avain:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Yksityisen avaimen salasana:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Valitse CA-varmenne"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Käyttäjän varmenne:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Maani ei ole luettelossa"
-
-#~ msgid "Unlisted"
-#~ msgstr "Ei luettelossa"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Ei luettelossa…"
-
-#~ msgid "Provider"
-#~ msgstr "Tarjoaja"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Asennettiin GSM-laite"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Asennettiin CDMA-laite"
-
-#~ msgid "Any device"
-#~ msgstr "Mikä tahansa laite"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Uusi mobiililaajakaistayhteys"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Tämä apulainen mahdollistaa matkapuhelinverkon mobiililaajakaistan helpon "
-#~ "käyttöönoton."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Seuraavat tiedot tarvitaan:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Laajakaistan tarjoajan nimi"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Laajakaistan laskutustyypin nimi"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(joissain tapauksissa) Laajakaistan laskutustyypin APN (Access Point Name)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Luo yhteys _tähän mobiililaajakaistalaitteeseen:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Mobiililaajakaistayhteyden asetukset"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Maa tai alue"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Valitse palveluntarjoajasi maa tai alue"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Valitse palveluntarjoaja _luettelosta:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "Palveluntarjoajaa ei löydy, haluan syöttää tarjoajan _manuaalisesti:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Palveluntarjoaja käyttää GSM-tekniikkaa (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Palveluntarjoaja käyttää CDMA-tekniikkaa (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Valitse palveluntarjoaja"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Valitse liittymä:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Valitun liittymän _APN (Access Point Name):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Varoitus: Virheellisen liittymätyypin valinta voi johtaa laajakaistatilin "
-#~ "laskutusongelmiin tai saattaa estää yhteyden toimivuuden.\n"
-#~ "\n"
-#~ "Jos olet epävarma liittymän tyypistä, kysy palveluntarjoajalta liittymäsi "
-#~ "APN."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Valitse laskutustyyppi"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "Mobiililaajakaistayhteys on nyt luotu seuraavilla asetuksilla:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Laite:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Palveluntarjoaja:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Liittymä:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Mobiililaajakaistan tarjoajaan luodaan nyt yhteys valituilla asetuksilla. "
-#~ "Jos yhteys epäonnistuu tai et pääse verkkoon, tarkista asetukset "
-#~ "uudelleen. Muokataksesi mobiililaajakaistayhteyden asetuksia, valitse "
-#~ "”Verkkoyhteydet” valikosta Järjestelmä >> Asetukset."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Vahvista mobiililaajakaistan asetukset"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(ei mitään)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "C_A-varmenne"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Tuntematon"
-
-#, fuzzy
-#~ msgid "Cancel"
-#~ msgstr "_Peru"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Valitse CA-varmenne"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Käyttäjän varmenne:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Virhe yhteyttä muokattaessa"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "Avaa l_ukitus"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Tallenna salasana vain tälle käyttäjälle"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Tallenna salasana kaikille käyttäjille"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Kysy tätä salasanaa joka kerta"
-
-#~ msgid "The password is not required"
-#~ msgstr "Salasanaa ei vaadita"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Näy_tä salasanat"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Toissijainen salasana:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Toissijainen salasana:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Salasana:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Napsauta yhdistääksesi"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Ei salausta"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynaaminen WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Luo"
-
-#, 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."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wifi-verkon salaustiedot vaaditaan"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Wifi-verkko vaatii salaustietoja"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Luo uusi wifi-verkko"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Uusi wifi-verkko"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Syötä sen wifi-verkon nimi, jonka haluat luoda."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Yhdistä piilotettuun wifi-verkkoon"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Piilotettu wifi-verkko"
-
-#~ 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."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Wifi-tietoturva:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Yh_teys:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wifi-verkkol_aite:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "Palveluntarjoajaa ei löydy, haluan syöttää tarjoajan _manuaalisesti:"
-
-#~ msgid "Provider:"
-#~ msgstr "Tarjoaja:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Maa- tai aluelista:"
-
-#~ msgid "Country or region"
-#~ msgstr "Maa tai alue"
-
-#~ msgid "Wired"
-#~ msgstr "Kiinteä"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Wifi-tietoturva:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Verkon nimi:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Yh_teys:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wifi-verkkol_aite:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (oletus)"
 
diff --git a/po/fr.po b/po/fr.po
index 5df2dd16..ce9bca8a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet 1.8.22\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2019-08-14 11:37+0000\n"
 "Last-Translator: croe <croe redhat com>\n"
 "Language-Team: GNOME French TEAM <gnomefr traduc org>\n"
@@ -31,6 +31,7 @@ msgstr ""
 "X-Generator: Zanata 4.6.2\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Réseau"
 
@@ -239,15 +240,19 @@ msgstr "Authentification 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "Se _connecter"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Nom du réseau"
 
@@ -593,7 +598,7 @@ msgstr "Connexion mobile (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Connexion mobile"
 
@@ -716,7 +721,9 @@ msgstr "Authentification DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_Valider"
 
@@ -820,6 +827,7 @@ msgid "Error displaying connection information:"
 msgstr "Erreur lors de l'affichage des informations de connexion :"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -965,7 +973,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Hotspot"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -989,7 +997,8 @@ msgstr "Bannière pour le VPN "
 msgid "Base Connection"
 msgstr "Connexion de base "
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Inconnue"
 
@@ -1760,6 +1769,7 @@ msgid "_Service"
 msgstr "_Service"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2425,6 +2435,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Autoriser l'itiné_rance si le réseau domestique est indisponible"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "A_fficher les mots de passe"
 
@@ -2845,13 +2856,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3174,12 +3186,12 @@ msgstr ""
 "essayez d'en désactiver certaines."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3189,22 +3201,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Lien"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "En équipe"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Pont"
 
@@ -3495,6 +3510,7 @@ msgid "Select a connection to delete"
 msgstr "Choisissez une connexion à supprimer"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nom"
 
@@ -3706,6 +3722,8 @@ msgstr "Connexion Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Par défaut"
 
@@ -3937,35 +3955,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Mon fournisseur utilise une technologie de type C_DMA (1xRTT, EVOD, etc.)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4124,10 +4142,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Connexion Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clé WEP 40/128-bit (Hex ou ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit à phrase secrète"
 
@@ -4136,14 +4156,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dynamique (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA et WPA2 personnel"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA et WPA2 entreprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA et WPA2 personnel"
@@ -4221,6 +4244,468 @@ msgstr "Informations sur la connexion"
 msgid "_Close"
 msgstr "_Fermer"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr "Scanner avec votre portable ou  <a href=\"nma:print\">Print</a>"
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Aucun certificat défini"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Aucune clé définie"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Choisissez une clé pour le certificat %s"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "_Clé privée %s"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "_Mot de passe de la clé %s"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Choisissez le certificat %s"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "_Certificat %s"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Mon pays n'est pas dans la liste"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Pas dans la liste"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Mon forfait ne figure pas dans la liste…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Fournisseur"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Périphérique GSM installé"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Périphérique CDMA installé"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "N'importe quel appareil"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nouvelle connexion mobile"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Cet assistant vous aide à configurer facilement une connexion mobile à large "
+"bande à un réseau cellulaire (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Vous devez disposer des informations suivantes :"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Le nom de votre fournisseur"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Le nom de votre plan de facturation"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"Le nom du point d'accès (APN) de votre plan de facturation (dans certains "
+"cas)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Créer une connexion pour cet appareil _mobile :"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Configuration d'une connexion mobile"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "Pays ou région :"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Choisissez le pays ou la région de votre fournisseur"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Sélectionnez votre fournisseur dans la _liste :"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"Je ne trouve pas mon fournisseur et je souhaite configurer _manuellement la "
+"connexion :"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Mon fournisseur utilise la technologie GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Mon fournisseur utilise la technologie CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Choisissez votre fournisseur"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Choisissez votre forfait :"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Nom du point d'accès (_APN) choisi :"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Avertissement : le choix d'un mauvais forfait peut avoir des conséquences "
+"sur la facturation de votre compte ou peut empêcher la connexion.\n"
+"\n"
+"Si vous avez des doutes sur le forfait à choisir, interrogez votre "
+"fournisseur au sujet du nom du point d'accès (APN)."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Choisissez votre plan de facturation"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Votre connexion mobile est configurée avec les paramètres suivants :"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Votre périphérique :"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Votre fournisseur :"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Votre forfait :"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Une connexion va maintenant être effectuée vers votre fournisseur de "
+"connexion mobile avec les paramètres que vous avez indiqués. Si la connexion "
+"échoue ou que vous n'avez pas accès aux ressources réseau, vérifiez une "
+"nouvelle fois les paramètres. Pour les modifier, choisissez « Connexions "
+"réseau » dans le menu Système > Préférences."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmation des paramètres de connexion mobile"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(aucun)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Clé dans %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificat dans %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(inconnu)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Sélectionner"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Choisir à partir d'un fichier…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Choisissez un certificat %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Mot de passe du certificat %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Erreur de connexion :"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Erreur lors de l'ouverture d'une session : "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Déverrouiller le jeton"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Émis par"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Saisissez le PIN %s"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Se connecter"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "Se Suvenir du _PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Enregistrer le mot de passe seulement pour cet utilisateur"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Enregistrer le mot de passe pour tous les utilisateurs"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Demander ce mot de passe chaque fois"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Le mot de passe n'est pas nécessaire"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "A_fficher les mots de passe"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Troisième mot de passe :"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "Mot de passe _secondaire :"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Mot de passe :"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Cliquer pour se connecter"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Nouveau…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Aucune"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dynamique (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_réer"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Des mots de passe ou des clés de chiffrement sont nécessaires pour l'accès "
+"au réseau Wi-Fi « %s »."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Authentification nécessaire pour le réseau Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Authentification demandée par le réseau Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Création d'un nouveau réseau Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nouveau réseau Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Saisissez le nom du réseau Wi-Fi que vous voulez créer."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Connexion au réseau Wi-Fi invisible"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Réseau Wi-Fi invisible"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Saisissez le nom et les détails de sécurité du réseau Wi-Fi invisible auquel "
+"vous voulez vous connecter."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "_Sécurité Wi-Fi"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "Co_nnexion"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Ad_aptateur Wi-Fi"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"Je ne trouve pas mon fournisseur et je souhaite le saisir _manuellement :"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Fournisseur :"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Liste des pays ou des régions :"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Pays ou région"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Filaire"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "Maillage OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Soit un mot de passe est manquant soit la connexion est invalide. Dans ce "
+"dernier cas, vous devez d'abord éditer la connexion avec nm-connection-"
+"editor."
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Sécurité Wi-Fi :"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nom du réseau :"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nnexion :"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Ad_aptateur Wi-Fi :"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Utilisation :"
@@ -4369,25 +4854,25 @@ msgstr "aucun certificat sélectionné"
 msgid "selected CA certificate file does not exist"
 msgstr "le fichier de certificat CA n'existe pas"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "fichier EAP-FAST PAC manquant"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Choisir un fichier PAC…"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Fichier PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Tous les fichiers"
 
@@ -4423,16 +4908,16 @@ msgstr "Authentification i_nterne"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "P_ermettre le provisionnement PAC automatique"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "nom d'utilisateur EAP-LEAP manquant"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "mot de passe EAP-LEAP manquant"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4467,15 +4952,15 @@ msgstr "Suffixe du nom de certificat serveur."
 msgid "_Domain"
 msgstr "_Domaine"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "nom d'utilisateur EAP manquant"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "mot de passe EAP manquant"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "phrase de passe de clé privée cliente EAP manquante"
 
@@ -4487,23 +4972,23 @@ msgstr "Phrase de passe de clé p_rivée"
 msgid "Sh_ow passphrase"
 msgstr "A_fficher la phrase de passe"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "identité EAP-TLS manquante"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "aucun certificat utilisateur sélectionné"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 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:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "aucune clé sélectionnée"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "le fichier de clé sélectionné n'existe pas"
 
@@ -4511,7 +4996,7 @@ msgstr "le fichier de clé sélectionné n'existe pas"
 msgid "I_dentity"
 msgstr "I_dentité"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (non EAP)"
 
@@ -4549,15 +5034,15 @@ msgstr "Configurée de façon externe"
 msgid "Au_thentication"
 msgstr "Au_thentification"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "nom d'utilisateur LEAP manquant"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "mot de passe LEAP manquant"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "mot de passe EAP manquant"
@@ -4566,18 +5051,18 @@ msgstr "mot de passe EAP manquant"
 msgid "_Type"
 msgstr "_Type"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "clé WEP manquante"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4585,7 +5070,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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4594,11 +5079,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 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 "
@@ -4628,7 +5113,7 @@ msgstr "A_fficher la clé"
 msgid "WEP inde_x"
 msgstr "Inde_x WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4637,360 +5122,12 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
 
-#~ msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
-#~ msgstr "Scanner avec votre portable ou  <a href=\"nma:print\">Print</a>"
-
-#~ msgid "No certificate set"
-#~ msgstr "Aucun certificat défini"
-
-#~ msgid "No key set"
-#~ msgstr "Aucune clé définie"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Choisissez une clé pour le certificat %s"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "_Clé privée %s"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Mot de passe de la clé %s"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Choisissez le certificat %s"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Certificat %s"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Mon pays n'est pas dans la liste"
-
-#~ msgid "Unlisted"
-#~ msgstr "Pas dans la liste"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Mon forfait ne figure pas dans la liste…"
-
-#~ msgid "Provider"
-#~ msgstr "Fournisseur"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Périphérique GSM installé"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Périphérique CDMA installé"
-
-#~ msgid "Any device"
-#~ msgstr "N'importe quel appareil"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nouvelle connexion mobile"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Cet assistant vous aide à configurer facilement une connexion mobile à "
-#~ "large bande à un réseau cellulaire (3G)."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Vous devez disposer des informations suivantes :"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Le nom de votre fournisseur"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Le nom de votre plan de facturation"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "Le nom du point d'accès (APN) de votre plan de facturation (dans certains "
-#~ "cas)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Créer une connexion pour cet appareil _mobile :"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Configuration d'une connexion mobile"
-
-#~ msgid "Country or region:"
-#~ msgstr "Pays ou région :"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Choisissez le pays ou la région de votre fournisseur"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Sélectionnez votre fournisseur dans la _liste :"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "Je ne trouve pas mon fournisseur et je souhaite configurer _manuellement "
-#~ "la connexion :"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Mon fournisseur utilise la technologie GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Mon fournisseur utilise la technologie CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Choisissez votre fournisseur"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Choisissez votre forfait :"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Nom du point d'accès (_APN) choisi :"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Avertissement : le choix d'un mauvais forfait peut avoir des conséquences "
-#~ "sur la facturation de votre compte ou peut empêcher la connexion.\n"
-#~ "\n"
-#~ "Si vous avez des doutes sur le forfait à choisir, interrogez votre "
-#~ "fournisseur au sujet du nom du point d'accès (APN)."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Choisissez votre plan de facturation"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Votre connexion mobile est configurée avec les paramètres suivants :"
-
-#~ msgid "Your Device:"
-#~ msgstr "Votre périphérique :"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Votre fournisseur :"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Votre forfait :"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Une connexion va maintenant être effectuée vers votre fournisseur de "
-#~ "connexion mobile avec les paramètres que vous avez indiqués. Si la "
-#~ "connexion échoue ou que vous n'avez pas accès aux ressources réseau, "
-#~ "vérifiez une nouvelle fois les paramètres. Pour les modifier, choisissez "
-#~ "« Connexions réseau » dans le menu Système > Préférences."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Confirmation des paramètres de connexion mobile"
-
-#~ msgid "(None)"
-#~ msgstr "(aucun)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Clé dans %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certificat dans %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(inconnu)"
-
-#~ msgid "Select"
-#~ msgstr "Sélectionner"
-
-#~ msgid "Cancel"
-#~ msgstr "Annuler"
-
-#~ msgid "Select from file…"
-#~ msgstr "Choisir à partir d'un fichier…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Choisissez un certificat %s"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Mot de passe du certificat %s"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Erreur de connexion :"
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Erreur lors de l'ouverture d'une session : "
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Déverrouiller le jeton"
-
-#~ msgid "Issued By"
-#~ msgstr "Émis par"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Saisissez le PIN %s"
-
-#~ msgid "_Login"
-#~ msgstr "_Se connecter"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "Se Suvenir du _PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Enregistrer le mot de passe seulement pour cet utilisateur"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Enregistrer le mot de passe pour tous les utilisateurs"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Demander ce mot de passe chaque fois"
-
-#~ msgid "The password is not required"
-#~ msgstr "Le mot de passe n'est pas nécessaire"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "A_fficher les mots de passe"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Troisième mot de passe :"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "Mot de passe _secondaire :"
-
-#~ msgid "_Password:"
-#~ msgstr "_Mot de passe :"
-
-#~ msgid "Click to connect"
-#~ msgstr "Cliquer pour se connecter"
-
-#~ msgid "New…"
-#~ msgstr "Nouveau…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Aucune"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP dynamique (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "C_réer"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Des mots de passe ou des clés de chiffrement sont nécessaires pour "
-#~ "l'accès au réseau Wi-Fi « %s »."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Authentification nécessaire pour le réseau Wi-Fi"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Authentification demandée par le réseau Wi-Fi"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Création d'un nouveau réseau Wi-Fi"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nouveau réseau Wi-Fi"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Connexion au réseau Wi-Fi invisible"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Réseau Wi-Fi invisible"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Saisissez le nom et les détails de sécurité du réseau Wi-Fi invisible "
-#~ "auquel vous voulez vous connecter."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Sécurité Wi-Fi"
-
-#~ msgid "C_onnection"
-#~ msgstr "Co_nnexion"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Ad_aptateur Wi-Fi"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "Je ne trouve pas mon fournisseur et je souhaite le saisir _manuellement :"
-
-#~ msgid "Provider:"
-#~ msgstr "Fournisseur :"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Liste des pays ou des régions :"
-
-#~ msgid "Country or region"
-#~ msgstr "Pays ou région"
-
-#~ msgid "Wired"
-#~ msgstr "Filaire"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "Maillage OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Soit un mot de passe est manquant soit la connexion est invalide. Dans ce "
-#~ "dernier cas, vous devez d'abord éditer la connexion avec nm-connection-"
-#~ "editor."
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Sécurité Wi-Fi :"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nom du réseau :"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Co_nnexion :"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Ad_aptateur Wi-Fi :"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/gd.po b/po/gd.po
index ff3bf45d..e52e08c5 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: eog\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2017-03-09 15:27+0100\n"
 "Last-Translator: GunChleoc <fios foramnagaidhlig net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
@@ -23,6 +23,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Lìonra"
 
@@ -224,15 +225,19 @@ msgstr "Dearbhadh 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "S_guir dheth"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "C_eangail"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "Ainm an _lìonraidh:"
@@ -590,7 +595,7 @@ msgstr "Bann-leathann mobile (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Bann-leathann mobile"
 
@@ -713,7 +718,9 @@ msgstr "Dearbhadh  DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_Ceart ma-thà"
 
@@ -822,6 +829,7 @@ msgid "Error displaying connection information:"
 msgstr "Mearachd a' taisbeanadh fiosrachadh a' cheangal:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -971,7 +979,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Hotspot"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Facal-faire:"
@@ -996,7 +1004,8 @@ msgstr "Bratach VPN"
 msgid "Base Connection"
 msgstr "Ceangal bunasach"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Neo-aithnichte"
 
@@ -1776,6 +1785,7 @@ msgid "_Service"
 msgstr "_Seirbheis:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2430,6 +2440,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Ceadaich ceangal air _fàrsan mur eil lìonra dachaigh ri làimh"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Sea_ll na faclan-faire"
 
@@ -2823,13 +2834,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3152,12 +3164,12 @@ msgstr ""
 "comas cuid dhe na dòighean."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3167,22 +3179,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bann"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Sgioba"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Drochaid"
 
@@ -3491,6 +3506,7 @@ msgid "Select a connection to delete"
 msgstr "Ceangal sgioba %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Ainm"
 
@@ -3718,6 +3734,8 @@ msgstr "Ceangal Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Bun-roghainn"
 
@@ -3956,35 +3974,35 @@ msgstr ""
 "Tha an solaraiche agam a' cleachdadh teicneolas stèidhichte air C _DMA (m.e. "
 "1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4147,10 +4165,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Ceangal Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Iuchair WEP 40/128-bit (Hex no ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Abairt-fhaire WEP 128-bit"
 
@@ -4159,14 +4179,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamic WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ⁊ WPA2 pearsanta"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA ⁊ WPA2 pearsanta"
@@ -4246,6 +4269,483 @@ msgstr "Fiosrachadh mun cheangal"
 msgid "_Close"
 msgstr "_Dùin"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Chan eil teisteanas CA _riatanach"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Tagh teisteanas CA"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "_Iuchair phrìobhaideach"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Facal-faire na h-iuchrach _phrìobhaideach"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Tagh teisteanas CA"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_Teisteanas a' chleachdaiche:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Chan eil mo dhùthaich air an liosta"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Neo-liostaichte"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Chan eil am plana agam air an liosta..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Solaraiche"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Uidheam GSM stàlaichte"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Uidheam CDMA  stàlaichte"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Uidheam sam bith"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Ceangal bann-leathainn mobile ùr"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Bheir an cuidiche seo cobhair dhut ceangal bann-leathainn mobile a "
+"stèidheachadh ri lìonra mobile (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Feumaidh tu am fiosrachadh a leanas:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Ainm an t-solaraiche bhann-leathainn agad."
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Ainm a' phlana bhileachaidh airson a' bhann-leathainn mobile agad"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(uaireannan) am plana bileachadh bann-leathainn APN (Access Point Name) agad"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Cruthaich ceangal airson _an uidheim bhann-leathainn mobile seo:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Suidhich ceangal bann-leathainn mobile"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Dùthaich no roinn-dùthcha"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Tagh dùthaich no roinn-dùthcha an t-solaraiche agad"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Tagh an solaraiche aga o _liosta:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"Chan fhaic mi an solaraiche agam 's tha mi ag iarraidh a chur a-steach de "
+"lài_mh:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+"Tha an solaraiche agam a' cleachdadh teicneolas GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Tha an solaraiche agam a' cleachdadh teicneolas CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Tagh an solaraiche agad"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Tagh am plana agad:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Access Point Name) a' phlana a thagh thu:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Rabhadh: Ma thaghas tu am plana cearr, dh'fhaoidte gun èirich duilgheadasan "
+"bileachaidh airson a' cheangail bhann-leathainn agad no nach urrainn dhut "
+"ceangal a dhèanamh.\n"
+"\n"
+"Mur eil thu cinnteach dè am plana a tha agad, iarr fiosrachadh mu APN a' "
+"phlana agad."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Tagh am plana bileachaidh agad."
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"'S iad seo na roghainnean a tha aig a' cheangal bhann-leathann mobile agad:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "An t-uidheam agad:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "An solaraiche agad:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Am plana agad:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Thèid ceangal ris an t-solaraiche bhann-leathainn mobile agad a-nis, a' "
+"cleachdadh nan roghainnean a thagh thu. Ma dh'fhàilligeas an ceangal no mur "
+"fhaigh thu greim air goireasan an lìonraidh, thoir sùil air na roghainnean. "
+"Gus roghainnean a' cheangail bhann-leathainn mobile agad atharrachadh, tagh "
+"\"Ceanglaichean lìonraidh\" on chlàr-taice \"Siostam\" → \"Roghainnean\"."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Dearbh roghainnean a' bhann-leathainn mobile"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(chan eil gin)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Teisteanas C_A:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Neo-aithnichte"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+#, fuzzy
+msgid "Cancel"
+msgstr "S_guir dheth"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Ion-phortaich sgriobt o fhaidhle..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Tagh teisteanas CA"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Teisteanas a' chleachdaiche:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Mearachd a' deasachadh a' cheangail"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Thoir a' ghlas dheth"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Na glèidh am facal-faire ach airson a' chleachdaiche seo"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Glèidh am facal-faire airson na h-uile cleachdaiche"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Iarr am facal-faire seo gach turas"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Chan eil feum air an fhacal-fhaire"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Sea_ll na faclan-faire"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Treas facal-faire:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Facal-faire dàrnach:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Facal-faire:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Briog airson ceangal"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Ùr..."
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Chan eil gin"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamic WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_ruthaich"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Tha feum air faclan-faire no iuchraichean crioptachaidh mus fhaighear "
+"cothrom air an lìonra Wi-Fi \"%s\"."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Tha feum air dearbhadh lìonra Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Tha an lìonra Wi-Fi ag iarraidh dearbhadh"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Cruthaich lìonra Wi-Fi ùr"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Lìonra Wi-Fi ùr"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+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/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Ceangail ri lìonra Wi-Fi falaichte"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Lìonra Wi-Fi falaichte"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Cuir a-steach ainm agus fiosrachadh tèarainteachd an lìonraidh Wi-Fi "
+"fhalaichte a tha thu airson ceangal ris."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Tèarainteachd Wi-Fi:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "C_eangal:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptar Wi-Fi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"Chan fhaic mi an solaraiche agam 's tha mi ag iarraidh a chur a-steach de "
+"lài_mh:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Solaraiche:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Liosta dhùthchannan no roinnean-dùthcha:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Dùthaich no roinn-dùthcha"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Uèirichte"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Tha facal-faire a dhìth no chan eil an ceangal dligheach. Mur eil an ceangal "
+"dligheach, feumaidh tu a dheasachadh le nm-connection-editor an toiseach"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Tèarainteachd Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Ainm an _lìonraidh:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "C_eangal:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptar Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Cleachdadh:"
@@ -4397,25 +4897,25 @@ msgstr "Chan eil teisteanas CA _riatanach"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-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:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Tagh faidhle PAC"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Faidhlichean PAC  (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "A h-uile faidhle"
 
@@ -4454,16 +4954,16 @@ msgstr "_Inner Authentication:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Ceadaich PAC _Provisioning fèin-obrachail"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "tha ainm-cleachdaiche EAP-LEAP a dhìth"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "tha facal-faire EAP-LEAP a dhìth"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4499,15 +4999,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "tha ainm-cleachdaiche EAP a dhìth"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "tha facal-faire EAP a dhìth"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4521,25 +5021,25 @@ msgstr "Abairt-fhaire WEP 128-bit"
 msgid "Sh_ow passphrase"
 msgstr "Sea_ll na faclan-faire"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "tha dearbh-aithne EAP-TLS a dhìth"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "cha deach faidhle a thaghadh"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 #, fuzzy
 msgid "no key selected"
 msgstr "cha deach faidhle a thaghadh"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4548,7 +5048,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "D_earbh-aithne:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (gun EAP)"
 
@@ -4587,15 +5087,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "De_arbhadh:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "tha ainm-cleachdaiche leap a dhìth"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "tha facal-faire leap a dhìth"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "tha facal-faire EAP a dhìth"
@@ -4605,18 +5105,18 @@ msgstr "tha facal-faire EAP a dhìth"
 msgid "_Type"
 msgstr "_Seòrsa:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "tha iuchair wep a dhìth"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4624,7 +5124,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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4633,12 +5133,12 @@ msgstr ""
 "tha an iuchair wep mì-dhligheach: tha faide na iuchrach %zu cearr. Feumaidh "
 "iuchair a bith 5/13 (ascii) no 10/26 (sia-dheicheach) a dh'fhaid"
 
-#: src/wireless-security/ws-wep-key.c:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 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 "
@@ -4670,7 +5170,7 @@ msgstr "Se_all an iuchair"
 msgid "WEP inde_x"
 msgstr "Clàr-a_mais WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4679,350 +5179,12 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Chan eil teisteanas CA _riatanach"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Tagh teisteanas CA"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "_Iuchair phrìobhaideach"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Facal-faire na h-iuchrach _phrìobhaideach"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Tagh teisteanas CA"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Teisteanas a' chleachdaiche:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Chan eil mo dhùthaich air an liosta"
-
-#~ msgid "Unlisted"
-#~ msgstr "Neo-liostaichte"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Chan eil am plana agam air an liosta..."
-
-#~ msgid "Provider"
-#~ msgstr "Solaraiche"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Uidheam GSM stàlaichte"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Uidheam CDMA  stàlaichte"
-
-#~ msgid "Any device"
-#~ msgstr "Uidheam sam bith"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Ceangal bann-leathainn mobile ùr"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Bheir an cuidiche seo cobhair dhut ceangal bann-leathainn mobile a "
-#~ "stèidheachadh ri lìonra mobile (3G)."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Feumaidh tu am fiosrachadh a leanas:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Ainm an t-solaraiche bhann-leathainn agad."
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Ainm a' phlana bhileachaidh airson a' bhann-leathainn mobile agad"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(uaireannan) am plana bileachadh bann-leathainn APN (Access Point Name) "
-#~ "agad"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Cruthaich ceangal airson _an uidheim bhann-leathainn mobile seo:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Suidhich ceangal bann-leathainn mobile"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Dùthaich no roinn-dùthcha"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Tagh dùthaich no roinn-dùthcha an t-solaraiche agad"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Tagh an solaraiche aga o _liosta:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "Chan fhaic mi an solaraiche agam 's tha mi ag iarraidh a chur a-steach de "
-#~ "lài_mh:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr ""
-#~ "Tha an solaraiche agam a' cleachdadh teicneolas GSM (GPRS, EDGE, UMTS, "
-#~ "HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Tha an solaraiche agam a' cleachdadh teicneolas CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Tagh an solaraiche agad"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Tagh am plana agad:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "_APN (Access Point Name) a' phlana a thagh thu:"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Rabhadh: Ma thaghas tu am plana cearr, dh'fhaoidte gun èirich "
-#~ "duilgheadasan bileachaidh airson a' cheangail bhann-leathainn agad no "
-#~ "nach urrainn dhut ceangal a dhèanamh.\n"
-#~ "\n"
-#~ "Mur eil thu cinnteach dè am plana a tha agad, iarr fiosrachadh mu APN a' "
-#~ "phlana agad."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Tagh am plana bileachaidh agad."
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "'S iad seo na roghainnean a tha aig a' cheangal bhann-leathann mobile "
-#~ "agad:"
-
-#~ msgid "Your Device:"
-#~ msgstr "An t-uidheam agad:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "An solaraiche agad:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Am plana agad:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Thèid ceangal ris an t-solaraiche bhann-leathainn mobile agad a-nis, a' "
-#~ "cleachdadh nan roghainnean a thagh thu. Ma dh'fhàilligeas an ceangal no "
-#~ "mur fhaigh thu greim air goireasan an lìonraidh, thoir sùil air na "
-#~ "roghainnean. Gus roghainnean a' cheangail bhann-leathainn mobile agad "
-#~ "atharrachadh, tagh \"Ceanglaichean lìonraidh\" on chlàr-taice \"Siostam\" "
-#~ "→ \"Roghainnean\"."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Dearbh roghainnean a' bhann-leathainn mobile"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(chan eil gin)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Teisteanas C_A:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Neo-aithnichte"
-
-#, fuzzy
-#~ msgid "Cancel"
-#~ msgstr "S_guir dheth"
-
-#, fuzzy
-#~ msgid "Select from file…"
-#~ msgstr "Ion-phortaich sgriobt o fhaidhle..."
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Tagh teisteanas CA"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Teisteanas a' chleachdaiche:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Mearachd a' deasachadh a' cheangail"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Thoir a' ghlas dheth"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Na glèidh am facal-faire ach airson a' chleachdaiche seo"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Glèidh am facal-faire airson na h-uile cleachdaiche"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Iarr am facal-faire seo gach turas"
-
-#~ msgid "The password is not required"
-#~ msgstr "Chan eil feum air an fhacal-fhaire"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Sea_ll na faclan-faire"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Treas facal-faire:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Facal-faire dàrnach:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Facal-faire:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Briog airson ceangal"
-
-#~ msgid "New…"
-#~ msgstr "Ùr..."
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Chan eil gin"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynamic WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "C_ruthaich"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Tha feum air faclan-faire no iuchraichean crioptachaidh mus fhaighear "
-#~ "cothrom air an lìonra Wi-Fi \"%s\"."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Tha feum air dearbhadh lìonra Wi-Fi"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Tha an lìonra Wi-Fi ag iarraidh dearbhadh"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Cruthaich lìonra Wi-Fi ùr"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Lìonra Wi-Fi ùr"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Ceangail ri lìonra Wi-Fi falaichte"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Lìonra Wi-Fi falaichte"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Cuir a-steach ainm agus fiosrachadh tèarainteachd an lìonraidh Wi-Fi "
-#~ "fhalaichte a tha thu airson ceangal ris."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Tèarainteachd Wi-Fi:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "C_eangal:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Adaptar Wi-Fi:"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "Chan fhaic mi an solaraiche agam 's tha mi ag iarraidh a chur a-steach de "
-#~ "lài_mh:"
-
-#~ msgid "Provider:"
-#~ msgstr "Solaraiche:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Liosta dhùthchannan no roinnean-dùthcha:"
-
-#~ msgid "Country or region"
-#~ msgstr "Dùthaich no roinn-dùthcha"
-
-#~ msgid "Wired"
-#~ msgstr "Uèirichte"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Tha facal-faire a dhìth no chan eil an ceangal dligheach. Mur eil an "
-#~ "ceangal dligheach, feumaidh tu a dheasachadh le nm-connection-editor an "
-#~ "toiseach"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Tèarainteachd Wi-Fi:"
-
-#~ msgid "_Network name:"
-#~ msgstr "Ainm an _lìonraidh:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "C_eangal:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Adaptar Wi-Fi:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (bun-roghainn)"
 
diff --git a/po/gl.po b/po/gl.po
index ea41cabf..1dd4432a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2017-07-29 21:30+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: Galician\n"
@@ -28,6 +28,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Rede"
 
@@ -235,15 +236,19 @@ msgstr "Autenticación 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "Nome da _rede:"
@@ -588,7 +593,7 @@ msgstr "Banda larga móbil (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Banda larga móbil"
 
@@ -712,7 +717,9 @@ msgstr "Autenticación DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_Aceptar"
 
@@ -816,6 +823,7 @@ msgid "Error displaying connection information:"
 msgstr "Produciuse un erro ao mostrar a información de conexión:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -964,7 +972,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Punto de acceso"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Contrasinal:"
@@ -989,7 +997,8 @@ msgstr "Mensaxe da VPN"
 msgid "Base Connection"
 msgstr "Conexión base"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Descoñecida"
 
@@ -1767,6 +1776,7 @@ msgid "_Service"
 msgstr "_Servizo:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2457,6 +2467,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Permitir «_roaming» se a rede doméstica non está dispoñíbel"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Mos_trar os contrasinais"
 
@@ -2886,13 +2897,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Cableada"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3238,12 +3250,12 @@ msgstr ""
 "compatibilidade dalgúns métodos."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Sen fíos"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3253,22 +3265,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bond"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Equipo"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Bridge"
 
@@ -3562,6 +3577,7 @@ msgid "Select a connection to delete"
 msgstr "Seleccionar a conexión a eliminar"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nome"
 
@@ -3776,6 +3792,8 @@ msgstr "Conexión con fíos %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -4006,35 +4024,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "O meu provedor emprega unha tecnoloxía baseada en C_DMA (p.ex. RTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4192,10 +4210,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Conexión sen fíos %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clave WEP de 40/128 bits (Hexadecimal ou ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase de paso WEP 128-bit"
 
@@ -4204,14 +4224,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinámica (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Persoal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Empresarial"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Persoal"
@@ -4287,6 +4310,470 @@ msgstr "Información de conexión"
 msgid "_Close"
 msgstr "Pe_char"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Non hai un certificado estabelecido"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Non hai unha clave estabelecida"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Seleccionar unha clave para o certificado %s"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "_Clave privada de %s:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Contrasinal da _clave %s:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Seleccionar o certificado %s"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_Certificado de %s:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "O meu país non está na lista"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Sen listar"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "O meu plan non está listado..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Provedor"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Dispositivo GSM instalado"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Dispositivo CDMA instalado"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Calquera dispositivo"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nova conexión de banda larga móbil"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Este asistente axúdao a configurar a súa conexión de banda larga móbil a "
+"unha rede celular (3G) de forma sinxela."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Vostede precisará a seguinte información:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Nome da operadora de banda larga"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "O nome do plan de facturación de banda larga"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(nalgúns casos) O seu APN do plan de facturación de banda larga (Access "
+"Point Name)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Crear unha conexión para es_te dispositivo de banda larga móbil:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Configurar unha conexión de banda larga móbil"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "País ou estado"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Seleccione o país ou rexión da súa operadora"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Seleccione un provedor desde a _lista:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Non atopo a miña operadora e quero introducila _manualmente:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "O meu provedor emprega a tecnoloxía GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "O meu provedor emprega a tecnoloxía CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Seleccione o seu provedor"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Seleccione o seu plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Seleccione o seu plan _APN (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Aviso: seleccionar un plan incorrecto pode resultar en incidencias de "
+"facturación na conta da banda larga ou pode impedir a conectividade.\n"
+"\n"
+"Se non está seguro do seu plan, pregúntelle á súa operadora polo plan APN."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Seleccione o seu plan de facturación"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"A súa conexión de banda larga móbil está configurada coas seguintes "
+"preferencias:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "O seu dispositivo:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "O seu provedor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "O seu plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Estabelecerase unha conexión coa operadora da banda larga móbil usando os "
+"axustes que seleccionou. Se falla a conexión ou non pode acceder aos "
+"recursos de rede, volva comprobar os axustes. Para modificar a configuración "
+"da conexión da banda larga móbil, seleccione «Conexións de rede» no menú "
+"Sistema → Preferencias."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirme as preferencias da conexión de banda larga móbil"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Ningún)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Clave en %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificado en %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Descoñecido)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Seleccionar"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Seleccionar dun ficheiro..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Seleccione un Certificado %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Contrasinal do certificado %s:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Produciuse un erro iniciando sesión en: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Produciuse un erro abrindo a sesión: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "«Token» de des_bloqueo"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Emitido por"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Introducir o PIN de %s"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Iniciar a sesión"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Lembrar o PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Gardar só o contrasinal deste usuario"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Gardar o contrasinal de todos os usuarios"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Pedir o contrasinal sempre"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Non se precisa contrasinal"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "M_ostrar os contrasinais"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "Contrasinal _terciaria:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "Contrasinal _secundario:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Contrasinal:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Prema para conectar"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Novo…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ningún"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinámica (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_rear"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Requírese o contrasinal ou clave de cifrado para acceder á rede sen fíos "
+"«%s»."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Requírese a autenticación para a rede sen fíos"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "A rede sen fíos require autenticación"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Crear unha rede sen fíos"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Rede sen fíos nova"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Escriba un nome para a rede sen fíos que quere crear."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Conectarse a unha rede sen fíos oculta"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Rede sen fíos oculta"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Escriba o nome e os detalles de seguranza da rede sen fíos á que quere "
+"conectarse."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Seguranza sen fíos:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Co_nexión:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptador sen fíos:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Non atopo a miña operadora e quero introducila _manualmente:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Provedor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Lista de paises ou estados:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "País ou estado"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Con fíos"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Falta o contrasinal ou a conexión é incorrecta. No último caso, debe editar "
+"primeiro a conexión con nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Seguranza sen fíos:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Nome da _rede:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nexión:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptador sen fíos:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Uso:"
@@ -4435,25 +4922,25 @@ msgstr "non seleccionou ningún certificado CA"
 msgid "selected CA certificate file does not exist"
 msgstr "o certificado CA seleccionado non existe"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "Falta o ficheiro EAP-FAST PAC"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Seleccione un ficheiro PAC"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Ficheiros PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Todos os ficheiros"
 
@@ -4492,16 +4979,16 @@ msgstr "Autenticación i_nterna:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir a provisión PAC _automática"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "Falta o nome do usuario do EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "Falta o contrasinal do EAP-LEAP"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4538,15 +5025,15 @@ msgstr "Sufixo do nome do certificado do servidor."
 msgid "_Domain"
 msgstr "_Dominio:"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "Falta o nome do usuario EAP"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "Falta o contrasinal EAP"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4560,23 +5047,23 @@ msgstr "Contrasinal de chave _privada:"
 msgid "Sh_ow passphrase"
 msgstr "M_ostrar os contrasinais"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "Falta a identidade EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "ningún certificado de usuario seleccionado"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "o certificado de usuario seleccionado non existe"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "non seleccionou ningunha clave"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "a clave seleccionada non existe"
 
@@ -4585,7 +5072,7 @@ msgstr "a clave seleccionada non existe"
 msgid "I_dentity"
 msgstr "I_dentidade:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (non EAP)"
 
@@ -4624,15 +5111,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Autenticación:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "Falta o nome do usuario do leap"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "Falta o contrasinal do leap"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Falta o contrasinal EAP"
@@ -4642,18 +5129,18 @@ msgstr "Falta o contrasinal EAP"
 msgid "_Type"
 msgstr "_Tipo:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "Falta a clave wep"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4661,7 +5148,7 @@ msgstr ""
 "Clave wep incorrecta: as claves cunha lonxitude de %zu deben conter só "
 "caracteres ascii"
 
-#: src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4670,11 +5157,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 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"
 
@@ -4704,7 +5191,7 @@ msgstr "Mo_strar a clave"
 msgid "WEP inde_x"
 msgstr "Índic_e WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4713,358 +5200,12 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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 "No certificate set"
-#~ msgstr "Non hai un certificado estabelecido"
-
-#~ msgid "No key set"
-#~ msgstr "Non hai unha clave estabelecida"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Seleccionar unha clave para o certificado %s"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "_Clave privada de %s:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Contrasinal da _clave %s:"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Seleccionar o certificado %s"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Certificado de %s:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "O meu país non está na lista"
-
-#~ msgid "Unlisted"
-#~ msgstr "Sen listar"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "O meu plan non está listado..."
-
-#~ msgid "Provider"
-#~ msgstr "Provedor"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Dispositivo GSM instalado"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Dispositivo CDMA instalado"
-
-#~ msgid "Any device"
-#~ msgstr "Calquera dispositivo"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nova conexión de banda larga móbil"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Este asistente axúdao a configurar a súa conexión de banda larga móbil a "
-#~ "unha rede celular (3G) de forma sinxela."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Vostede precisará a seguinte información:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Nome da operadora de banda larga"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "O nome do plan de facturación de banda larga"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(nalgúns casos) O seu APN do plan de facturación de banda larga (Access "
-#~ "Point Name)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Crear unha conexión para es_te dispositivo de banda larga móbil:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Configurar unha conexión de banda larga móbil"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "País ou estado"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Seleccione o país ou rexión da súa operadora"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Seleccione un provedor desde a _lista:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Non atopo a miña operadora e quero introducila _manualmente:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "O meu provedor emprega a tecnoloxía GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "O meu provedor emprega a tecnoloxía CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Seleccione o seu provedor"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Seleccione o seu plan:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Seleccione o seu plan _APN (Access Point Name):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Aviso: seleccionar un plan incorrecto pode resultar en incidencias de "
-#~ "facturación na conta da banda larga ou pode impedir a conectividade.\n"
-#~ "\n"
-#~ "Se non está seguro do seu plan, pregúntelle á súa operadora polo plan APN."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Seleccione o seu plan de facturación"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "A súa conexión de banda larga móbil está configurada coas seguintes "
-#~ "preferencias:"
-
-#~ msgid "Your Device:"
-#~ msgstr "O seu dispositivo:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "O seu provedor:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "O seu plan:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Estabelecerase unha conexión coa operadora da banda larga móbil usando os "
-#~ "axustes que seleccionou. Se falla a conexión ou non pode acceder aos "
-#~ "recursos de rede, volva comprobar os axustes. Para modificar a "
-#~ "configuración da conexión da banda larga móbil, seleccione «Conexións de "
-#~ "rede» no menú Sistema → Preferencias."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Confirme as preferencias da conexión de banda larga móbil"
-
-#~ msgid "(None)"
-#~ msgstr "(Ningún)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Clave en %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certificado en %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Descoñecido)"
-
-#~ msgid "Select"
-#~ msgstr "Seleccionar"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid "Select from file…"
-#~ msgstr "Seleccionar dun ficheiro..."
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Seleccione un Certificado %s"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Contrasinal do certificado %s:"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Produciuse un erro iniciando sesión en: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Produciuse un erro abrindo a sesión: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "«Token» de des_bloqueo"
-
-#~ msgid "Issued By"
-#~ msgstr "Emitido por"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Introducir o PIN de %s"
-
-#~ msgid "_Login"
-#~ msgstr "_Iniciar a sesión"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Lembrar o PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Gardar só o contrasinal deste usuario"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Gardar o contrasinal de todos os usuarios"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Pedir o contrasinal sempre"
-
-#~ msgid "The password is not required"
-#~ msgstr "Non se precisa contrasinal"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "M_ostrar os contrasinais"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Contrasinal _terciaria:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "Contrasinal _secundario:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Contrasinal:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Prema para conectar"
-
-#~ msgid "New…"
-#~ msgstr "Novo…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Ningún"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP dinámica (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "C_rear"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Requírese o contrasinal ou clave de cifrado para acceder á rede sen fíos "
-#~ "«%s»."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Requírese a autenticación para a rede sen fíos"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "A rede sen fíos require autenticación"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Crear unha rede sen fíos"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Rede sen fíos nova"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Conectarse a unha rede sen fíos oculta"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Rede sen fíos oculta"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Escriba o nome e os detalles de seguranza da rede sen fíos á que quere "
-#~ "conectarse."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Seguranza sen fíos:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Co_nexión:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Adaptador sen fíos:"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Non atopo a miña operadora e quero introducila _manualmente:"
-
-#~ msgid "Provider:"
-#~ msgstr "Provedor:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Lista de paises ou estados:"
-
-#~ msgid "Country or region"
-#~ msgstr "País ou estado"
-
-#~ msgid "Wired"
-#~ msgstr "Con fíos"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Falta o contrasinal ou a conexión é incorrecta. No último caso, debe "
-#~ "editar primeiro a conexión con nm-connection-editor"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Seguranza sen fíos:"
-
-#~ msgid "_Network name:"
-#~ msgstr "Nome da _rede:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Co_nexión:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Adaptador sen fíos:"
-
 #, fuzzy
 #~ msgid "CKN"
 #~ msgstr "CKN:"
diff --git a/po/gu.po b/po/gu.po
index 0e1f8c10..14c31c2f 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: gu\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2014-09-01 21:44+0530\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc kde org>\n"
@@ -22,6 +22,7 @@ msgstr ""
 "\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "નેટવર્ક"
 
@@ -217,15 +218,19 @@ msgstr "802.1X સત્તાધિકરણ"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "જોડાવો (_o)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "નેટવર્ક નામ (_N):"
@@ -574,7 +579,7 @@ msgstr "મોબાઇલ બ્રોડબેન્ડ (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "મોબાઇલ બ્રોડબેન્ડ"
 
@@ -701,7 +706,9 @@ msgstr "DSL સત્તાધિકરણ"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -807,6 +814,7 @@ msgid "Error displaying connection information:"
 msgstr "જોડાણ જાણકારીને દેખાડવામાં ભૂલ:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -957,7 +965,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "પાસવર્ડ:"
@@ -982,7 +990,8 @@ msgstr "VPN બૅનર"
 msgid "Base Connection"
 msgstr "આધાર જોડાણ"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
@@ -1736,6 +1745,7 @@ msgid "_Service"
 msgstr "સેવા (_S):"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2396,6 +2406,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "રોમિંગની પરવાનગી આપો જો ઘરનું નેટવર્ક ઉપલબ્ધ ન હોય તો (_r)"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "પાસવર્ડોને બતાવો (_w)"
 
@@ -2798,13 +2809,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "ઇથરનેટ"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3128,12 +3140,12 @@ msgstr ""
 "જો જોડાણો નિષ્ફળ થાય તો, અમુક પદ્દતિઓ માટે આધારને નિષ્ક્રિય કરવાનું પ્રયત્ન કરો."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "બ્લુટુથ"
 
@@ -3143,22 +3155,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "ઇન્ફિનિબેન્ડ"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "બોન્ડ"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "જૂથ"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "બ્રિજ"
 
@@ -3451,6 +3466,7 @@ msgid "Select a connection to delete"
 msgstr "જૂથ જોડાણ %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "નામ"
 
@@ -3674,6 +3690,8 @@ msgstr "ઇથરનેટ જોડાણ %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "મૂળભૂત"
 
@@ -3901,35 +3919,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "મારો પોષણકર્તા એ CDMA-આધારિત ટેકનોલોજી ને વાપરે છે (_D) (એટલે કે. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4094,10 +4112,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi જોડાણ %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit કી (Hex અથવા ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-બીટ પાસફ્રેઝ"
 
@@ -4106,14 +4126,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "ગતિક WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 વ્યક્તિગત"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 એન્ટરપ્રાઇઝ"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 વ્યક્તિગત"
@@ -4188,6 +4211,482 @@ msgstr "જોડાણ જાણકારી"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "ખાનગી કી (_k):"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "ખાનગી કી પાસવર્ડ (_P):"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "વપરાશકર્તા પ્રમાણપત્ર (_U):"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "મારો દેશ યાદી થયેલ નથી"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "યાદી ન થયેલ"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "મારો પ્લાન યાદી થયેલ નથી..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "પોષણકર્તા"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "સ્થાપિત થયેલ GSM ઉપકરણ"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "સ્થાપિત થયેલ CDMA ઉપકરણ"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "કોઇપણ ઉપકરણ"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "નવું મોબાઇલ બ્રોડબેન્ડ જોડાણ"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"આ મદદકર્તા એ તમને સેલ્યુલર (3G) નેટવર્કમાં મોબાઇલ બ્રોડબેન્ડ જોડાણને સુયોજન કરવાનું સરળ "
+"બનાવવા માટે મદદ કરે છે."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "તમારે નીચેની જાણકારીની જરૂર પડશે:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "તમારુ બ્રોડબેન્ડ પોષણકર્તાનું નામ"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "તમારુ બ્રોડબેન્ડ બિલીંગ પ્લાન નામ"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(અમુક સ્થિતિઓમાં) તમારુ બ્રોડબેન્ડ બિલીંગ પ્લાન APN (Access Point Name)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "આ મોબાઇલ બ્રોડબેન્ડ ઉપકરણ માટે જોડાણને બનાવો (_t):"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "મોબાઇલ બ્રોડબેન્ડ (CDMA) જોડાણ ને સુયોજિત કરો"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "દેશ અથવા પ્રાન્ત (પ્રદેશ)"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "તમારા પોષણકર્તાનાં દેશ અથવા પ્રાન્ત (પ્રદેશ) પસંદ કરો"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "યાદી માંથી તમારા પોષણકર્તાને પસંદ કરો (_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"હું મારા પોષણકર્તાને શોધી શકતો નથી અને હું તેને જાતે જ દાખલ કરવા ઇચ્છા રાખુ છુ (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "મારો પોષણકર્તા એ GSM ટેકનોલોજી ને વાપરે છે (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "મારો પોષણકર્તા એ CDMA ટેકનોલોજીને વાપરે છે (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "તમારા પોષણકર્તાને પસંદ કરો"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "તમારા પ્લાનને પસંદ કરો (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "પસંદ થયેલ પ્લાન APN (Access Point Name) (_A):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"ચેતવણી: અયોગ્ય પ્લાન પસંગ કરવા દરમ્યાન તમારા બ્રોડબેન્ડ ખાતા માટે બિલીંગ મુદ્દાઓને પરિણમી "
+"શકે છે અથવા જોડાણને અટકાવી શકે છે.\n"
+"\n"
+"જો તમારા પ્લાનની ખાતરી ન હોય તો મહેરબાની કરીને તમારા પ્લાનનાં APN માટે તમારા "
+"પોષણકર્તાને પૂછો."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "તમારા બિલીંગ પ્લાનને પસંદ કરો"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "તમારુ મોબાઇલ બ્રોડબેન્ડ જોડાણ એ નીચેનાં સુયોજનો સાથે રૂપરેખાંકિત થયેલ છે:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "તમારુ ઉપકરણ:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "તમારો પોષણકર્તા:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "તમારો પ્લાન:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"જોડાણ એ તમે પસંદ કરેલ છે તે સુયોજનોની મદદથી તમારા મોબાઇલ બ્રોડબેન્ડ પોષણકર્તા માટે હવે "
+"બનાવેલ હશે.  જો જોડાણ નિષ્ફળ થાય તો અથવા તમે નેટવર્ક સ્ત્રોતોને દાખલ કરી શકતા ન હોય "
+"તો, તમારા સુયોજનોને બે વાર ચકાસો.  તમારા મોબાઇલ બ્રોડબેન્ડ જોડાણ સુયોજનોને બદલવા "
+"માટે, સિસ્ટમ >> પસંદગીઓ મેનુ માંથી \"Network Connections\" ને પસંદ કરો."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "મોબાઇલ બ્રોડબેન્ડ સુયોજનોની ખાતરી કરો"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(કંઇ નહિં)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA પ્રમાણપત્ર (_A):"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "અજ્ઞાત"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "વપરાશકર્તા પ્રમાણપત્ર (_U):"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "જોડાણમાં ફેરફાર કરતી વખતે ભૂલ"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "તાળુ ખોલો (_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "આ વપરાશકર્તા માટે ફક્ત પાસવર્ડને સંગ્રહો (_u)"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "બધા વપરાશકર્તાઓ માટે પાસવર્ડને સંગ્રહો (_a)"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "દરેક સમયે આ પાસવર્ડ માટે પૂછો (_k)"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "પાસવર્ડ ને '%s' માં જોડાવાની જરૂરિયાત છે."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "પાસવર્ડોને બતાવો (_o)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "ગૌણ પાસવર્ડ (_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "ગૌણ પાસવર્ડ (_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "પાસવર્ડ (_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "જોડાણ તોડી નાંખો"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "કંઇ નહિં"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "ગતિક WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "બનાવો (_r)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "પાસવર્ડ અથવા એનક્રિપ્શન કીને Wi-Fi નેટવર્ક '%s' ને વાપરવાની જરૂર છે."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi નેટવર્ક સત્તાધિકરણ જરૂરી"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi નેટવર્ક દ્દારા સત્તાધિકરણ જરૂરી"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "નવાં Wi-Fi નેટવર્કને બનાવો"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "નવું Wi-Fi નેટવર્ક"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Wi-Fi નેટવર્ક માટે નામને દાખલ કરો જે તમે બનાવવા ઇચ્છો છો."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "છુપાયેલ Wi-Fi નેટવર્ક સાથે જોડાવો"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "છુપાયેલ Wi-Fi નેટવર્ક"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"તમે તેમાં જોડાવવા માંગો છો તે છુપાયેલ વાયરલેસ નેટવર્કનાં નામ અને સુરક્ષા વિગતોને દાખલ કરો."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "વાયરલેસ સુરક્ષા (_s):"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "જોડાણ (_n):"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi એડપ્ટર (_a):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"હું મારા પોષણકર્તાને શોધી શકતો નથી અને હું તેને જાતે જ દાખલ કરવા ઇચ્છા રાખુ છુ (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "પોષણકર્તા:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "દેશ અથવા પ્રાન્ત (પ્રદેશ) યાદી:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "દેશ અથવા પ્રાન્ત (પ્રદેશ)"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "વાયરવાળુ"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC મેશ"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "વાયરલેસ સુરક્ષા (_s):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "નેટવર્ક નામ (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "જોડાણ (_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi એડપ્ટર (_a):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "વપરાશ:"
@@ -4337,26 +4836,26 @@ msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC ફાઇલને પસંદ કરો..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ફાઇલો (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "બધી ફાઇલો"
 
@@ -4395,16 +4894,16 @@ msgstr "આંતરિક સત્તાધિકરણ (_I):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "આપોઆપ PAC બચાવ માટે પરવાનગી આપે છે (_v)"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4440,15 +4939,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4462,24 +4961,24 @@ msgstr "WEP 128-બીટ પાસફ્રેઝ"
 msgid "Sh_ow passphrase"
 msgstr "પાસવર્ડોને બતાવો (_o)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4488,7 +4987,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "ઓળખાણપત્ર (_d):"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4528,15 +5027,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "સત્તાધિકરણ (_t):"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "ખાનગી કી પાસવર્ડ (_P):"
@@ -4546,33 +5045,33 @@ msgstr "ખાનગી કી પાસવર્ડ (_P):"
 msgid "_Type"
 msgstr "પ્રકાર (_T):"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4602,336 +5101,17 @@ msgstr "કીને બતાવો (_w)"
 msgid "WEP inde_x"
 msgstr "WEP અનુક્રમણિકા (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "ખાનગી કી (_k):"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "ખાનગી કી પાસવર્ડ (_P):"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "વપરાશકર્તા પ્રમાણપત્ર (_U):"
-
-#~ msgid "My country is not listed"
-#~ msgstr "મારો દેશ યાદી થયેલ નથી"
-
-#~ msgid "Unlisted"
-#~ msgstr "યાદી ન થયેલ"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "મારો પ્લાન યાદી થયેલ નથી..."
-
-#~ msgid "Provider"
-#~ msgstr "પોષણકર્તા"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "સ્થાપિત થયેલ GSM ઉપકરણ"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "સ્થાપિત થયેલ CDMA ઉપકરણ"
-
-#~ msgid "Any device"
-#~ msgstr "કોઇપણ ઉપકરણ"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "નવું મોબાઇલ બ્રોડબેન્ડ જોડાણ"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "આ મદદકર્તા એ તમને સેલ્યુલર (3G) નેટવર્કમાં મોબાઇલ બ્રોડબેન્ડ જોડાણને સુયોજન કરવાનું સરળ "
-#~ "બનાવવા માટે મદદ કરે છે."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "તમારે નીચેની જાણકારીની જરૂર પડશે:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "તમારુ બ્રોડબેન્ડ પોષણકર્તાનું નામ"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "તમારુ બ્રોડબેન્ડ બિલીંગ પ્લાન નામ"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(અમુક સ્થિતિઓમાં) તમારુ બ્રોડબેન્ડ બિલીંગ પ્લાન APN (Access Point Name)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "આ મોબાઇલ બ્રોડબેન્ડ ઉપકરણ માટે જોડાણને બનાવો (_t):"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "મોબાઇલ બ્રોડબેન્ડ (CDMA) જોડાણ ને સુયોજિત કરો"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "દેશ અથવા પ્રાન્ત (પ્રદેશ)"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "તમારા પોષણકર્તાનાં દેશ અથવા પ્રાન્ત (પ્રદેશ) પસંદ કરો"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "યાદી માંથી તમારા પોષણકર્તાને પસંદ કરો (_l):"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "હું મારા પોષણકર્તાને શોધી શકતો નથી અને હું તેને જાતે જ દાખલ કરવા ઇચ્છા રાખુ છુ (_m):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "મારો પોષણકર્તા એ GSM ટેકનોલોજી ને વાપરે છે (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "મારો પોષણકર્તા એ CDMA ટેકનોલોજીને વાપરે છે (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "તમારા પોષણકર્તાને પસંદ કરો"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "તમારા પ્લાનને પસંદ કરો (_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "પસંદ થયેલ પ્લાન APN (Access Point Name) (_A):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "ચેતવણી: અયોગ્ય પ્લાન પસંગ કરવા દરમ્યાન તમારા બ્રોડબેન્ડ ખાતા માટે બિલીંગ મુદ્દાઓને "
-#~ "પરિણમી શકે છે અથવા જોડાણને અટકાવી શકે છે.\n"
-#~ "\n"
-#~ "જો તમારા પ્લાનની ખાતરી ન હોય તો મહેરબાની કરીને તમારા પ્લાનનાં APN માટે તમારા "
-#~ "પોષણકર્તાને પૂછો."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "તમારા બિલીંગ પ્લાનને પસંદ કરો"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "તમારુ મોબાઇલ બ્રોડબેન્ડ જોડાણ એ નીચેનાં સુયોજનો સાથે રૂપરેખાંકિત થયેલ છે:"
-
-#~ msgid "Your Device:"
-#~ msgstr "તમારુ ઉપકરણ:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "તમારો પોષણકર્તા:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "તમારો પ્લાન:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "જોડાણ એ તમે પસંદ કરેલ છે તે સુયોજનોની મદદથી તમારા મોબાઇલ બ્રોડબેન્ડ પોષણકર્તા માટે "
-#~ "હવે બનાવેલ હશે.  જો જોડાણ નિષ્ફળ થાય તો અથવા તમે નેટવર્ક સ્ત્રોતોને દાખલ કરી શકતા ન "
-#~ "હોય તો, તમારા સુયોજનોને બે વાર ચકાસો.  તમારા મોબાઇલ બ્રોડબેન્ડ જોડાણ સુયોજનોને "
-#~ "બદલવા માટે, સિસ્ટમ >> પસંદગીઓ મેનુ માંથી \"Network Connections\" ને પસંદ કરો."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "મોબાઇલ બ્રોડબેન્ડ સુયોજનોની ખાતરી કરો"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(કંઇ નહિં)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "CA પ્રમાણપત્ર (_A):"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "અજ્ઞાત"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "વપરાશકર્તા પ્રમાણપત્ર (_U):"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "જોડાણમાં ફેરફાર કરતી વખતે ભૂલ"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "તાળુ ખોલો (_U)"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "આ વપરાશકર્તા માટે ફક્ત પાસવર્ડને સંગ્રહો (_u)"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "બધા વપરાશકર્તાઓ માટે પાસવર્ડને સંગ્રહો (_a)"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "દરેક સમયે આ પાસવર્ડ માટે પૂછો (_k)"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "પાસવર્ડ ને '%s' માં જોડાવાની જરૂરિયાત છે."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "પાસવર્ડોને બતાવો (_o)"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "ગૌણ પાસવર્ડ (_S):"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "ગૌણ પાસવર્ડ (_S):"
-
-#~ msgid "_Password:"
-#~ msgstr "પાસવર્ડ (_P):"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "જોડાણ તોડી નાંખો"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "કંઇ નહિં"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "ગતિક WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "બનાવો (_r)"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr "પાસવર્ડ અથવા એનક્રિપ્શન કીને Wi-Fi નેટવર્ક '%s' ને વાપરવાની જરૂર છે."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wi-Fi નેટવર્ક સત્તાધિકરણ જરૂરી"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Wi-Fi નેટવર્ક દ્દારા સત્તાધિકરણ જરૂરી"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "નવાં Wi-Fi નેટવર્કને બનાવો"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "નવું Wi-Fi નેટવર્ક"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Wi-Fi નેટવર્ક માટે નામને દાખલ કરો જે તમે બનાવવા ઇચ્છો છો."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "છુપાયેલ Wi-Fi નેટવર્ક સાથે જોડાવો"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "છુપાયેલ Wi-Fi નેટવર્ક"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "તમે તેમાં જોડાવવા માંગો છો તે છુપાયેલ વાયરલેસ નેટવર્કનાં નામ અને સુરક્ષા વિગતોને દાખલ "
-#~ "કરો."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "વાયરલેસ સુરક્ષા (_s):"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "જોડાણ (_n):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-Fi એડપ્ટર (_a):"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "હું મારા પોષણકર્તાને શોધી શકતો નથી અને હું તેને જાતે જ દાખલ કરવા ઇચ્છા રાખુ છુ (_m):"
-
-#~ msgid "Provider:"
-#~ msgstr "પોષણકર્તા:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "દેશ અથવા પ્રાન્ત (પ્રદેશ) યાદી:"
-
-#~ msgid "Country or region"
-#~ msgstr "દેશ અથવા પ્રાન્ત (પ્રદેશ)"
-
-#~ msgid "Wired"
-#~ msgstr "વાયરવાળુ"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC મેશ"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "વાયરલેસ સુરક્ષા (_s):"
-
-#~ msgid "_Network name:"
-#~ msgstr "નેટવર્ક નામ (_N):"
-
-#~ msgid "C_onnection:"
-#~ msgstr "જોડાણ (_n):"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-Fi એડપ્ટર (_a):"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (મૂળભૂત)"
 
diff --git a/po/he.po b/po/he.po
index af14f936..05e6a3ff 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2014-03-16 16:19+0200\n"
 "Last-Translator: Yaron Shahrabani <sh yaron gmail com>\n"
 "Language-Team: Gezer (Hebrew)\n"
@@ -21,6 +21,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-11-02 07:32+0000\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "רשת"
 
@@ -214,15 +215,19 @@ msgstr "אימות 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "ה_תחברות"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "שם ה_רשת:"
@@ -574,7 +579,7 @@ msgstr "פס רחב נייד (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "פס רחב נייד"
 
@@ -696,7 +701,9 @@ msgstr "אימות DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -803,6 +810,7 @@ msgid "Error displaying connection information:"
 msgstr "שגיאה בהצגת נתוני החיבור:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -953,7 +961,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "ססמה:‏"
@@ -978,7 +986,8 @@ msgstr "הכרזת ה־VPN"
 msgid "Base Connection"
 msgstr "התקשרות הבסיס"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "לא ידוע"
 
@@ -1754,6 +1763,7 @@ msgid "_Service"
 msgstr "_שירות:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2412,6 +2422,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "מתן אפשרות ל_נדידה אם הרשת הביתית לא זמינה"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "הצ_גת ססמאות"
 
@@ -2815,13 +2826,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "רשת קווית"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3145,12 +3157,12 @@ msgstr ""
 "לנסות לבטל חלק מהשיטות."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "רשת אלחוטית"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3160,22 +3172,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "מאגד"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "גשר"
 
@@ -3476,6 +3491,7 @@ msgid "Select a connection to delete"
 msgstr "חיבור DSL %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "שם"
 
@@ -3700,6 +3716,8 @@ msgstr "חיבור קווי %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "בררת מחדל"
 
@@ -3928,35 +3946,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "הספק שלי משתמש בטכנולוגיה המבוססת על _CDMA ‏(לדוגמה 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4123,10 +4141,12 @@ msgid "Wi-Fi connection %d"
 msgstr "חיבור אלחוטי %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "מפתח WEP בן ‎40/128-bit (הקסדצימלי או ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "ססמת WEP ‏bit-‏128"
 
@@ -4135,14 +4155,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "‏WEP דינאמי (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "‏WPA & WPA2 אישי"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "‏WPA & WPA2 עסקי"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "‏WPA & WPA2 אישי"
@@ -4219,6 +4242,475 @@ msgstr "פרטי החיבור"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "לא _נדרש אישור של רשות אישורים"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "בחירת אישור CA"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "_מפתח פרטי:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "ססמת מפתח _פרטי:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "בחירת אישור CA"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "אישור _משתמש:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "המדינה שלי לא מופיעה"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "לא רשום"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "התכנית שלי לא מופיעה..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "ספק"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "התקן GSM מותקן"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "התקן CDMA מותקן"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "התקן כלשהו"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "חיבור פס רחב נייד חדש"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr "אשף זה עוזר בהגדרה פשוטה חיבור פס נייד רחב לרשת סלולרית (דור שלישי)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "המידע הבא יהיה דרוש לך:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "שם ספק רוחב הפס שלך"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "שם תכנית החיוב שלך"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(בחלק מהמקרים) שם נקודת הגישה (Access Point Name) של תכנית החיוב שלך"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "יצירת חיבור עבור התקן הפס הרחב הנייד ה_זה:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "הגדרת חיבור פס רחב נייד"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "מדינה או אזור"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "נא לבחור את המדינה או האזור של הספק שלך"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "בחירת הספק שלך מ_רשימה:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "אין באפשרותי למצוא את הספק שלי וברצוני להזין אותו _ידנית:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "הספק שלי משתמש בטכנולוגיית GSM ‏(GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "הספק שלי משתמש בטכנולוגיית CDMA ‏(1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "בחירת הספק שלך"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_בחירת התכנית שלך:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "ה־APN (שם נקודת הגישה) של התכנית ה_נבחרת:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"אזהרה: בחירה בתכנית שגויה עלולה ליצור בעיות חיוב בחשבון הפס־רחב או למנוע "
+"התחברות.\n"
+"\n"
+"במקרה של חוסר ודאות בנוגע לתכנית, נא לפנות אל הספק לפרטים."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "בחירת תכנית החיוב"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "חיבור הפס הנייד הרחב שלך הוגדר עם האפשרויות הבאות:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "ההתקן שלך:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "הספק שלך:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "התכנית שלך:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"כעת ייווצר חיבור אל ספק פס־רחב הנייד לפי ההגדרות שבחרת. אם החיבור נכשל או "
+"שאין גישה למשאבי רשת, נא לבדוק את ההגדרות שבחרת. כדי לשנות את הגדרות הפס־רחב "
+"הנייד, יש לבחור ב\"חיבורי רשת\" דרך התפריט מערכת >> העדפות."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "אישור הגדרות פס רחב נייד"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(אין)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "אישור C_A:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "לא ידוע"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "בחר קובץ"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "בחר קובץ"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "בחירת אישור CA"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "אישור _משתמש:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "שגיאה בעריכת החיבור"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_שחרור"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "_בקשת ססמה זו בכול פעם"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "נדרשת ססמה כדי להתחבר ל־'%s'."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "הצ_גת ססמאות"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "ססמה מ_שנית:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "ססמה מ_שנית:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_ססמה:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "הנתקות"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "אין"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "‏WEP דינאמי (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "י_צירה"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "נדרשים ססמאות או מפתחות הצפנה כדי לגשת לרשת האלחוטית '%s'."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "נדרש אימות לרשת האלחוטית"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "הרשת האלחוטית דורשת אימות"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "יצירת רשת אלחוטית חדשה"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "רשת אלחוטית חדשה"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "נא להזין את שם הרשת האלחוטית שברצונך ליצור."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "התחברות לרשת אלחוטית סמויה"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "רשת אלחוטית סמויה"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"נא להקליד את השם ואת פרטי האבטחה של הרשת האלחוטית הסמויה שברצונך להתחבר אליה."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "אבטחת רשת אל_חוטית:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "חי_בור:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "מ_תאם רשת אלחוטית:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "אין באפשרותי למצוא את הספק שלי וברצוני להזין אותו _ידנית:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "ספק:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "מדינה או רשימת אזורים:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "מדינה או אזור"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "קווי"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "רישות OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "אבטחת רשת אל_חוטית:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "שם ה_רשת:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "חי_בור:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "מ_תאם רשת אלחוטית:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "ניצול:"
@@ -4369,26 +4861,26 @@ msgstr "לא _נדרש אישור של רשות אישורים"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "נא לבחור בקובץ PAC..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "קובצי PAC‏ (‎*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "כל הקבצים"
 
@@ -4427,16 +4919,16 @@ msgstr "אימות _פנימי:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_מתן האפשרות לבדיקת PAC אוטומטית"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4472,15 +4964,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4494,24 +4986,24 @@ msgstr "ססמת WEP ‏bit-‏128"
 msgid "Sh_ow passphrase"
 msgstr "הצ_גת ססמאות"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "לא _נדרש אישור של רשות אישורים"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4520,7 +5012,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "ז_הות:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4560,15 +5052,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_אימות:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "ססמת מפתח _פרטי:"
@@ -4578,33 +5070,33 @@ msgstr "ססמת מפתח _פרטי:"
 msgid "_Type"
 msgstr "_סוג:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4634,331 +5126,17 @@ msgstr "הצ_גת מפתח"
 msgid "WEP inde_x"
 msgstr "_אינדקס WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "לא _נדרש אישור של רשות אישורים"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "בחירת אישור CA"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "_מפתח פרטי:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "ססמת מפתח _פרטי:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "בחירת אישור CA"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "אישור _משתמש:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "המדינה שלי לא מופיעה"
-
-#~ msgid "Unlisted"
-#~ msgstr "לא רשום"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "התכנית שלי לא מופיעה..."
-
-#~ msgid "Provider"
-#~ msgstr "ספק"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "התקן GSM מותקן"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "התקן CDMA מותקן"
-
-#~ msgid "Any device"
-#~ msgstr "התקן כלשהו"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "חיבור פס רחב נייד חדש"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "אשף זה עוזר בהגדרה פשוטה חיבור פס נייד רחב לרשת סלולרית (דור שלישי)."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "המידע הבא יהיה דרוש לך:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "שם ספק רוחב הפס שלך"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "שם תכנית החיוב שלך"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(בחלק מהמקרים) שם נקודת הגישה (Access Point Name) של תכנית החיוב שלך"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "יצירת חיבור עבור התקן הפס הרחב הנייד ה_זה:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "הגדרת חיבור פס רחב נייד"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "מדינה או אזור"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "נא לבחור את המדינה או האזור של הספק שלך"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "בחירת הספק שלך מ_רשימה:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "אין באפשרותי למצוא את הספק שלי וברצוני להזין אותו _ידנית:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "הספק שלי משתמש בטכנולוגיית GSM ‏(GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "הספק שלי משתמש בטכנולוגיית CDMA ‏(1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "בחירת הספק שלך"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_בחירת התכנית שלך:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "ה־APN (שם נקודת הגישה) של התכנית ה_נבחרת:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "אזהרה: בחירה בתכנית שגויה עלולה ליצור בעיות חיוב בחשבון הפס־רחב או למנוע "
-#~ "התחברות.\n"
-#~ "\n"
-#~ "במקרה של חוסר ודאות בנוגע לתכנית, נא לפנות אל הספק לפרטים."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "בחירת תכנית החיוב"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "חיבור הפס הנייד הרחב שלך הוגדר עם האפשרויות הבאות:"
-
-#~ msgid "Your Device:"
-#~ msgstr "ההתקן שלך:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "הספק שלך:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "התכנית שלך:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "כעת ייווצר חיבור אל ספק פס־רחב הנייד לפי ההגדרות שבחרת. אם החיבור נכשל או "
-#~ "שאין גישה למשאבי רשת, נא לבדוק את ההגדרות שבחרת. כדי לשנות את הגדרות הפס־"
-#~ "רחב הנייד, יש לבחור ב\"חיבורי רשת\" דרך התפריט מערכת >> העדפות."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "אישור הגדרות פס רחב נייד"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(אין)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "אישור C_A:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "לא ידוע"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "בחר קובץ"
-
-#, fuzzy
-#~ msgid "Select from file…"
-#~ msgstr "בחר קובץ"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "בחירת אישור CA"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "אישור _משתמש:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "שגיאה בעריכת החיבור"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_שחרור"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "_בקשת ססמה זו בכול פעם"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "נדרשת ססמה כדי להתחבר ל־'%s'."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "הצ_גת ססמאות"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "ססמה מ_שנית:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "ססמה מ_שנית:"
-
-#~ msgid "_Password:"
-#~ msgstr "_ססמה:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "הנתקות"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "אין"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "‏WEP דינאמי (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "י_צירה"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr "נדרשים ססמאות או מפתחות הצפנה כדי לגשת לרשת האלחוטית '%s'."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "נדרש אימות לרשת האלחוטית"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "הרשת האלחוטית דורשת אימות"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "יצירת רשת אלחוטית חדשה"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "רשת אלחוטית חדשה"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "נא להזין את שם הרשת האלחוטית שברצונך ליצור."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "התחברות לרשת אלחוטית סמויה"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "רשת אלחוטית סמויה"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "נא להקליד את השם ואת פרטי האבטחה של הרשת האלחוטית הסמויה שברצונך להתחבר "
-#~ "אליה."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "אבטחת רשת אל_חוטית:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "חי_בור:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "מ_תאם רשת אלחוטית:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "אין באפשרותי למצוא את הספק שלי וברצוני להזין אותו _ידנית:"
-
-#~ msgid "Provider:"
-#~ msgstr "ספק:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "מדינה או רשימת אזורים:"
-
-#~ msgid "Country or region"
-#~ msgstr "מדינה או אזור"
-
-#~ msgid "Wired"
-#~ msgstr "קווי"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "רישות OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "אבטחת רשת אל_חוטית:"
-
-#~ msgid "_Network name:"
-#~ msgstr "שם ה_רשת:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "חי_בור:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "מ_תאם רשת אלחוטית:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (בררת מחדל)"
 
diff --git a/po/hi.po b/po/hi.po
index 9e766b16..0a558521 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet.master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2013-03-24 13:57+0000\n"
 "Last-Translator: chandankumar <chandankumar 093047 gmail com>\n"
 "Language-Team: Hindi <kde-i18n-doc kde org>\n"
@@ -30,6 +30,7 @@ msgstr ""
 "X-Generator: Lokalize 1.5\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "संजाल"
 
@@ -216,15 +217,19 @@ msgstr "802.1X सत्यापन"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "कनेक्ट (_o)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "संजाल नाम (_N):"
@@ -575,7 +580,7 @@ msgstr "मोबाइल ब्रॉडबैंड (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "मोबाइल ब्रॉडबैंड"
 
@@ -697,7 +702,9 @@ msgstr "DSL सत्यापन"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -803,6 +810,7 @@ msgid "Error displaying connection information:"
 msgstr "कनेक्शन संबंधन दिखाने में त्रुटि:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -953,7 +961,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "पासवर्ड: "
@@ -978,7 +986,8 @@ msgstr "VPN ध्वज"
 msgid "Base Connection"
 msgstr "आधार कनेक्शन"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "अज्ञात"
 
@@ -1746,6 +1755,7 @@ msgid "_Service"
 msgstr "सेवा (_S):"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2405,6 +2415,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "रोमिंग स्वीकारें यदि घर संजाल उपलब्ध नहीं है (_r)"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "कूटशब्द दिखाएँ (_w)"
 
@@ -2808,13 +2819,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "इथरनेट"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3138,12 +3150,12 @@ msgstr ""
 "कनेक्शन विफल रहता है, कुछ विधियों के लिए समर्थन निष्क्रिय करने की कोशिश करें."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "वाई फाई"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "ब्लूटूथ"
 
@@ -3153,22 +3165,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "बंधन"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "पुल"
 
@@ -3463,6 +3478,7 @@ msgid "Select a connection to delete"
 msgstr "DSL कनेक्शन %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "नाम"
 
@@ -3687,6 +3703,8 @@ msgstr "तारयुक्त संबंधन %d "
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "डिफ़ॉल्ट"
 
@@ -3915,35 +3933,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "मेरा प्रदाता CDMA-आधारित तकनीक चुनता है (यानी. 1xRTT, EVDO) (_D)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "जीएसएम"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "पीएपी"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "सीएचएपी"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4110,10 +4128,12 @@ msgid "Wi-Fi connection %d"
 msgstr "वाई - फाई संबंधन %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-बिट कुंजी (हेक्स या ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit पासफ्रेज"
 
@@ -4122,14 +4142,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "गतिशील WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 निजी"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 एंटरप्राइज"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 निजी"
@@ -4204,6 +4227,480 @@ msgstr "कनेक्शन जानकारी"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "सीए प्रमाणपत्र चुनें"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "निजी कुंजी (_k):"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "निजी कुंजी कूटशब्द (_P):"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "सीए प्रमाणपत्र चुनें"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "उपयोक्ता प्रमाणपत्र (_U):"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "मेरा देश सूचीबद्ध नहीं है"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "गैर सूचीबद्ध"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "मेरा प्लान सूचीबद्ध नहीं है..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "प्रदाता"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "संस्थापित जीएसएम युक्तियां"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "संस्थापित CDMA युक्ति"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "कोई युक्तियां"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "नया मोबाइल ब्रॉडबैंड कनेक्शन"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"यह सहायक आपको मोबाइल ब्रॉडबैंड कनेक्शन को किसी सेल्यूलर (3G) संजाल से आसानी से सेटअप "
+"करता है."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "आपको निम्नलिखित सूचना की जरूरत होगी:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "आपके ब्रॉडबैंड प्रदाता का नाम"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "आपका ब्रॉडबैंड बिलिंग प्लान नाम"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(कुछ स्थितियों में) आपका ब्रॉडबैंड बिलिंग प्लान APN (एक्सेस प्वाइंट नाम)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "इस मोबाइल ब्रॉडबैंड युक्ति के लिए कोई कनेक्शन बनाएँ (_t):"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "मोबाइल ब्रॉडबैंड कनेक्शन सेटअप करें"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "देश या क्षेत्र"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "अपने प्रदाता के देश या क्षेत्र चुनें"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "सूची से अपना प्रदाता चुनें (_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "मैं अपने प्रदाता नहीं ढूँढ़ सकता हूँ और मैं इसे दस्ती रूप से दाखिल करना चाहता हूँ (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "मेरा प्रदाता GSM तकनीकी उपयोग करता है (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "मेरा प्रदाता CDMA तकनीकी उपयोग करता है (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "अपना प्रदाता चुनें"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "अपना प्लान चुनें (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "चुनी गई योजना (_A) (एक्सेस प्वाइंट नाम):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"चेतावनी: कोई गलत योजना को चुनना बिलिंग मुद्दा का परिणाम देगा आपके ब्रॉडबैंड खाता के लिए "
+"या कनेक्टिविटी को रोक सकता है.\n"
+"\n"
+"यदि आप अपनी योजना के बारे में अनिश्चित हैं तो कृपया अपने प्रदाता से अपनी प्लान के APN के "
+"बारे में पूछें."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "अपना बिलिंग प्लान चुनें"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "आपका मोबाइल ब्रॉडबैंड कनेक्शन निम्नलिखित सेटिंग के साथ विन्यस्त है:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "आपका उपकरण:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "आपका प्रदाता:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "आपकी प्लान:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+" A connection will now be made to your mobile broadband provider using the "
+"settings you selected.  If the connection fails or you cannot access network "
+"resources, double-check your settings.  To modify your mobile broadband "
+"connection settings, choose \"Network Connections\" from the System >> "
+"Preferences menu."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "मोबाइल ब्रॉडबैंड सेटिंग की पुष्टि करें"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(कोई नहीं)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "सीए प्रमाणपत्र (_A):"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "अज्ञात"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "सीए प्रमाणपत्र चुनें"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "उपयोक्ता प्रमाणपत्र (_U):"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "त्रुटि संपादन कनेक्शन"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "अनलॉक करें (_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "इस कूटशब्द के लिए हर समय पूछें (_k)"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "एक कूटशब्द '%s' में कनेक्ट होने के लिए जरूरी है."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "कूटशब्द दिखाएँ (_w)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "कूटशब्द (_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "कूटशब्द (_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "कूटशब्द (_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "डिस्कनेक्ट"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "कुछ नहीं"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "गतिशील WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "बनाएँ (_r)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "कूटशब्द या गोपन कुंजी वाई फाई  संजाल '%s' की पहुँच के लिए जरूरी है."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "वाई फाई नेटवर्क प्रमाणीकरण आवश्यक"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "वाई फाईसंजाल द्वारा प्रमाणीकरण जरूरी"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "नया वाई फाई नेटवर्क बनाएँ"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "नया वाई फाई संजाल"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "अपने बनाए जाने वाले वाई - फाई संजाल के लिए नाम दर्ज करें."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "छुपे वाई फाई  संजाल से कनेक्ट करें"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "छुपा वाई फाई  संजाल"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"छुपे वाई फाई  संजाल के सुरक्षा विवरण और नाम को दर्ज करें जिसमें आप कनेक्ट करना चाहते हैं."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "वाई फाई सुरक्षा (_s):"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "कनेक्शन (_n):"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "वाई फाई एडाप्टर (_a):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "मैं अपने प्रदाता नहीं ढूँढ़ सकता हूँ और मैं इसे दस्ती रूप से दाखिल करना चाहता हूँ (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "प्रदाता:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "देश या क्षेत्र सूची:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "देश या क्षेत्र"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "तारयुक्त"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC जाल"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "पीसीआई"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "यूएसबी"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "वाई फाई सुरक्षा (_s):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "संजाल नाम (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "कनेक्शन (_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "वाई फाई एडाप्टर (_a):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "प्रयोग:"
@@ -4354,26 +4851,26 @@ msgstr "किसी सीए प्रमाणपत्र की जरू
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC फ़ाइल चुनें ..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC फ़ाइल (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "सभी फ़ाइलें"
 
@@ -4412,16 +4909,16 @@ msgstr "आंतरिक सत्यापन: (_I)"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "स्वत: PAC pro_visioning की अनुमति दें"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "एमडी5"
@@ -4457,15 +4954,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4479,24 +4976,24 @@ msgstr "WEP 128-bit पासफ्रेज"
 msgid "Sh_ow passphrase"
 msgstr "कूटशब्द दिखाएँ (_w)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4505,7 +5002,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "पहचान (_d):"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4545,15 +5042,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "सत्यापन: (_t)"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "निजी कुंजी कूटशब्द (_P):"
@@ -4563,33 +5060,33 @@ msgstr "निजी कुंजी कूटशब्द (_P):"
 msgid "_Type"
 msgstr "प्रकार (_T):"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4619,329 +5116,17 @@ msgstr "कुंजी दिखाएँ (_w)"
 msgid "WEP inde_x"
 msgstr "WEP सूची (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "सीए प्रमाणपत्र चुनें"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "निजी कुंजी (_k):"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "निजी कुंजी कूटशब्द (_P):"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "सीए प्रमाणपत्र चुनें"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "उपयोक्ता प्रमाणपत्र (_U):"
-
-#~ msgid "My country is not listed"
-#~ msgstr "मेरा देश सूचीबद्ध नहीं है"
-
-#~ msgid "Unlisted"
-#~ msgstr "गैर सूचीबद्ध"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "मेरा प्लान सूचीबद्ध नहीं है..."
-
-#~ msgid "Provider"
-#~ msgstr "प्रदाता"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "संस्थापित जीएसएम युक्तियां"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "संस्थापित CDMA युक्ति"
-
-#~ msgid "Any device"
-#~ msgstr "कोई युक्तियां"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "नया मोबाइल ब्रॉडबैंड कनेक्शन"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "यह सहायक आपको मोबाइल ब्रॉडबैंड कनेक्शन को किसी सेल्यूलर (3G) संजाल से आसानी से सेटअप "
-#~ "करता है."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "आपको निम्नलिखित सूचना की जरूरत होगी:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "आपके ब्रॉडबैंड प्रदाता का नाम"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "आपका ब्रॉडबैंड बिलिंग प्लान नाम"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(कुछ स्थितियों में) आपका ब्रॉडबैंड बिलिंग प्लान APN (एक्सेस प्वाइंट नाम)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "इस मोबाइल ब्रॉडबैंड युक्ति के लिए कोई कनेक्शन बनाएँ (_t):"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "मोबाइल ब्रॉडबैंड कनेक्शन सेटअप करें"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "देश या क्षेत्र"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "अपने प्रदाता के देश या क्षेत्र चुनें"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "सूची से अपना प्रदाता चुनें (_l):"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "मैं अपने प्रदाता नहीं ढूँढ़ सकता हूँ और मैं इसे दस्ती रूप से दाखिल करना चाहता हूँ (_m):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "मेरा प्रदाता GSM तकनीकी उपयोग करता है (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "मेरा प्रदाता CDMA तकनीकी उपयोग करता है (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "अपना प्रदाता चुनें"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "अपना प्लान चुनें (_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "चुनी गई योजना (_A) (एक्सेस प्वाइंट नाम):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "चेतावनी: कोई गलत योजना को चुनना बिलिंग मुद्दा का परिणाम देगा आपके ब्रॉडबैंड खाता के "
-#~ "लिए या कनेक्टिविटी को रोक सकता है.\n"
-#~ "\n"
-#~ "यदि आप अपनी योजना के बारे में अनिश्चित हैं तो कृपया अपने प्रदाता से अपनी प्लान के APN "
-#~ "के बारे में पूछें."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "अपना बिलिंग प्लान चुनें"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "आपका मोबाइल ब्रॉडबैंड कनेक्शन निम्नलिखित सेटिंग के साथ विन्यस्त है:"
-
-#~ msgid "Your Device:"
-#~ msgstr "आपका उपकरण:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "आपका प्रदाता:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "आपकी प्लान:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ " A connection will now be made to your mobile broadband provider using "
-#~ "the settings you selected.  If the connection fails or you cannot access "
-#~ "network resources, double-check your settings.  To modify your mobile "
-#~ "broadband connection settings, choose \"Network Connections\" from the "
-#~ "System >> Preferences menu."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "मोबाइल ब्रॉडबैंड सेटिंग की पुष्टि करें"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(कोई नहीं)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "सीए प्रमाणपत्र (_A):"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "अज्ञात"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "सीए प्रमाणपत्र चुनें"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "उपयोक्ता प्रमाणपत्र (_U):"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "त्रुटि संपादन कनेक्शन"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "अनलॉक करें (_U)"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "इस कूटशब्द के लिए हर समय पूछें (_k)"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "एक कूटशब्द '%s' में कनेक्ट होने के लिए जरूरी है."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "कूटशब्द दिखाएँ (_w)"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "कूटशब्द (_P):"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "कूटशब्द (_P):"
-
-#~ msgid "_Password:"
-#~ msgstr "कूटशब्द (_P):"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "डिस्कनेक्ट"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "कुछ नहीं"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "गतिशील WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "बनाएँ (_r)"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr "कूटशब्द या गोपन कुंजी वाई फाई  संजाल '%s' की पहुँच के लिए जरूरी है."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "वाई फाई नेटवर्क प्रमाणीकरण आवश्यक"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "वाई फाईसंजाल द्वारा प्रमाणीकरण जरूरी"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "नया वाई फाई नेटवर्क बनाएँ"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "नया वाई फाई संजाल"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "अपने बनाए जाने वाले वाई - फाई संजाल के लिए नाम दर्ज करें."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "छुपे वाई फाई  संजाल से कनेक्ट करें"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "छुपा वाई फाई  संजाल"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "छुपे वाई फाई  संजाल के सुरक्षा विवरण और नाम को दर्ज करें जिसमें आप कनेक्ट करना चाहते हैं."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "वाई फाई सुरक्षा (_s):"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "कनेक्शन (_n):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "वाई फाई एडाप्टर (_a):"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "मैं अपने प्रदाता नहीं ढूँढ़ सकता हूँ और मैं इसे दस्ती रूप से दाखिल करना चाहता हूँ (_m):"
-
-#~ msgid "Provider:"
-#~ msgstr "प्रदाता:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "देश या क्षेत्र सूची:"
-
-#~ msgid "Country or region"
-#~ msgstr "देश या क्षेत्र"
-
-#~ msgid "Wired"
-#~ msgstr "तारयुक्त"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC जाल"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "पीसीआई"
-
-#~ msgid "USB"
-#~ msgstr "यूएसबी"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "वाई फाई सुरक्षा (_s):"
-
-#~ msgid "_Network name:"
-#~ msgstr "संजाल नाम (_N):"
-
-#~ msgid "C_onnection:"
-#~ msgstr "कनेक्शन (_n):"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "वाई फाई एडाप्टर (_a):"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s डिफ़ॉल्ट"
 
diff --git a/po/hr.po b/po/hr.po
index ce7377b3..cc8f517f 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2019-09-03 19:11+0200\n"
 "Last-Translator: gogo <linux hr protonmail com>\n"
 "Language-Team: Croatian <hr li org>\n"
@@ -22,6 +22,7 @@ msgstr ""
 "X-Generator: Poedit 2.2.1\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Mreža"
 
@@ -216,15 +217,19 @@ msgstr "802.1X ovjera"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Spoji se"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Naziv mreže"
 
@@ -569,7 +574,7 @@ msgstr "Mobilno širokopojasno povezivanje (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobilno širokopojasno povezivanje"
 
@@ -691,7 +696,9 @@ msgstr "DSL ovjera"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_U redu"
 
@@ -796,6 +803,7 @@ msgid "Error displaying connection information:"
 msgstr "Greška prikaza informacija povezivanja:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -941,7 +949,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Pristupna točka"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "Lozinka"
 
@@ -965,7 +973,8 @@ msgstr "VPN natpis"
 msgid "Base Connection"
 msgstr "Osnovno povezivanje"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Nepoznato"
 
@@ -1721,6 +1730,7 @@ msgid "_Service"
 msgstr "_Usluga"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2376,6 +2386,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Dopusti _roaming ako matična mreža nije dostupna"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Prikaž_i lozinku"
 
@@ -2785,13 +2796,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Žična mreža"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3111,12 +3123,12 @@ msgstr ""
 "načine ovjere.  Ako povezivanje ne uspije, pokušajte onemogućiti neki način."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Bežična mreža"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3126,22 +3138,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Povezano"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Udruženo"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Premošteno"
 
@@ -3434,6 +3449,7 @@ msgid "Select a connection to delete"
 msgstr "Odaberi povezivanje za brisanje"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Naziv"
 
@@ -3644,6 +3660,8 @@ msgstr "Žično povezivanje %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Zadano"
 
@@ -3875,35 +3893,35 @@ msgstr ""
 "Moj pružatelj usluge koristi tehnologiju temeljenu na C_DMA-u (tj. 1xRTT, "
 "EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4061,10 +4079,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Bežično povezivanje %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitni ključ (heksadecimalni ili ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bitna lozinka"
 
@@ -4073,14 +4093,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Promjenjivi WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 osobni"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 tvrtke"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 osobni"
@@ -4156,6 +4179,466 @@ msgstr "Informacije povezivanja"
 msgid "_Close"
 msgstr "_Zatvori"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr "Skenirajte sa svojim telefonom ili <a href=\"nma:print\">Ispišite</a>"
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Nema postavljenih vjerodajnica"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Nema postavljenih ključeva"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Odaberite svoj ključ za %s vjerodajnicu"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "%s privatni _ključ"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "%s lozinka _ključa"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Odaberite %s vjerodajnicu"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "%s _vjerodajnica"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Moja država nije navedena"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Nenavedeno"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Moj plan nije naveden…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Pružatelj usluge"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Instaliran GSM uređaj"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Instaliran CDMA uređaj"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Bilo koji uređaj"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Novo mobilno širokopojasno povezivanje"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Ovaj pomoćnik vam pomaže jednostavno podesiti mobilno širokopojasno "
+"povezivanje na mobilnu (3G) mrežu."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Bit će vam potrebne sljedeće informacije:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Naziv vašeg pružatelja usluge"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Naziv plana naplate vašeg pružatelja usluge"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(u nekim slučajevima) NPT (Naziv Pristupne Točke) vašeg plana naplate "
+"mobilnog interneta"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Stvori povezivanje za _ovaj uređaj mobilnog širokopojasnog Interneta:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Postavite povezivanje mobilnog širokopojasnog Interneta"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "Država ili regija:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Odaberite državu ili regiju vašeg pružatelja usluge"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Odaberite svojeg pružatelja usluge s _popisa:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"Ne mogu pronaći svojega pružatelja usluge i želim povezivanje postaviti "
+"_ručno:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Moj pružatelj usluge koristi GSM tehnologiju (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Moj pružatelj usluge koristi CDMA tehnologiju (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Odaberite svojeg pružatelja usluge"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Odaberite svoj plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Odabrani plan _NPT (Naziv Pristupne Točke):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Upozorenje: Odabir krivog plana može uzrokovati financijske troškove na "
+"vašem računu mobilnog interneta ili spriječiti povezivanje.\n"
+"\n"
+"Ako niste sigurni koji plan trebate koristiti, upitajte svojeg pružatelja "
+"mobilnog interneta koji je NPT (Naziv Pristupne Točke) vašeg plana."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Odaberite svoj način naplate"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Vaše mobilno širokopojasno povezivanje je podešeno sa sljedećim postavkama:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Vaš uređaj:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Vaš pružatelj usluge:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Vaš plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Koristeći odabrane postavke, sada će se uspostaviti povezivanje prema vašem "
+"pružatelju usluge mobilnog Interneta.  Ako povezivanje ne uspije ili ne "
+"možete pristupiti mrežnim resursima, ponovno provjerite svoje postavke.  "
+"Kako biste uredili postavke svog mobilnog Internet povezivanja, odaberite "
+"\"Mrežno povezivanje\" u izborniku Sustav → Postavke."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Potvrdi mobilne širokopojasne postavke"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(nijedan)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Ključ u %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Vjerodajnica u %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(nepoznato)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Odaberi"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Odustani"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Odaberi iz datoteke…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Odaberite %s vjerodajnicu"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "Lozinka %s _vjerodajnice"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Greška prijave: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Greška pri otvaranju sesije: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Token otključvanja"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Izdao"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Upiši %s PIN"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Prijava"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Zapamti PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Spremi lozinku samo za ovog korisnika"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Spremi lozinku za sve korisnike"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Pitaj za ovu lozinku svaki puta"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Lozinka nije potrebna"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Pr_kaži lozinke"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Treća lozinka:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Druga lozinka:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Lozinka:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Klikni za povezivanje"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Novo…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Nijedno"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Promjenjivi WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "S_tvori"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, 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/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Potrebna je ovjera bežične mreže"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Potrebna je ovjera bežične mreže"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Stvori novu bežičnu mrežu"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nova bežična mreža"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+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/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Poveži se na skrivenu bežičnu mrežu"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Skrivena bežična mreža"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Upišite naziv i sigurnosne pojedinosti skrivene mreže na koju se želite "
+"povezati."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Bežična _sigurnost"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "P_ovezivanje"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Bežični _uređaj"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Ne mogu pronaći svojeg pružatelja usluge i želim ga unijeti _ručno:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Pružatelj usluge:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Popis država ili regija:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Država ili regija"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Žična mreža"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC mreža"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Ili lozinka nedostaje ili je povezivanje neispravno. U drugom slučaju, "
+"morate urediti povezivanje s nm-connection-editor prvo"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Bežična _sigurnost:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Naziv mreže:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "P_ovezivanje:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Bežični _uređaj:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Upotreba:"
@@ -4304,25 +4787,25 @@ msgstr "nema odabrane CA vjerodajnice"
 msgid "selected CA certificate file does not exist"
 msgstr "odabrana datoteka CA vjerodajnice ne postoji"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "nedostaje EAP-FAST PAC datoteka"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Odaberite PAC datoteku"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC datoteke (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Sve datoteke"
 
@@ -4358,16 +4841,16 @@ msgstr "_Unutarnja ovjera"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Dopusti automatsko PAC dodijelji_vanje"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "nedostaje EAP-LEAP korisničko ime"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "nedostaje EAP-LEAP lozinka"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4402,15 +4885,15 @@ msgstr "Sufiks naziva vjerodajnice poslužitelja."
 msgid "_Domain"
 msgstr "_Domena"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "nedostaje EAP korisničko ime"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "nedostaje EAP lozinka"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "nedostaje lozinka privatnog ključa EAP klijenta"
 
@@ -4422,23 +4905,23 @@ msgstr "L_ozinka privatnog ključa"
 msgid "Sh_ow passphrase"
 msgstr "P_rikaži lozinku"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "nedostaje EAP-TLS identitet"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "nema odabrane korisničke vjerodajnice"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "odabrana datoteka korisničke vjerodajnice ne postoji"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "nema odabranog ključa"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "odabrana datoteka ključa ne postoji"
 
@@ -4446,7 +4929,7 @@ msgstr "odabrana datoteka ključa ne postoji"
 msgid "I_dentity"
 msgstr "I_dentitet"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP)"
 
@@ -4484,15 +4967,15 @@ msgstr "Vanjski podešeno"
 msgid "Au_thentication"
 msgstr "Ov_jera"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "nedostaje leap-korisničko_ime"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "nedostaje leap-lozinka"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "nedostaje EAP lozinka"
@@ -4501,25 +4984,25 @@ msgstr "nedostaje EAP lozinka"
 msgid "_Type"
 msgstr "_Vrsta"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "nedostaje wep-ključ"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4528,11 +5011,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "neispravan wep-ključ: lozinka mora biti kraća od 64 znamenke"
 
@@ -4560,7 +5043,7 @@ msgstr "Prika_ži ključ"
 msgid "WEP inde_x"
 msgstr "WEP inde_ks"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4569,361 +5052,11 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
 
-#~ 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>"
-
-#~ msgid "No certificate set"
-#~ msgstr "Nema postavljenih vjerodajnica"
-
-#~ msgid "No key set"
-#~ msgstr "Nema postavljenih ključeva"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Odaberite svoj ključ za %s vjerodajnicu"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "%s privatni _ključ"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "%s lozinka _ključa"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Odaberite %s vjerodajnicu"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s _vjerodajnica"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Moja država nije navedena"
-
-#~ msgid "Unlisted"
-#~ msgstr "Nenavedeno"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Moj plan nije naveden…"
-
-#~ msgid "Provider"
-#~ msgstr "Pružatelj usluge"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Instaliran GSM uređaj"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Instaliran CDMA uređaj"
-
-#~ msgid "Any device"
-#~ msgstr "Bilo koji uređaj"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Novo mobilno širokopojasno povezivanje"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Ovaj pomoćnik vam pomaže jednostavno podesiti mobilno širokopojasno "
-#~ "povezivanje na mobilnu (3G) mrežu."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Bit će vam potrebne sljedeće informacije:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Naziv vašeg pružatelja usluge"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Naziv plana naplate vašeg pružatelja usluge"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(u nekim slučajevima) NPT (Naziv Pristupne Točke) vašeg plana naplate "
-#~ "mobilnog interneta"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr ""
-#~ "Stvori povezivanje za _ovaj uređaj mobilnog širokopojasnog Interneta:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Postavite povezivanje mobilnog širokopojasnog Interneta"
-
-#~ msgid "Country or region:"
-#~ msgstr "Država ili regija:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Odaberite državu ili regiju vašeg pružatelja usluge"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Odaberite svojeg pružatelja usluge s _popisa:"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "Ne mogu pronaći svojega pružatelja usluge i želim povezivanje postaviti "
-#~ "_ručno:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr ""
-#~ "Moj pružatelj usluge koristi GSM tehnologiju (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Moj pružatelj usluge koristi CDMA tehnologiju (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Odaberite svojeg pružatelja usluge"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Odaberite svoj plan:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Odabrani plan _NPT (Naziv Pristupne Točke):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Upozorenje: Odabir krivog plana može uzrokovati financijske troškove na "
-#~ "vašem računu mobilnog interneta ili spriječiti povezivanje.\n"
-#~ "\n"
-#~ "Ako niste sigurni koji plan trebate koristiti, upitajte svojeg pružatelja "
-#~ "mobilnog interneta koji je NPT (Naziv Pristupne Točke) vašeg plana."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Odaberite svoj način naplate"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Vaše mobilno širokopojasno povezivanje je podešeno sa sljedećim "
-#~ "postavkama:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Vaš uređaj:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Vaš pružatelj usluge:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Vaš plan:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Koristeći odabrane postavke, sada će se uspostaviti povezivanje prema "
-#~ "vašem pružatelju usluge mobilnog Interneta.  Ako povezivanje ne uspije "
-#~ "ili ne možete pristupiti mrežnim resursima, ponovno provjerite svoje "
-#~ "postavke.  Kako biste uredili postavke svog mobilnog Internet "
-#~ "povezivanja, odaberite \"Mrežno povezivanje\" u izborniku Sustav → "
-#~ "Postavke."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Potvrdi mobilne širokopojasne postavke"
-
-#~ msgid "(None)"
-#~ msgstr "(nijedan)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Ključ u %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Vjerodajnica u %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(nepoznato)"
-
-#~ msgid "Select"
-#~ msgstr "Odaberi"
-
-#~ msgid "Cancel"
-#~ msgstr "Odustani"
-
-#~ msgid "Select from file…"
-#~ msgstr "Odaberi iz datoteke…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Odaberite %s vjerodajnicu"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Lozinka %s _vjerodajnice"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Greška prijave: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Greška pri otvaranju sesije: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Token otključvanja"
-
-#~ msgid "Issued By"
-#~ msgstr "Izdao"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Upiši %s PIN"
-
-#~ msgid "_Login"
-#~ msgstr "_Prijava"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Zapamti PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Spremi lozinku samo za ovog korisnika"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Spremi lozinku za sve korisnike"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Pitaj za ovu lozinku svaki puta"
-
-#~ msgid "The password is not required"
-#~ msgstr "Lozinka nije potrebna"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Pr_kaži lozinke"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Treća lozinka:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Druga lozinka:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Lozinka:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Klikni za povezivanje"
-
-#~ msgid "New…"
-#~ msgstr "Novo…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Nijedno"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Promjenjivi WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "S_tvori"
-
-#, 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\"."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Potrebna je ovjera bežične mreže"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Potrebna je ovjera bežične mreže"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Stvori novu bežičnu mrežu"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nova bežična mreža"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Poveži se na skrivenu bežičnu mrežu"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Skrivena bežična mreža"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Upišite naziv i sigurnosne pojedinosti skrivene mreže na koju se želite "
-#~ "povezati."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Bežična _sigurnost"
-
-#~ msgid "C_onnection"
-#~ msgstr "P_ovezivanje"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Bežični _uređaj"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Ne mogu pronaći svojeg pružatelja usluge i želim ga unijeti _ručno:"
-
-#~ msgid "Provider:"
-#~ msgstr "Pružatelj usluge:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Popis država ili regija:"
-
-#~ msgid "Country or region"
-#~ msgstr "Država ili regija"
-
-#~ msgid "Wired"
-#~ msgstr "Žična mreža"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC mreža"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Ili lozinka nedostaje ili je povezivanje neispravno. U drugom slučaju, "
-#~ "morate urediti povezivanje s nm-connection-editor prvo"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Bežična _sigurnost:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Naziv mreže:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "P_ovezivanje:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Bežični _uređaj:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/hu.po b/po/hu.po
index 9744b6fe..a0246dac 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2019-08-24 23:00+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"
@@ -24,6 +24,7 @@ msgstr ""
 "X-Generator: Lokalize 18.12.3\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Hálózat"
 
@@ -224,15 +225,19 @@ msgstr "802.1X hitelesítés"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "Mé_gse"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "Kapcs_olódás"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Hálózatnév"
 
@@ -583,7 +588,7 @@ msgstr "Mobil széles sáv (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobil széles sáv"
 
@@ -707,7 +712,9 @@ msgstr "DSL hitelesítés"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_OK"
 
@@ -811,6 +818,7 @@ msgid "Error displaying connection information:"
 msgstr "Hiba a kapcsolatinformációk megjelenítése közben:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -956,7 +964,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Hotspot"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "Jelszó"
 
@@ -980,7 +988,8 @@ msgstr "VPN fejléc"
 msgid "Base Connection"
 msgstr "Alapkapcsolat"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Ismeretlen"
 
@@ -1732,6 +1741,7 @@ msgid "_Service"
 msgstr "Sz_olgáltatás"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2388,6 +2398,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "B_arangoló mód bekapcsolása, ha a saját hálózat nem érhető el"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Jelszavak megjelenítése"
 
@@ -2799,13 +2810,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3128,12 +3140,12 @@ msgstr ""
 "néhány módszer támogatását."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3143,22 +3155,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Pár"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Csapat"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Híd"
 
@@ -3444,6 +3459,7 @@ msgid "Select a connection to delete"
 msgstr "Válasszon egy törlendő kapcsolatot"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Név"
 
@@ -3654,6 +3670,8 @@ msgstr "%d. vezetékes kapcsolat"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -3880,35 +3898,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "A szolgáltatóm C_DMA-alapú technológiát használ (azaz 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4066,10 +4084,12 @@ msgid "Wi-Fi connection %d"
 msgstr "%d. Wi-Fi kapcsolat"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 bites kulcs (Hex vagy ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bites jelmondat"
 
@@ -4078,14 +4098,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamikus WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA és WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA és WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA és WPA2 Personal"
@@ -4161,6 +4184,466 @@ msgstr "Kapcsolatinformációk"
 msgid "_Close"
 msgstr "_Bezárás"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr "Beolvasás a telefonjával vagy <a href=\"nma:print\">nyomtatás</a>"
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Nincs tanúsítvány beállítva"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Nincs kulcs beállítva"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/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/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "%s személyes _kulcs"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "%s kulcs _jelszava"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Válasszon %s tanúsítványt"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "%s _tanúsítvány"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Az ország nincs felsorolva"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Egyéb"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "A tarifám nincs felsorolva…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Szolgáltató"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Telepített GSM eszköz"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Telepített CDMA eszköz"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Bármely eszköz"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Új mobil széles sávú kapcsolat"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Ez a varázsló segít egyszerűen beállítani a mobil széles sávú kapcsolatot a "
+"(3G) mobilhálózathoz."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "A következő információkra lesz szüksége:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Széles sávú szolgáltatójának neve"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Széles sávú előfizetésének neve"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(egyes esetekben) Széles sávú előfizetéséhez tartozó APN (hozzáférési pont "
+"neve)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "_Kapcsolat létrehozása ezen mobil széles sávú eszközhöz:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Mobil széles sávú kapcsolat beállítása"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "Ország vagy terület:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Válassza ki a szolgáltató országát vagy területét"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "_Válassza ki szolgáltatóját listából:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"_Nem találom a szolgáltatómat, és saját kezűleg szeretném beállítani a "
+"kapcsolatot:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "A szolgáltatóm GSM technológiát használ (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "A szolgáltatóm CDMA technológiát használ (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Válassza ki a szolgáltatóját"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Válassza ki a tarifát:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Kiválasztott tarifa _APN-je (hozzáférési pont neve):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Figyelmeztetés: nem megfelelő tarifa kiválasztása számlázási problémákat "
+"okozhat a széles sávú előfizetésén, vagy megakadályozhatja a csatlakozást.\n"
+"\n"
+"Ha nem biztos a tarifában, kérdezzen rá szolgáltatójánál a tarifához tartozó "
+"APN-re."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Válassza ki előfizetési tarifáját"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "A mobil széles sávú kapcsolata a következő beállításokkal rendelkezik:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Eszköz:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Szolgáltató:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Tarifa:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Most létrejön a kapcsolat a mobil széles sávú szolgáltatójához a "
+"kiválasztott beállításokkal. Ha a kapcsolódás meghiúsul, vagy nem tudja "
+"elérni a hálózati erőforrásokat, akkor ellenőrizze a beállításokat. A mobil "
+"széles sávú kapcsolat beállításainak módosításához válassza a Rendszer → "
+"Beállítások menü „Hálózati kapcsolatok” menüpontját."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Mobil széles sáv beállításainak megerősítése"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Nincs)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Kulcs ebben: %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Tanúsítvány ebben: %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Ismeretlen)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Kiválasztás"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Mégse"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Kiválasztás fájlból…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Válasszon egy %s tanúsítványt"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s tanúsítvány jel_szava"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Hiba a bejelentkezéskor: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Hiba a munkamenet megnyitásakor: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "Token _feloldása"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Kibocsátó"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Adja meg a(z) %s PIN-kódját"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Bejelentkezés"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "PIN-kód _megjegyzése"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "A jelszó tárolása csak ehhez a felhasználóhoz"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Jelszó tárolása minden felhasználóhoz"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Jelszó bekérése minden alkalommal"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "A jelszó nem szükséges"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "_Jelszavak megjelenítése"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Harmadlagos jelszó:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Másodlagos jelszó:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Jelszó:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Kattintson a kapcsolódáshoz"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Új…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Nincs"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dinamikus WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Létrehozás"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Jelszavak vagy titkosítási kulcsok szükségesek a(z) „%s” Wi-Fi hálózat "
+"eléréséhez."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Hitelesítés szükséges a Wi-Fi hálózathoz"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "A Wi-Fi hálózat hitelesítést igényel"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Új Wi-Fi hálózat létrehozása"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Új Wi-Fi hálózat"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+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/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Kapcsolódás rejtett Wi-Fi hálózathoz"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Rejtett Wi-Fi hálózat"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Adja meg a rejtett Wi-Fi hálózat nevét és biztonsági adatait, amelyhez "
+"kapcsolódni kíván."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi _biztonság"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "_Kapcsolat"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi _csatoló"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "_Nem találom a szolgáltatómat és saját kezűleg szeretném megadni:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Szolgáltató:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Ország- vagy területlista:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Ország vagy terület"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Vezetékes"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC háló"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Vagy hiányzik egy jelszó, vagy a kapcsolat érvénytelen. Utóbbi esetben "
+"először a Kapcsolatszerkesztővel kell módosítani a kapcsolatot"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-_Fi biztonság:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Hálózatnév:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Kapcsolat:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi _csatoló:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Használat:"
@@ -4309,25 +4792,25 @@ msgstr "nincs CA tanúsítvány kiválasztva"
 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:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "hiányzó EAP-FAST PAC fájl"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Válasszon PAC fájlt"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC fájlok (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Minden fájl"
 
@@ -4363,16 +4846,16 @@ msgstr "Belső _hitelesítés"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Automatikus PA_C létesítés engedélyezése"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "hiányzó EAP-LEAP felhasználónév"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "hiányzó EAP-LEAP jelszó"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4407,15 +4890,15 @@ msgstr "A kiszolgáló tanúsítványnevének utótagja."
 msgid "_Domain"
 msgstr "_Tartomány"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "hiányzó EAP felhasználónév"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "hiányzó EAP jelszó"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "hiányzó EAP-kliens személyes kulcs jelmondat"
 
@@ -4427,23 +4910,23 @@ msgstr "P_rivát kulcs jelmondat"
 msgid "Sh_ow passphrase"
 msgstr "_Jelmondat megjelenítése"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "hiányzó EAP-TLS személyazonosság"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "nincs felhasználói tanúsítvány kiválasztva"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 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:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "nincs kulcs kiválasztva"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "a kiválasztott kulcsfájl nem létezik"
 
@@ -4451,7 +4934,7 @@ msgstr "a kiválasztott kulcsfájl nem létezik"
 msgid "I_dentity"
 msgstr "Sze_mélyazonosság"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (nincs EAP)"
 
@@ -4489,15 +4972,15 @@ msgstr "Külsőleg konfigurált"
 msgid "Au_thentication"
 msgstr "_Hitelesítés"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "hiányzó leap felhasználónév"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "hiányzó leap jelszó"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "hiányzó EAP jelszó"
@@ -4506,25 +4989,25 @@ msgstr "hiányzó EAP jelszó"
 msgid "_Type"
 msgstr "_Típus"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "hiányzó wep-kulcs"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4533,11 +5016,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 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"
@@ -4566,7 +5049,7 @@ msgstr "Kul_cs megjelenítése"
 msgid "WEP inde_x"
 msgstr "WEP inde_x"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4575,354 +5058,7 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
-
-#~ 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>"
-
-#~ msgid "No certificate set"
-#~ msgstr "Nincs tanúsítvány beállítva"
-
-#~ msgid "No key set"
-#~ msgstr "Nincs kulcs beállítva"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Válasszon egy kulcsot a(z) %s tanúsítványhoz"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "%s személyes _kulcs"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "%s kulcs _jelszava"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Válasszon %s tanúsítványt"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s _tanúsítvány"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Az ország nincs felsorolva"
-
-#~ msgid "Unlisted"
-#~ msgstr "Egyéb"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "A tarifám nincs felsorolva…"
-
-#~ msgid "Provider"
-#~ msgstr "Szolgáltató"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Telepített GSM eszköz"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Telepített CDMA eszköz"
-
-#~ msgid "Any device"
-#~ msgstr "Bármely eszköz"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Új mobil széles sávú kapcsolat"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Ez a varázsló segít egyszerűen beállítani a mobil széles sávú kapcsolatot "
-#~ "a (3G) mobilhálózathoz."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "A következő információkra lesz szüksége:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Széles sávú szolgáltatójának neve"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Széles sávú előfizetésének neve"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(egyes esetekben) Széles sávú előfizetéséhez tartozó APN (hozzáférési "
-#~ "pont neve)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "_Kapcsolat létrehozása ezen mobil széles sávú eszközhöz:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Mobil széles sávú kapcsolat beállítása"
-
-#~ msgid "Country or region:"
-#~ msgstr "Ország vagy terület:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Válassza ki a szolgáltató országát vagy területét"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "_Válassza ki szolgáltatóját listából:"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "_Nem találom a szolgáltatómat, és saját kezűleg szeretném beállítani a "
-#~ "kapcsolatot:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "A szolgáltatóm GSM technológiát használ (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "A szolgáltatóm CDMA technológiát használ (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Válassza ki a szolgáltatóját"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Válassza ki a tarifát:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Kiválasztott tarifa _APN-je (hozzáférési pont neve):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Figyelmeztetés: nem megfelelő tarifa kiválasztása számlázási problémákat "
-#~ "okozhat a széles sávú előfizetésén, vagy megakadályozhatja a "
-#~ "csatlakozást.\n"
-#~ "\n"
-#~ "Ha nem biztos a tarifában, kérdezzen rá szolgáltatójánál a tarifához "
-#~ "tartozó APN-re."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Válassza ki előfizetési tarifáját"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "A mobil széles sávú kapcsolata a következő beállításokkal rendelkezik:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Eszköz:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Szolgáltató:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Tarifa:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Most létrejön a kapcsolat a mobil széles sávú szolgáltatójához a "
-#~ "kiválasztott beállításokkal. Ha a kapcsolódás meghiúsul, vagy nem tudja "
-#~ "elérni a hálózati erőforrásokat, akkor ellenőrizze a beállításokat. A "
-#~ "mobil széles sávú kapcsolat beállításainak módosításához válassza a "
-#~ "Rendszer → Beállítások menü „Hálózati kapcsolatok” menüpontját."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Mobil széles sáv beállításainak megerősítése"
-
-#~ msgid "(None)"
-#~ msgstr "(Nincs)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Kulcs ebben: %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Tanúsítvány ebben: %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Ismeretlen)"
-
-#~ msgid "Select"
-#~ msgstr "Kiválasztás"
-
-#~ msgid "Cancel"
-#~ msgstr "Mégse"
-
-#~ msgid "Select from file…"
-#~ msgstr "Kiválasztás fájlból…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Válasszon egy %s tanúsítványt"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "%s tanúsítvány jel_szava"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Hiba a bejelentkezéskor: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Hiba a munkamenet megnyitásakor: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "Token _feloldása"
-
-#~ msgid "Issued By"
-#~ msgstr "Kibocsátó"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Adja meg a(z) %s PIN-kódját"
-
-#~ msgid "_Login"
-#~ msgstr "_Bejelentkezés"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "PIN-kód _megjegyzése"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "A jelszó tárolása csak ehhez a felhasználóhoz"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Jelszó tárolása minden felhasználóhoz"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Jelszó bekérése minden alkalommal"
-
-#~ msgid "The password is not required"
-#~ msgstr "A jelszó nem szükséges"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "_Jelszavak megjelenítése"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Harmadlagos jelszó:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Másodlagos jelszó:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Jelszó:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Kattintson a kapcsolódáshoz"
-
-#~ msgid "New…"
-#~ msgstr "Új…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Nincs"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dinamikus WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Létrehozás"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Jelszavak vagy titkosítási kulcsok szükségesek a(z) „%s” Wi-Fi hálózat "
-#~ "eléréséhez."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Hitelesítés szükséges a Wi-Fi hálózathoz"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "A Wi-Fi hálózat hitelesítést igényel"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Új Wi-Fi hálózat létrehozása"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Új Wi-Fi hálózat"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Kapcsolódás rejtett Wi-Fi hálózathoz"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Rejtett Wi-Fi hálózat"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Adja meg a rejtett Wi-Fi hálózat nevét és biztonsági adatait, amelyhez "
-#~ "kapcsolódni kíván."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wi-Fi _biztonság"
-
-#~ msgid "C_onnection"
-#~ msgstr "_Kapcsolat"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-Fi _csatoló"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "_Nem találom a szolgáltatómat és saját kezűleg szeretném megadni:"
-
-#~ msgid "Provider:"
-#~ msgstr "Szolgáltató:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Ország- vagy területlista:"
-
-#~ msgid "Country or region"
-#~ msgstr "Ország vagy terület"
-
-#~ msgid "Wired"
-#~ msgstr "Vezetékes"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC háló"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Vagy hiányzik egy jelszó, vagy a kapcsolat érvénytelen. Utóbbi esetben "
-#~ "először a Kapcsolatszerkesztővel kell módosítani a kapcsolatot"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wi-_Fi biztonság:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Hálózatnév:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "_Kapcsolat:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-Fi _csatoló:"
diff --git a/po/id.po b/po/id.po
index 306fbead..92905a27 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2018-08-27 14:58+0700\n"
 "Last-Translator: Kukuh Syafaat <kukuhsyafaat gnome org>\n"
 "Language-Team: Indonesian <gnome i15n org>\n"
@@ -23,6 +23,7 @@ msgstr ""
 "X-Generator: Poedit 2.0.6\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Jaringan"
 
@@ -222,15 +223,19 @@ msgstr "Otentikasi 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Sambung"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Nama jaringan"
 
@@ -574,7 +579,7 @@ msgstr "Data Seluler (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Data Seluler"
 
@@ -695,7 +700,9 @@ msgstr "Otentikasi DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_OK"
 
@@ -798,6 +805,7 @@ msgid "Error displaying connection information:"
 msgstr "Galat menampilkan informasi koneksi:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -946,7 +954,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Hotspot"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Sandi:"
@@ -971,7 +979,8 @@ msgstr "Banner VPN"
 msgid "Base Connection"
 msgstr "Koneksi Dasar"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Tak dikenal"
 
@@ -1725,6 +1734,7 @@ msgid "_Service"
 msgstr "_Layanan"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2383,6 +2393,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Ijinkan _roaming bila jaringan rumah tak tersedia"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Tampilkan sandi"
 
@@ -2796,13 +2807,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3124,12 +3136,12 @@ msgstr ""
 "metoda."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3139,22 +3151,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bond"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Tim"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Bridge"
 
@@ -3438,6 +3453,7 @@ msgid "Select a connection to delete"
 msgstr "Pilih koneksi untuk dihapus"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nama"
 
@@ -3648,6 +3664,8 @@ msgstr "Koneksi ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Baku"
 
@@ -3874,35 +3892,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Operator saya memakai teknologi berbasis C_DMA (mis. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4060,10 +4078,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Koneksi Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Kunci WEP 40/128-bit (Heksa atau ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Frasa-kunci WEP 128-bit"
 
@@ -4072,14 +4092,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP Dinamik (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
@@ -4155,6 +4178,464 @@ msgstr "Informasi Koneksi"
 msgid "_Close"
 msgstr "_Tutup"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Tidak ada sertifikat yang ditata"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Tidak ada kunci yang ditata"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Pilih sebuah kunci bagi Sertifikat %s"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "_Kunci privat %s"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "Kata _sandi kunci %s"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Pilih Sertifikat %s"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "_Sertifikat %s"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Negaraku tak terdaftar"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Tak terdaftar"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Tipe langgananku tak terdaftar…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Operator"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Perangkat GSM terpasang"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Perangkat CDMA terpasang"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Sebarang perangkat"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Koneksi Data Seluler Baru"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Asisten ini membantu Anda menyiapkan dengan mudah koneksi data seluler ke "
+"jaringan 3G."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Anda akan memerlukan informasi berikut:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Nama operator seluler Anda"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Nama tipe langganan seluler Anda"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(dalam beberapa kasus) APN (Access Point Name) tipe langganan data seluler "
+"Anda"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Buat koneksi bagi perangka_t data seluler ini:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Siapkan Koneksi Data Seluler"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Negara atau wilayah"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Pilih Negara atau Wilayah Operator Anda"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Pi_lih operator Anda dari daftar:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Tak menemukan operatorku dan ingin memasukkannya secara _manual:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Operator saya memakai teknologi GSM (GPRS, EDGE, UMTS, HSDPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Operator saya memakai teknologi CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Pilih Operator Anda"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "Pilih jeni_s langganan Anda:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Access Point Name) yang dipilih:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Peringatan: Memilih tipe langganan yang salah dapat menyebabkan masalah "
+"tagihan pada akun seluler Anda atau mungkin menghalangi keterkoneksi.\n"
+"\n"
+"Bila Anda tidak yakin tentang tipe langganan Anda silakan bertanya ke "
+"operator tentang APN Anda."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Pilih Jenis Langganan Anda"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Koneksi data seluler Anda ditata dengan tatanan berikut:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Perangkat Anda:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Operator Anda:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Jenis Langganan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Koneksi kini akan dibuat ke operator data seluler Anda memakai tatanan yang "
+"Anda pilih. Bila koneksi gagal atau Anda tak dapat mengakses sumber daya "
+"jaringan, periksa ulang tatanan Anda. Untuk mengubah tatanan koneksi data "
+"seluler Anda, pilih \"Koneksi Jaringan\" dari menu Sistem → Preferensi."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Konfirmasikan Tatanan Data Seluler"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Nihil)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Kunci dalam %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Sertifikat dalam %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Tidak dikenal)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Pilih"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Batal"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Pilih dari berkas…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Pilih Sertifikat %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "Kata _sandi sertifikat %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Galat saat log masuk: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Galat saat membuka suatu sesi: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "B_uka kunci token"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Diterbitkan Oleh"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Masukkan PIN %s"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Log Masuk"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Ingat PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Simpan sandi hanya bagi pengguna ini"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Simpan sandi bagi semua pengguna"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Tanyakan sandi ini setiap kali"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Sandi tidak diperlukan"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "_Tampilkan sandi"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "Sandi _Tersier:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "Sandi _Sekunder:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Sandi:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Klik untuk menyambung"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Baru…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Tak ada"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP Dinamik (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Buat"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Sandi atau kunci enkripsi diperlukan untuk mengakses jaringan Wi-Fi \"%s\"."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Otentikasi Jaringan Wi-Fi Diperlukan"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Otentikasi dibutuhkan oleh jaringan Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Buat Jaringan Wi-Fi Baru"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Jaringan Wi-Fi baru"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Masukkan sebuah nama untuk jaringan Wi-Fi yang ingin Anda buat."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Sambungkan ke Jaringan Wi-Fi Tersembunyi"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Jaringan Wi-Fi tersembunyi"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Masukkan nama dan rincian keamanan dari jaringan Wi-Fi tersembunyi yang "
+"ingin Anda sambungkan."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Kemananan _Wi-Fi"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "K_oneksi"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptor Wi-Fi"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Tak menemukan operatorku dan ingin memasukkannya secara _manual:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Operator:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Daftar Negara atau Wilayah:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Negara atau wilayah"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Kabel"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "Mesh OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%2$s %1$s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Mungkin kurang sandi atau koneksi tidak valid. Pada kasus terakhir, Anda "
+"mesti menyunting koneksi dengan nm-connection-editor terlebih dahulu"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Kemananan _Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nama jaringan:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "K_oneksi:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptor Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Penggunaan:"
@@ -4303,25 +4784,25 @@ msgstr "tidak ada sertifikat CA yang dipilih"
 msgid "selected CA certificate file does not exist"
 msgstr "berkas sertifikat CA yang dipilih tidak ada"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "kurang berkas PAC EAP-FAST"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Pilih suatu berkas PAC"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Berkas PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Semua berkas"
 
@@ -4357,16 +4838,16 @@ msgstr "Otent_ikasi dalam"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Otomatis ijinkan pro_visi PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "kurang nama pengguna EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "kurang sandi EAP-LEAP"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4401,15 +4882,15 @@ msgstr "Akhiran nama sertifikat server."
 msgid "_Domain"
 msgstr "_Domain"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "kurang nama pengguna EAP"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "kurang sandi EAP"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4423,23 +4904,23 @@ msgstr "Frasa-kunci WEP 128-bit"
 msgid "Sh_ow passphrase"
 msgstr "_Tampilkan sandi"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "kurang identitas EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "tidak ada sertifikat pengguna yang dipilih"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "berkas sertifikat pengguna yang dipilih tidak ada"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "tidak ada kunci yang dipilih"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "berkas kunci yang dipilih tidak ada"
 
@@ -4447,7 +4928,7 @@ msgstr "berkas kunci yang dipilih tidak ada"
 msgid "I_dentity"
 msgstr "I_dentitas"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (tanpa EAP)"
 
@@ -4485,15 +4966,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "O_tentikasi"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "kurang nama pengguna leap"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "kurang sandi leap"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "kurang sandi EAP"
@@ -4502,17 +4983,17 @@ msgstr "kurang sandi EAP"
 msgid "_Type"
 msgstr "_Jenis"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "kurang kunci wep"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4520,7 +5001,7 @@ msgstr ""
 "kunci wep tak valid: kunci dengan panjang %zu mesti hanya memuat karakter "
 "ascii"
 
-#: src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4529,11 +5010,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "kunci wep tak valid: frasa sandi mesti lebih pendek daripada 64 karakter"
@@ -4562,7 +5043,7 @@ msgstr "Tampilkan _kunci"
 msgid "WEP inde_x"
 msgstr "Inde_ks WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4571,354 +5052,12 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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 "No certificate set"
-#~ msgstr "Tidak ada sertifikat yang ditata"
-
-#~ msgid "No key set"
-#~ msgstr "Tidak ada kunci yang ditata"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Pilih sebuah kunci bagi Sertifikat %s"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "_Kunci privat %s"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Kata _sandi kunci %s"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Pilih Sertifikat %s"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Sertifikat %s"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Negaraku tak terdaftar"
-
-#~ msgid "Unlisted"
-#~ msgstr "Tak terdaftar"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Tipe langgananku tak terdaftar…"
-
-#~ msgid "Provider"
-#~ msgstr "Operator"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Perangkat GSM terpasang"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Perangkat CDMA terpasang"
-
-#~ msgid "Any device"
-#~ msgstr "Sebarang perangkat"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Koneksi Data Seluler Baru"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Asisten ini membantu Anda menyiapkan dengan mudah koneksi data seluler ke "
-#~ "jaringan 3G."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Anda akan memerlukan informasi berikut:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Nama operator seluler Anda"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Nama tipe langganan seluler Anda"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(dalam beberapa kasus) APN (Access Point Name) tipe langganan data "
-#~ "seluler Anda"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Buat koneksi bagi perangka_t data seluler ini:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Siapkan Koneksi Data Seluler"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Negara atau wilayah"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Pilih Negara atau Wilayah Operator Anda"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Pi_lih operator Anda dari daftar:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Tak menemukan operatorku dan ingin memasukkannya secara _manual:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Operator saya memakai teknologi GSM (GPRS, EDGE, UMTS, HSDPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Operator saya memakai teknologi CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Pilih Operator Anda"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "Pilih jeni_s langganan Anda:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "_APN (Access Point Name) yang dipilih:"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Peringatan: Memilih tipe langganan yang salah dapat menyebabkan masalah "
-#~ "tagihan pada akun seluler Anda atau mungkin menghalangi keterkoneksi.\n"
-#~ "\n"
-#~ "Bila Anda tidak yakin tentang tipe langganan Anda silakan bertanya ke "
-#~ "operator tentang APN Anda."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Pilih Jenis Langganan Anda"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "Koneksi data seluler Anda ditata dengan tatanan berikut:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Perangkat Anda:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Operator Anda:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Jenis Langganan:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Koneksi kini akan dibuat ke operator data seluler Anda memakai tatanan "
-#~ "yang Anda pilih. Bila koneksi gagal atau Anda tak dapat mengakses sumber "
-#~ "daya jaringan, periksa ulang tatanan Anda. Untuk mengubah tatanan koneksi "
-#~ "data seluler Anda, pilih \"Koneksi Jaringan\" dari menu Sistem → "
-#~ "Preferensi."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Konfirmasikan Tatanan Data Seluler"
-
-#~ msgid "(None)"
-#~ msgstr "(Nihil)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Kunci dalam %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Sertifikat dalam %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Tidak dikenal)"
-
-#~ msgid "Select"
-#~ msgstr "Pilih"
-
-#~ msgid "Cancel"
-#~ msgstr "Batal"
-
-#~ msgid "Select from file…"
-#~ msgstr "Pilih dari berkas…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Pilih Sertifikat %s"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Kata _sandi sertifikat %s"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Galat saat log masuk: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Galat saat membuka suatu sesi: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "B_uka kunci token"
-
-#~ msgid "Issued By"
-#~ msgstr "Diterbitkan Oleh"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Masukkan PIN %s"
-
-#~ msgid "_Login"
-#~ msgstr "_Log Masuk"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Ingat PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Simpan sandi hanya bagi pengguna ini"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Simpan sandi bagi semua pengguna"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Tanyakan sandi ini setiap kali"
-
-#~ msgid "The password is not required"
-#~ msgstr "Sandi tidak diperlukan"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "_Tampilkan sandi"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Sandi _Tersier:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "Sandi _Sekunder:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Sandi:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Klik untuk menyambung"
-
-#~ msgid "New…"
-#~ msgstr "Baru…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Tak ada"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP Dinamik (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Buat"
-
-#, 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"
-#~ "\"."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Otentikasi Jaringan Wi-Fi Diperlukan"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Otentikasi dibutuhkan oleh jaringan Wi-Fi"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Buat Jaringan Wi-Fi Baru"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Jaringan Wi-Fi baru"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Sambungkan ke Jaringan Wi-Fi Tersembunyi"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Jaringan Wi-Fi tersembunyi"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Masukkan nama dan rincian keamanan dari jaringan Wi-Fi tersembunyi yang "
-#~ "ingin Anda sambungkan."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Kemananan _Wi-Fi"
-
-#~ msgid "C_onnection"
-#~ msgstr "K_oneksi"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Adaptor Wi-Fi"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Tak menemukan operatorku dan ingin memasukkannya secara _manual:"
-
-#~ msgid "Provider:"
-#~ msgstr "Operator:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Daftar Negara atau Wilayah:"
-
-#~ msgid "Country or region"
-#~ msgstr "Negara atau wilayah"
-
-#~ msgid "Wired"
-#~ msgstr "Kabel"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "Mesh OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%2$s %1$s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Mungkin kurang sandi atau koneksi tidak valid. Pada kasus terakhir, Anda "
-#~ "mesti menyunting koneksi dengan nm-connection-editor terlebih dahulu"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Kemananan _Wi-Fi:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nama jaringan:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "K_oneksi:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Adaptor Wi-Fi:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/is.po b/po/is.po
index c31ad934..f27dca7f 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2018-03-19 15:25+0000\n"
 "Last-Translator: Sveinn í Felli <sv1 fellsnet is>\n"
 "Language-Team: Icelandic <translation-team-is lists sourceforge net>\n"
@@ -19,6 +19,7 @@ msgstr ""
 "X-Generator: Lokalize 1.5\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Netkerfi"
 
@@ -216,15 +217,19 @@ msgstr "802.1X auðkenning"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Hætta við"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Tengjast"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "Heiti _netkerfis:"
@@ -570,7 +575,7 @@ msgstr "Ferðabreiðband (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Ferðabreiðband"
 
@@ -691,7 +696,9 @@ msgstr "DSL auðkenning"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "Í _lagi"
 
@@ -795,6 +802,7 @@ msgid "Error displaying connection information:"
 msgstr "Villa kom upp við að birta upplýsingar um tenginguna:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -943,7 +951,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Tengipunktur (hotspot)"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Lykilorð:"
@@ -968,7 +976,8 @@ msgstr "VPN tilkynningaborði (banner)"
 msgid "Base Connection"
 msgstr "Grunntenging"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Óþekkt"
 
@@ -1698,6 +1707,7 @@ msgid "_Service"
 msgstr "Þjónu_sta"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2329,6 +2339,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Leyfa _reiki ef heimanet er ekki í boði"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Sýna lykilorð"
 
@@ -2717,13 +2728,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3030,12 +3042,12 @@ msgid ""
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3045,22 +3057,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bundið (bond)"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Hópað (team)"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Brúun (bridge)"
 
@@ -3344,6 +3359,7 @@ msgid "Select a connection to delete"
 msgstr "Veldu tengingu til að eyða"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nafn"
 
@@ -3557,6 +3573,8 @@ msgstr "Ethernet tenging %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Sjálfgefið"
 
@@ -3780,35 +3798,35 @@ msgstr "Þjónustuveitan mín notar _GSM-tækni (t.d. GPRS, EDGE, UMTS, HSDPA)"
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Þjónustuveitan mín notar C_DMA-tækni (t.d. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3965,10 +3983,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi tenging %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit lykill (Hex eða ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit lykilsetning"
 
@@ -3977,14 +3997,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Breytilegt (dynamic) WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA og WPA2 einka"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 fyrirtækja"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA og WPA2 einka"
@@ -4061,6 +4084,475 @@ msgstr "Upplýsingar um tengingu"
 msgid "_Close"
 msgstr "_Loka"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "CA skilríkis e_r ekki krafist"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Veldu lykil fyrir skilríki %s"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Einkaly_kill %s:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Lykil_orð einkalykils %s:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Veldu skilríki %s"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_Skilríki %s:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Landið mitt er ekki á listanum"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Óskráð"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Áskriftin mín er ekki á listanum…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Þjónustuveita"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Uppsett GSM tæki"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Uppsett CDMA tæki"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Eitthvað tæki"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Ný ferðabreiðbandstenging"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Þessi leiðarvísir hjálpar þér að setja upp ferðabreiðbandstengingu fyrir "
+"farsímakerfi (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Þú þarft á eftirfarandi upplýsingum að halda:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Nafn breiðbandsþjónustuveitunnar þinnar"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Nafn breiðbandsáskriftarinnar þinnar"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(í sumum tilfellum) APN aðgangspunktur áskriftarinnar þinnar (Access Point "
+"Name)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Búa til _tengingu fyrir þetta ferðabreiðbandstæki:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Setja upp ferðabreiðbandstengingu"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land eða svæði"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Veldu land eða hérað þjónustuveitunnar"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Veldu þjónustuaðila úr _listanum:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"Ég finn ekki þjónustuaðilann _minn og vil því setja handvirkt inn "
+"upplýsingar um hann:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Þjónustuveitan mín notar GSM-tækni (GPRS, EDGE, UMTS, HSDPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Þjónustuveitan mín notar CDMA-tækni (xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Veldu þjónustuveituna"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Veldu áskriftina þína:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Valinn  _APN aðgangspunktur (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Aðvörun: Ef valin er röng tegund áskriftar geta komið upp vandamál varðandi "
+"reikninga fyrir breiðbandsáskriftina eða jafnvel komið í veg fyrir "
+"tengingu.\n"
+"\n"
+"Ef þú ert ekki viss um hvaða áskrift þú ert með ættirðu að hafa samband við "
+"þjónustuveituna þína og spyrja um viðeigandi APN aðgangspunkt."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Veldu áskriftina þína"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Ferðabreiðbandstengingin þín er stillt með eftirfarandi breytum:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Tækið þitt:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Þjónustuveitan þín:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Áskriftin þín:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Nú verður reynt að tengjast þjónustuveitu ferðabreiðbandsins með þeim "
+"stillingum sem þú valdir.  Ef tengingin mistekst eða að þú nærð ekki "
+"sambandi við tilföng á netinu, ættirðu að yfirfara stillingarnar.  Til að "
+"breyta stillingum ferðabreiðbandsins, veldu \"Nettengingar\" úr valmyndinni "
+"Kerfi >> Kjörstillingar."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Staðfestu stillingar ferðabreiðbands"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(ekkert)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Skilríki í %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(óþekkt)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Velja"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Hætta við"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Veldu úr skrá…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Veldu %s skilríki"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Skilríki notanda:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Villa við að opna setu: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Aflæsa teikni"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Gefið út af"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Settu inn PIN-númer %s"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Innskráning"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Muna PIN-númer"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Geyma lykilorðið aðeins fyrir þennan notanda"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Geyma lykilorðið fyrir alla notendur"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Spyrja í hvert sinn um þetta lykilorð"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Lykilorðsins er ekki krafist"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Sýna lykil_orð"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "Þriðja _lykilorð:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Auka-lykilorð"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Lykilorð:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Smelltu til að tengjast"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "_Nýtt…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ekkert"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Breytilegt (dynamic) WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Búa til"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Lykilorða eða dulritunarlykla er krafist til að tengjast Wi-Fi netkerfinu "
+"'%s'."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi netkerfisauðkenningar krafist"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Auðkenningar er krafist af Wi-Fi netkerfi"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Búa til nýtt Wi-Fi netkerfi"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nýtt Wi-Fi netkerfi"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Settu inn heiti fyrir Wi-Fi netkerfið sem þú vilt búa til."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Tengjast við falið Wi-Fi netkerfi"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Falið Wi-Fi netkerfi"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Settu inn heiti og öryggisupplýsingar fyrir falda Wi-Fi netkerfið sem þú "
+"vilt tengjast."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Öruggt _Wi-Fi"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Ten_ging:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "W_i-Fi_netkort:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"Ég finn ekki þjónustuaðilann _minn og vil því setja handvirkt inn "
+"upplýsingar um hann:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Þjónustuveita:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Listi yfir land eða svæði:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Land eða svæði"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Um kapal"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Annaðhvort vantar lykilorð eða að tengingin er ógild. Í seinna tilvikinu "
+"þarftu fyrst að breyta tengingunni í nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Öruggt _Wi-Fi"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Heiti _netkerfis:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Ten_ging:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "W_i-Fi_netkort:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Notkun:"
@@ -4211,25 +4703,25 @@ msgstr "ekkert CA skilríki valið"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "vantar EAP-FAST PAC skrá"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Veldu PAC-skrá"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC skrár (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Allar skrár"
 
@@ -4265,16 +4757,16 @@ msgstr "_Innri auðkenning"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Leyfa sjálfvirka PAC _veitingu (provisioning)"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "vantar EAP-LEAP notandanafn"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "vantar EAP-LEAP lykilorð"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4309,15 +4801,15 @@ msgstr ""
 msgid "_Domain"
 msgstr "_Lén"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "vantar EAP notandanafn"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "vantar EAP lykilorð"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4331,24 +4823,24 @@ msgstr "WEP 128-bit lykilsetning"
 msgid "Sh_ow passphrase"
 msgstr "Sýna lykil_orð"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "vantar EAP-TLS auðkenni"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA skilríkis e_r ekki krafist"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4356,7 +4848,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "_Auðkenni"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (ekkert EAP)"
 
@@ -4394,15 +4886,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Auðkenning"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "vantar leap-notandanafn"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "vantar leap-lykilorð"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "vantar EAP lykilorð"
@@ -4411,24 +4903,24 @@ msgstr "vantar EAP lykilorð"
 msgid "_Type"
 msgstr "_Tegund"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "vantar wep-lykil"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4437,11 +4929,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "ógildur wep-lykill: lykilfrasi verður að vera styttri en 64 stafir"
 
@@ -4469,7 +4961,7 @@ msgstr "_Sýna lykil"
 msgid "WEP inde_x"
 msgstr "WEP _vísir"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4478,351 +4970,10 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "CA skilríkis e_r ekki krafist"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Veldu lykil fyrir skilríki %s"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Einkaly_kill %s:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Lykil_orð einkalykils %s:"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Veldu skilríki %s"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Skilríki %s:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Landið mitt er ekki á listanum"
-
-#~ msgid "Unlisted"
-#~ msgstr "Óskráð"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Áskriftin mín er ekki á listanum…"
-
-#~ msgid "Provider"
-#~ msgstr "Þjónustuveita"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Uppsett GSM tæki"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Uppsett CDMA tæki"
-
-#~ msgid "Any device"
-#~ msgstr "Eitthvað tæki"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Ný ferðabreiðbandstenging"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Þessi leiðarvísir hjálpar þér að setja upp ferðabreiðbandstengingu fyrir "
-#~ "farsímakerfi (3G)."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Þú þarft á eftirfarandi upplýsingum að halda:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Nafn breiðbandsþjónustuveitunnar þinnar"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Nafn breiðbandsáskriftarinnar þinnar"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(í sumum tilfellum) APN aðgangspunktur áskriftarinnar þinnar (Access "
-#~ "Point Name)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Búa til _tengingu fyrir þetta ferðabreiðbandstæki:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Setja upp ferðabreiðbandstengingu"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Land eða svæði"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Veldu land eða hérað þjónustuveitunnar"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Veldu þjónustuaðila úr _listanum:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "Ég finn ekki þjónustuaðilann _minn og vil því setja handvirkt inn "
-#~ "upplýsingar um hann:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Þjónustuveitan mín notar GSM-tækni (GPRS, EDGE, UMTS, HSDPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Þjónustuveitan mín notar CDMA-tækni (xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Veldu þjónustuveituna"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Veldu áskriftina þína:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Valinn  _APN aðgangspunktur (Access Point Name):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Aðvörun: Ef valin er röng tegund áskriftar geta komið upp vandamál "
-#~ "varðandi reikninga fyrir breiðbandsáskriftina eða jafnvel komið í veg "
-#~ "fyrir tengingu.\n"
-#~ "\n"
-#~ "Ef þú ert ekki viss um hvaða áskrift þú ert með ættirðu að hafa samband "
-#~ "við þjónustuveituna þína og spyrja um viðeigandi APN aðgangspunkt."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Veldu áskriftina þína"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "Ferðabreiðbandstengingin þín er stillt með eftirfarandi breytum:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Tækið þitt:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Þjónustuveitan þín:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Áskriftin þín:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Nú verður reynt að tengjast þjónustuveitu ferðabreiðbandsins með þeim "
-#~ "stillingum sem þú valdir.  Ef tengingin mistekst eða að þú nærð ekki "
-#~ "sambandi við tilföng á netinu, ættirðu að yfirfara stillingarnar.  Til að "
-#~ "breyta stillingum ferðabreiðbandsins, veldu \"Nettengingar\" úr "
-#~ "valmyndinni Kerfi >> Kjörstillingar."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Staðfestu stillingar ferðabreiðbands"
-
-#~ msgid "(None)"
-#~ msgstr "(ekkert)"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Skilríki í %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(óþekkt)"
-
-#~ msgid "Select"
-#~ msgstr "Velja"
-
-#~ msgid "Cancel"
-#~ msgstr "Hætta við"
-
-#~ msgid "Select from file…"
-#~ msgstr "Veldu úr skrá…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Veldu %s skilríki"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Skilríki notanda:"
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Villa við að opna setu: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Aflæsa teikni"
-
-#~ msgid "Issued By"
-#~ msgstr "Gefið út af"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Settu inn PIN-númer %s"
-
-#~ msgid "_Login"
-#~ msgstr "_Innskráning"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Muna PIN-númer"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Geyma lykilorðið aðeins fyrir þennan notanda"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Geyma lykilorðið fyrir alla notendur"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Spyrja í hvert sinn um þetta lykilorð"
-
-#~ msgid "The password is not required"
-#~ msgstr "Lykilorðsins er ekki krafist"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Sýna lykil_orð"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Þriðja _lykilorð:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Auka-lykilorð"
-
-#~ msgid "_Password:"
-#~ msgstr "_Lykilorð:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Smelltu til að tengjast"
-
-#~ msgid "New…"
-#~ msgstr "_Nýtt…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Ekkert"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Breytilegt (dynamic) WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Búa til"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Lykilorða eða dulritunarlykla er krafist til að tengjast Wi-Fi netkerfinu "
-#~ "'%s'."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wi-Fi netkerfisauðkenningar krafist"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Auðkenningar er krafist af Wi-Fi netkerfi"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Búa til nýtt Wi-Fi netkerfi"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nýtt Wi-Fi netkerfi"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Tengjast við falið Wi-Fi netkerfi"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Falið Wi-Fi netkerfi"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Settu inn heiti og öryggisupplýsingar fyrir falda Wi-Fi netkerfið sem þú "
-#~ "vilt tengjast."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Öruggt _Wi-Fi"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Ten_ging:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "W_i-Fi_netkort:"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "Ég finn ekki þjónustuaðilann _minn og vil því setja handvirkt inn "
-#~ "upplýsingar um hann:"
-
-#~ msgid "Provider:"
-#~ msgstr "Þjónustuveita:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Listi yfir land eða svæði:"
-
-#~ msgid "Country or region"
-#~ msgstr "Land eða svæði"
-
-#~ msgid "Wired"
-#~ msgstr "Um kapal"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Annaðhvort vantar lykilorð eða að tengingin er ógild. Í seinna tilvikinu "
-#~ "þarftu fyrst að breyta tengingunni í nm-connection-editor"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Öruggt _Wi-Fi"
-
-#~ msgid "_Network name:"
-#~ msgstr "Heiti _netkerfis:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Ten_ging:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "W_i-Fi_netkort:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/it.po b/po/it.po
index 7633911e..ec939cab 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\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"
@@ -31,6 +31,7 @@ msgstr ""
 "X-Generator: Poedit 2.2.3\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Rete"
 
@@ -234,15 +235,19 @@ msgstr "Autenticazione 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "A_nnulla"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "C_onnetti"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Nome rete"
 
@@ -596,7 +601,7 @@ msgstr "Banda larga mobile (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Banda larga mobile"
 
@@ -718,7 +723,9 @@ msgstr "Autenticazione DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_Ok"
 
@@ -823,6 +830,7 @@ msgid "Error displaying connection information:"
 msgstr "Errore nel visualizzare le informazioni di connessione:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -968,7 +976,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Hotspot"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "Password"
 
@@ -993,7 +1001,8 @@ msgstr "Banner VPN"
 msgid "Base Connection"
 msgstr "Connessione base"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Sconosciuta"
 
@@ -1753,6 +1762,7 @@ msgid "_Service"
 msgstr "_Servizio"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2410,6 +2420,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Abilitare il _roaming se la propria rete non è disponibile"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Mo_stra le password"
 
@@ -2827,13 +2838,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3157,12 +3169,12 @@ msgstr ""
 "riuscita, provare a disabilitare il supporto per qualche metodo."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3172,22 +3184,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Aggregata"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Team"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Bridge"
 
@@ -3478,6 +3493,7 @@ msgid "Select a connection to delete"
 msgstr "Selezionare una connessione da eliminare"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nome"
 
@@ -3690,6 +3706,8 @@ msgstr "Connessione Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Predefinita"
 
@@ -3919,35 +3937,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "L'operatore usa una tecnologia di tipo C_DMA (es. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4106,10 +4124,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Connessione Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Chiave WEP a 40/128 bit (Hex o ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase d'accesso WEP a 128 bit"
 
@@ -4125,10 +4145,12 @@ msgstr "WEP dinamico (802.1X)"
 # chiave condivisa mentre i WPA(2)-Enterprise utilizzeranno un server
 # di autenticazione.
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA e WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA e WPA2 Enterprise"
 
@@ -4140,6 +4162,7 @@ msgstr "WPA e WPA2 Enterprise"
 # chiave condivisa mentre i WPA(2)-Enterprise utilizzeranno un server
 # di autenticazione.
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA e WPA2 Personal"
@@ -4215,6 +4238,476 @@ msgstr "Informazioni connessione"
 msgid "_Close"
 msgstr "_Chiudi"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr "Scansionare col proprio telefono o <a href=\"nma:print\">stampare</a>"
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Nessun certificato impostato"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Nessuna chiave impostata"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Scelta chiave per certificato %s"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "_Chiave privata %s"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "_Password della chiave %s"
+
+# (ndt) titolo finestra
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Scelta certificato %s"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "_Certificato %s"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Nazione non presente in elenco"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Non elencato"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Piano tariffario non presente…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Operatore"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Dispositivo GSM installato"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Dispositivo CDMA installato"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Qualsiasi dispositivo"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nuova connessione a banda larga mobile"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Questo assistente consente di impostare facilmente una connessione a banda "
+"larga mobile a una rete cellulare (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Saranno necessarie le seguenti informazioni:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Il nome dell'operatore di banda larga"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Il nome del proprio piano tariffario di banda larga"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"L'APN (Nome Punto d'Accesso) del proprio piano tariffario di banda larga "
+"(solo in alcuni casi)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Creare una connessione per ques_to dispositivo a banda larga mobile:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Imposta una connessione a banda larga mobile"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "Nazione o regione:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Scegliere la nazione o la regione del proprio operatore"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Selezionare il proprio operatore da un e_lenco:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Operatore non presente, inserirlo _manualmente:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "L'operatore usa una tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "L'operatore usa una tecnologia CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Scegliere il proprio operatore"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Selezionare il proprio piano:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Nome Punto d'Accesso) del piano selezionato:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Attenzione: selezionando un piano non corretto è possibile causare addebiti "
+"imprevisti sul proprio conto a banda larga o impedire la connettività.\n"
+"\n"
+"Se non si è sicuri del piano utilizzato, chiedere il piano del proprio APN "
+"all'operatore."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Scegliere il proprio piano tariffario"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"La connessione a banda larga mobile è configurata con le seguenti "
+"impostazioni:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Dispositivo:"
+
+# [NdT] qui si parla di rete mobile
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Operatore di accesso:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Piano tariffario:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Verrà ora tentata una connessione all'operatore di banda larga mobile usando "
+"le impostazioni selezionate. Se la connessione non dovesse riuscire, o se "
+"fosse impossibile accedere alle risorse di rete, controllare nuovamente le "
+"impostazioni. Per modificare le impostazioni della connessione a banda larga "
+"mobile, scegliere «Connessioni di rete» dal menù Sistema → Preferenze."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confermare le impostazioni a banda larga mobile"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(nessuno)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Chiave in %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificato in %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(sconosciuto)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Seleziona"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Annulla"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Seleziona da file…"
+
+# (ndt) titolo finestra
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Scelta certificato %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Password certificato %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Errore nell'accedere in: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Errore nell'aprire una sessione: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Sblocca token"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Emesso da"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Inserire PIN di %s"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Accedi"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Ricorda PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Salvare la password solo per questo utente"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Salvare la password per tutti gli utenti"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Chiedere questa password ogni volta"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "La password non è richiesta"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Mo_stra le password"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "Password _terziaria:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Password secondaria:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Password:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Fare clic per connettersi"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Nuova…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Nessuna"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinamico (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_rea"
+
+# [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/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Per accedere alla rete Wi-Fi «%s» è necessaria una password o una chiave di "
+"cifratura."
+
+# [NdT] è il titolo della finestra
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Richiesta autenticazione rete Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "La rete Wi-Fi richiede autenticazione"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Crea nuova rete Wi-fi"
+
+# [NdT] è il titolo della finestra
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nuova rete Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+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/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Connetti a rete Wi-Fi nascosta"
+
+# [NdT] è il titolo della finestra
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Rete Wi-Fi nascosta"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Inserire il nome e i dettagli di sicurezza della rete Wi-Fi nascosta a cui "
+"connettersi."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Sicurezza _Wi-Fi"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "Co_nnessione"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adattatore Wi-Fi"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Operatore non presente, inserirlo _manualmente:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Operatore:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Elenco nazioni o regioni:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Nazione o regione"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Via cavo"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "Mesh OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%2$s (%1$s)"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Potrebbe mancare la password o la connessione potrebbe non essere valida. "
+"Nel caso la connessione non fosse valida, modificarla con nm-connection-"
+"editor."
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Sicurezza _Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nome rete:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nnessione:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adattatore Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Uso:"
@@ -4363,26 +4856,26 @@ msgstr "nessun certificato CA selezionato"
 msgid "selected CA certificate file does not exist"
 msgstr "il file di certificato CA selezionato non esiste"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "manca il file PAC EAP-FAST"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
 # (ndt) titolo finestra
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Scelta file PAC"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "File PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Tutti i file"
 
@@ -4418,16 +4911,16 @@ msgstr "Autenticazione i_nterna"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Fornire a_utomaticamente PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "manca il nome utente EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "manca la password EAP-LEAP"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4462,15 +4955,15 @@ msgstr "Suffisso del nome del certificato del server"
 msgid "_Domain"
 msgstr "_Dominio"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "manca il nome utente EAP"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "manca la password EAP"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "manca la frase d'accesso della chiave privata EAP"
 
@@ -4482,23 +4975,23 @@ msgstr "F_rase d'accesso chiave privata"
 msgid "Sh_ow passphrase"
 msgstr "Mo_stra frase d'accesso"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "manca l'identità EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "nessun certificato utente selezionato"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "il file del certificato utente selezionato non esiste"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "nessuna chiave selezionata"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "il file chiave selezionato non esiste"
 
@@ -4506,7 +4999,7 @@ msgstr "il file chiave selezionato non esiste"
 msgid "I_dentity"
 msgstr "I_dentità"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (no EAP)"
 
@@ -4544,15 +5037,15 @@ msgstr "Configurato esternamente"
 msgid "Au_thentication"
 msgstr "_Autenticazione"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "manca leap-username"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "manca leap-password"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "manca la password EAP"
@@ -4561,18 +5054,18 @@ msgstr "manca la password EAP"
 msgid "_Type"
 msgstr "_Tipo"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "manca wep-key"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4580,7 +5073,7 @@ msgstr ""
 "wpa-key non valida: una chiave di lunghezza %zu deve contenere solo "
 "caratteri ascii"
 
-#: src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4589,11 +5082,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 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"
@@ -4622,7 +5115,7 @@ msgstr "Mo_stra la chiave"
 msgid "WEP inde_x"
 msgstr "Indic_e WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4631,367 +5124,8 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
-
-#~ msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
-#~ msgstr ""
-#~ "Scansionare col proprio telefono o <a href=\"nma:print\">stampare</a>"
-
-#~ msgid "No certificate set"
-#~ msgstr "Nessun certificato impostato"
-
-#~ msgid "No key set"
-#~ msgstr "Nessuna chiave impostata"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Scelta chiave per certificato %s"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "_Chiave privata %s"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Password della chiave %s"
-
-# (ndt) titolo finestra
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Scelta certificato %s"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Certificato %s"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Nazione non presente in elenco"
-
-#~ msgid "Unlisted"
-#~ msgstr "Non elencato"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Piano tariffario non presente…"
-
-#~ msgid "Provider"
-#~ msgstr "Operatore"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Dispositivo GSM installato"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Dispositivo CDMA installato"
-
-#~ msgid "Any device"
-#~ msgstr "Qualsiasi dispositivo"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nuova connessione a banda larga mobile"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Questo assistente consente di impostare facilmente una connessione a "
-#~ "banda larga mobile a una rete cellulare (3G)."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Saranno necessarie le seguenti informazioni:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Il nome dell'operatore di banda larga"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Il nome del proprio piano tariffario di banda larga"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "L'APN (Nome Punto d'Accesso) del proprio piano tariffario di banda larga "
-#~ "(solo in alcuni casi)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr ""
-#~ "Creare una connessione per ques_to dispositivo a banda larga mobile:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Imposta una connessione a banda larga mobile"
-
-#~ msgid "Country or region:"
-#~ msgstr "Nazione o regione:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Scegliere la nazione o la regione del proprio operatore"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Selezionare il proprio operatore da un e_lenco:"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Operatore non presente, inserirlo _manualmente:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "L'operatore usa una tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "L'operatore usa una tecnologia CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Scegliere il proprio operatore"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Selezionare il proprio piano:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "_APN (Nome Punto d'Accesso) del piano selezionato:"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Attenzione: selezionando un piano non corretto è possibile causare "
-#~ "addebiti imprevisti sul proprio conto a banda larga o impedire la "
-#~ "connettività.\n"
-#~ "\n"
-#~ "Se non si è sicuri del piano utilizzato, chiedere il piano del proprio "
-#~ "APN all'operatore."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Scegliere il proprio piano tariffario"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "La connessione a banda larga mobile è configurata con le seguenti "
-#~ "impostazioni:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Dispositivo:"
-
-# [NdT] qui si parla di rete mobile
-#~ msgid "Your Provider:"
-#~ msgstr "Operatore di accesso:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Piano tariffario:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Verrà ora tentata una connessione all'operatore di banda larga mobile "
-#~ "usando le impostazioni selezionate. Se la connessione non dovesse "
-#~ "riuscire, o se fosse impossibile accedere alle risorse di rete, "
-#~ "controllare nuovamente le impostazioni. Per modificare le impostazioni "
-#~ "della connessione a banda larga mobile, scegliere «Connessioni di rete» "
-#~ "dal menù Sistema → Preferenze."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Confermare le impostazioni a banda larga mobile"
-
-#~ msgid "(None)"
-#~ msgstr "(nessuno)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Chiave in %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certificato in %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(sconosciuto)"
-
-#~ msgid "Select"
-#~ msgstr "Seleziona"
-
-#~ msgid "Cancel"
-#~ msgstr "Annulla"
-
-#~ msgid "Select from file…"
-#~ msgstr "Seleziona da file…"
-
-# (ndt) titolo finestra
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Scelta certificato %s"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Password certificato %s"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Errore nell'accedere in: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Errore nell'aprire una sessione: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Sblocca token"
-
-#~ msgid "Issued By"
-#~ msgstr "Emesso da"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Inserire PIN di %s"
-
-#~ msgid "_Login"
-#~ msgstr "_Accedi"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Ricorda PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Salvare la password solo per questo utente"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Salvare la password per tutti gli utenti"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Chiedere questa password ogni volta"
-
-#~ msgid "The password is not required"
-#~ msgstr "La password non è richiesta"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Mo_stra le password"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Password _terziaria:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Password secondaria:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Password:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Fare clic per connettersi"
-
-#~ msgid "New…"
-#~ msgstr "Nuova…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Nessuna"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP dinamico (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "C_rea"
-
-# [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?
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Per accedere alla rete Wi-Fi «%s» è necessaria una password o una chiave "
-#~ "di cifratura."
-
-# [NdT] è il titolo della finestra
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Richiesta autenticazione rete Wi-Fi"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "La rete Wi-Fi richiede autenticazione"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Crea nuova rete Wi-fi"
-
-# [NdT] è il titolo della finestra
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nuova rete Wi-Fi"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Inserire un nome per la rete Wi-Fi da creare."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Connetti a rete Wi-Fi nascosta"
-
-# [NdT] è il titolo della finestra
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Rete Wi-Fi nascosta"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Inserire il nome e i dettagli di sicurezza della rete Wi-Fi nascosta a "
-#~ "cui connettersi."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Sicurezza _Wi-Fi"
-
-#~ msgid "C_onnection"
-#~ msgstr "Co_nnessione"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Adattatore Wi-Fi"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Operatore non presente, inserirlo _manualmente:"
-
-#~ msgid "Provider:"
-#~ msgstr "Operatore:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Elenco nazioni o regioni:"
-
-#~ msgid "Country or region"
-#~ msgstr "Nazione o regione"
-
-#~ msgid "Wired"
-#~ msgstr "Via cavo"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "Mesh OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%2$s (%1$s)"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Potrebbe mancare la password o la connessione potrebbe non essere valida. "
-#~ "Nel caso la connessione non fosse valida, modificarla con nm-connection-"
-#~ "editor."
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Sicurezza _Wi-Fi:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nome rete:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Co_nnessione:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Adattatore Wi-Fi:"
diff --git a/po/ja.po b/po/ja.po
index d2690049..5f60dcdc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet 1.8.22\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\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"
@@ -30,6 +30,7 @@ msgstr ""
 "X-Generator: Zanata 4.6.2\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "ネットワーク"
 
@@ -228,15 +229,19 @@ msgstr "802.1X の認証"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "取り消し(_C)"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "接続(_O)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "ネットワーク名(_N)"
 
@@ -579,7 +584,7 @@ msgstr "モバイルブロードバンド (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "モバイルブロードバンド"
 
@@ -700,7 +705,9 @@ msgstr "DSL 認証"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "OK(_O)"
 
@@ -803,6 +810,7 @@ msgid "Error displaying connection information:"
 msgstr "接続情報の表示中にエラーが起きました:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -948,7 +956,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "ホットスポット"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "パスワード"
 
@@ -972,7 +980,8 @@ msgstr "VPN バナー"
 msgid "Base Connection"
 msgstr "ベース接続"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "不明"
 
@@ -1719,6 +1728,7 @@ msgid "_Service"
 msgstr "サービス(_S)"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2371,6 +2381,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "ホームネットワークが利用できない場合にローミングを許可(_R)"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "パスワードを表示(_W)"
 
@@ -2778,13 +2789,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3107,12 +3119,12 @@ msgstr ""
 "が失敗する場合は、認証方法を一部無効にしてみてください。"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3122,22 +3134,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bond"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Team"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "ブリッジ"
 
@@ -3419,6 +3434,7 @@ msgid "Select a connection to delete"
 msgstr "削除する接続を選択"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "名前"
 
@@ -3629,6 +3645,8 @@ msgstr "Ethernet 接続 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "デフォルト"
 
@@ -3857,35 +3875,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "私のプロバイダーは CDMA ベースの技術 (例えば、1xRTT, EVDO)を使用します(_D)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4043,10 +4061,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 接続 %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit キー (HEX または ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit パスフレーズ"
 
@@ -4055,15 +4075,18 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "動的 WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 # そういう仕様の名前なので訳すべきでない。
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
@@ -4139,6 +4162,460 @@ msgstr "接続情報"
 msgid "_Close"
 msgstr "閉じる(_C)"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr "電話でスキャンするか、<a href=\"nma:print\">印刷します</a>"
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "証明書セットがありません"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "キーセットがありません"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "%s 証明書のキーを選択する"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "%s プライベートキー(_K)"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "%s キーパスワード(_P)"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "%s 証明書を選択する"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "%s 証明書(_C)"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "私の国は一覧に有りません"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "一覧に無い"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "プランが一覧にありません..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "プロバイダー"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "GSM デバイスがインストールされています"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "CDMA デバイスがインストールされています"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "すべてのデバイス"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "新規のモバイルブロードバンド接続"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"このアシスタントを使用すると、携帯 (3G) ネットワークへのモバイルブロードバン"
+"ド接続が簡単にできます。"
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "以下の情報が必要です:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "使用するブロードバンドプロバイダー名"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "使用するブロードバンド請求書プラン名"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(一部のケースで) ブロードバンド請求書プラン APN (Access Point Name)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "このモバイルブロードバンドデバイス用の接続を作成(_T):"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "モバイルブロードバンド接続のセットアップ"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "国または地域:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "プロバイダーの国や地域を選択"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "プロバイダーを一覧から選択(_L):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "プロバイダーが見つからないので手動で接続を設定します(_M):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "私のプロバイダーは GSM 技術 (GPRS, EDGE, UMTS, HSPA) を使用します"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "私のプロバイダーは CDMA 技術 (1xRTT, EVDO) を使用します"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "使用プロバイダーを選択"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "使用プランの選択(_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "選択した APN (Access Point Name)(_A):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"警告: 正しくないプランを選択すると、ブロードバンドアカウントで請求書の問題が"
+"発生したり、接続ができなくなったりする可能性があります。\n"
+"\n"
+"ご自分のプランが分からない場合は、そのプランの APN についてプロバイダーにお尋"
+"ねください。"
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "使用する請求書プランを選択"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "ご使用のモバイルブロードバンド接続は、以下のように設定されています。"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "使用デバイス:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "使用プロバイダー:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "使用プラン:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"選択した設定でモバイルブロードバンドプロバイダーに接続されます。接続が失敗し"
+"たり、ネットワークリソースにアクセスできない場合は、設定をダブルクリックして"
+"ください。モバイルブロードバンド設定を変更するには、システム → 設定メニューか"
+"ら「ネットワーク接続」を選択します。"
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "モバイルブロードバンドセッティングを確定する"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(なし)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "%s 内のキー"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "%s 内の 証明書"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(不明)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "選択"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "ファイルから選択…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "%s  証明書を選択する"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s 証明書のパスワード(_P)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "ログインでエラー: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "セッションの開始でエラー: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "トークンをアンロック(_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "発行"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "%s PIN を入力"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "ログイン(_L)"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "PIN を記憶する(_R)"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "このユーザーのパスワードのみ保存する"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "すべてのユーザーのパスワードを保存する"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "毎回このパスワードを要求する"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "パスワードは不要です"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "パスワードを表示(_O)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "第 3 のパスワード(_T):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "セカンダリーパスワード(_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "パスワード(_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "クリックして接続する"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "新規…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "なし"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "動的 WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "作成(_R)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Wi-Fi ネットワーク '%s' にアクセスするには、パスワードか暗号化キーが必要で"
+"す。"
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi ネットワークの認証が必要です"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi ネットワークでは認証が要求されます"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "新しい Wi-Fi ネットワークを作成"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "新規 Wi-Fi ネットワーク"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "作成する Wi-Fi ネットワークの名前を入力してください。"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "非表示 Wi-Fi ネットワークに接続する"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "非表示 Wi-Fi ネットワーク"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"接続する Wi-Fi ネットワークの名前とセキュリティー詳細を入力してください。"
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi セキュリティー(_S)"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "接続(_O)"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi アダプター(_A)"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "プロバイダーが見つからないので手動で入力します(_M):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "プロバイダー:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "国や地域の一覧:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "国や地域"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "有線"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"パスワードが見つからない、もしくは接続が無効です。無効の場合は、まず nm-"
+"connection-editor で接続を編集する必要があります。"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi セキュリティー(_S):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "ネットワーク名(_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "接続(_O):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi アダプター(_A):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "使用法:"
@@ -4287,25 +4764,25 @@ msgstr "CA 証明書が選択されていません"
 msgid "selected CA certificate file does not exist"
 msgstr "選択された CA 証明書ファイルは存在しません"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC ファイルがありません"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "PAC ファイルを選択"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ファイル (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "すべてのファイル"
 
@@ -4342,16 +4819,16 @@ msgstr "内部認証(_I)"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "自動 PAC プロビジョニングを許可(_V)"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP ユーザー名がありません"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP パスワードがありません"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4386,15 +4863,15 @@ msgstr "サーバー証明書名のサフィックス"
 msgid "_Domain"
 msgstr "ドメイン(_D)"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "EAP ユーザー名がありません"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "EAP パスワードがありません"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "EAP クライアントの秘密鍵のパスフレーズがありません"
 
@@ -4406,23 +4883,23 @@ msgstr "秘密鍵のパスフレーズ(_R)"
 msgid "Sh_ow passphrase"
 msgstr "パスフレーズの表示(_O)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS アイデンティティーがありません"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "ユーザー証明書が選択されていません"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "選択されたユーザー証明書ファイルは存在しません"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "キーが選択されていません"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "選択されたキーファイルは存在しません"
 
@@ -4432,7 +4909,7 @@ msgstr "選択されたキーファイルは存在しません"
 msgid "I_dentity"
 msgstr "ID(_D)"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (非 EAP)"
 
@@ -4470,15 +4947,15 @@ msgstr "外部で設定"
 msgid "Au_thentication"
 msgstr "認証(_T)"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "leap-username が見つかりません"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "leap-password が見つかりません"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "EAP パスワードがありません"
@@ -4487,22 +4964,22 @@ msgstr "EAP パスワードがありません"
 msgid "_Type"
 msgstr "種類(_T)"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "wep-key が見つかりません"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4511,11 +4988,11 @@ msgstr ""
 "無効な wep-key: キーの長さ %zu が正しくありません。キーの長さは 5/13 (ascii) "
 "か 10/26 (hex) にする必要があります"
 
-#: src/wireless-security/ws-wep-key.c:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "無効な wep-key: パスフレーズを空白にすることはできません"
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "無効な wep-key: パスフレーズは 64 文字未満にする必要があります。"
 
@@ -4543,7 +5020,7 @@ msgstr "キーを表示(_W)"
 msgid "WEP inde_x"
 msgstr "WEP インデックス(_X)"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4552,350 +5029,10 @@ msgstr ""
 "無効な wpa-psk: キーの長さ %zu が無効です。[8,63] バイトもしくは 16 進数で "
 "64 桁にする必要があります"
 
-#: src/wireless-security/ws-wpa-psk.c:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "無効な wpa-psk: 16 進数の 64 バイトでキーを解釈できません"
 
-#~ msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
-#~ msgstr "電話でスキャンするか、<a href=\"nma:print\">印刷します</a>"
-
-#~ msgid "No certificate set"
-#~ msgstr "証明書セットがありません"
-
-#~ msgid "No key set"
-#~ msgstr "キーセットがありません"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "%s 証明書のキーを選択する"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "%s プライベートキー(_K)"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "%s キーパスワード(_P)"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "%s 証明書を選択する"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s 証明書(_C)"
-
-#~ msgid "My country is not listed"
-#~ msgstr "私の国は一覧に有りません"
-
-#~ msgid "Unlisted"
-#~ msgstr "一覧に無い"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "プランが一覧にありません..."
-
-#~ msgid "Provider"
-#~ msgstr "プロバイダー"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "GSM デバイスがインストールされています"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "CDMA デバイスがインストールされています"
-
-#~ msgid "Any device"
-#~ msgstr "すべてのデバイス"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "新規のモバイルブロードバンド接続"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "このアシスタントを使用すると、携帯 (3G) ネットワークへのモバイルブロードバ"
-#~ "ンド接続が簡単にできます。"
-
-#~ msgid "You will need the following information:"
-#~ msgstr "以下の情報が必要です:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "使用するブロードバンドプロバイダー名"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "使用するブロードバンド請求書プラン名"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(一部のケースで) ブロードバンド請求書プラン APN (Access Point Name)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "このモバイルブロードバンドデバイス用の接続を作成(_T):"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "モバイルブロードバンド接続のセットアップ"
-
-#~ msgid "Country or region:"
-#~ msgstr "国または地域:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "プロバイダーの国や地域を選択"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "プロバイダーを一覧から選択(_L):"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "プロバイダーが見つからないので手動で接続を設定します(_M):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "私のプロバイダーは GSM 技術 (GPRS, EDGE, UMTS, HSPA) を使用します"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "私のプロバイダーは CDMA 技術 (1xRTT, EVDO) を使用します"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "使用プロバイダーを選択"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "使用プランの選択(_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "選択した APN (Access Point Name)(_A):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "警告: 正しくないプランを選択すると、ブロードバンドアカウントで請求書の問題"
-#~ "が発生したり、接続ができなくなったりする可能性があります。\n"
-#~ "\n"
-#~ "ご自分のプランが分からない場合は、そのプランの APN についてプロバイダーに"
-#~ "お尋ねください。"
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "使用する請求書プランを選択"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "ご使用のモバイルブロードバンド接続は、以下のように設定されています。"
-
-#~ msgid "Your Device:"
-#~ msgstr "使用デバイス:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "使用プロバイダー:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "使用プラン:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "選択した設定でモバイルブロードバンドプロバイダーに接続されます。接続が失敗"
-#~ "したり、ネットワークリソースにアクセスできない場合は、設定をダブルクリック"
-#~ "してください。モバイルブロードバンド設定を変更するには、システム → 設定メ"
-#~ "ニューから「ネットワーク接続」を選択します。"
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "モバイルブロードバンドセッティングを確定する"
-
-#~ msgid "(None)"
-#~ msgstr "(なし)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "%s 内のキー"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "%s 内の 証明書"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(不明)"
-
-#~ msgid "Select"
-#~ msgstr "選択"
-
-#~ msgid "Cancel"
-#~ msgstr "キャンセル"
-
-#~ msgid "Select from file…"
-#~ msgstr "ファイルから選択…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "%s  証明書を選択する"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "%s 証明書のパスワード(_P)"
-
-#~ msgid "Error logging in: "
-#~ msgstr "ログインでエラー: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "セッションの開始でエラー: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "トークンをアンロック(_U)"
-
-#~ msgid "Issued By"
-#~ msgstr "発行"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "%s PIN を入力"
-
-#~ msgid "_Login"
-#~ msgstr "ログイン(_L)"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "PIN を記憶する(_R)"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "このユーザーのパスワードのみ保存する"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "すべてのユーザーのパスワードを保存する"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "毎回このパスワードを要求する"
-
-#~ msgid "The password is not required"
-#~ msgstr "パスワードは不要です"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "パスワードを表示(_O)"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "第 3 のパスワード(_T):"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "セカンダリーパスワード(_S):"
-
-#~ msgid "_Password:"
-#~ msgstr "パスワード(_P):"
-
-#~ msgid "Click to connect"
-#~ msgstr "クリックして接続する"
-
-#~ msgid "New…"
-#~ msgstr "新規…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "なし"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "動的 WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "作成(_R)"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Wi-Fi ネットワーク '%s' にアクセスするには、パスワードか暗号化キーが必要で"
-#~ "す。"
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wi-Fi ネットワークの認証が必要です"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Wi-Fi ネットワークでは認証が要求されます"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "新しい Wi-Fi ネットワークを作成"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "新規 Wi-Fi ネットワーク"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "作成する Wi-Fi ネットワークの名前を入力してください。"
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "非表示 Wi-Fi ネットワークに接続する"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "非表示 Wi-Fi ネットワーク"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "接続する Wi-Fi ネットワークの名前とセキュリティー詳細を入力してください。"
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wi-Fi セキュリティー(_S)"
-
-#~ msgid "C_onnection"
-#~ msgstr "接続(_O)"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-Fi アダプター(_A)"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "プロバイダーが見つからないので手動で入力します(_M):"
-
-#~ msgid "Provider:"
-#~ msgstr "プロバイダー:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "国や地域の一覧:"
-
-#~ msgid "Country or region"
-#~ msgstr "国や地域"
-
-#~ msgid "Wired"
-#~ msgstr "有線"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "パスワードが見つからない、もしくは接続が無効です。無効の場合は、まず nm-"
-#~ "connection-editor で接続を編集する必要があります。"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wi-Fi セキュリティー(_S):"
-
-#~ msgid "_Network name:"
-#~ msgstr "ネットワーク名(_N):"
-
-#~ msgid "C_onnection:"
-#~ msgstr "接続(_O):"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-Fi アダプター(_A):"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/kk.po b/po/kk.po
index fce5e025..fa287712 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2018-08-26 08:42+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst gmail com>\n"
 "Language-Team: Kazakh <kk_KZ googlegroups com>\n"
@@ -20,6 +20,7 @@ msgstr ""
 "X-Generator: Poedit 2.1.1\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Желі"
 
@@ -210,15 +211,19 @@ msgstr "802.1X аутентификациясы"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "Ба_с тарту"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "Ба_йланысу"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "Желі а_тауы"
 
@@ -561,7 +566,7 @@ msgstr "Мобильді кеңжолақты (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Мобильді кеңжолақты"
 
@@ -684,7 +689,9 @@ msgstr "DSL аутентификациясы"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_ОК"
 
@@ -787,6 +794,7 @@ msgid "Error displaying connection information:"
 msgstr "Байланыс ақпаратын көрсету сәтсіз:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -936,7 +944,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Қатынау нүктесі"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
@@ -961,7 +969,8 @@ msgstr "VPN баннері"
 msgid "Base Connection"
 msgstr "Негізгі байланыс"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Белгісіз"
 
@@ -1685,6 +1694,7 @@ msgid "_Service"
 msgstr "Қы_змет"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2301,6 +2311,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Үй желісі қолжетерсіз болған кезде, _роумингті қолдануға рұқсат ету"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Пар_ольдерді көрсету"
 
@@ -2685,13 +2696,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -2994,12 +3006,12 @@ msgid ""
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3009,22 +3021,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bond"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Агрегацияланған (Team)"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Көпір"
 
@@ -3297,6 +3312,7 @@ msgid "Select a connection to delete"
 msgstr "Өшіру үшін байланысты таңдаңыз"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Аты"
 
@@ -3504,6 +3520,8 @@ msgstr "Ethernet байланысы %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Бастапқы"
 
@@ -3725,35 +3743,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Менің провайдерім CDMA негізін_дегі технологияны қолдануда (мыс. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3904,10 +3922,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi байланысы %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 биттік кілті (Hex не ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 биттік кілттік фразасы"
 
@@ -3916,14 +3936,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Динамикалы WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
@@ -3999,6 +4022,450 @@ msgstr "Байланыс ақпараты"
 msgid "_Close"
 msgstr "_Жабу"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Сертификат көрсетілмеген"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Кілт көрсетілмеді"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "%s сертификаты үшін кілтті таңдаңыз"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "%s жеке _кілті"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "%s кілт _паролі"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "%s сертификатын таңдаңыз"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "%s _сертификаты"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Менің елім көрсетілмеген"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Тізілмеген"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Менің жоспарым тізімде жоқ…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Провайдер"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Орнатылған GSM құрылғысы"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Орнатылған CDMA құрылғысы"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Кез-келген құрылғы"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Жаңа мобильді кеңжолақты байланысы"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Сізге келесі ақпарат керек болады:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Бұ_л мобильді кеңжолақты құрылғы үшін байланысты жасау:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Мобильді кеңжолақты байланысты орнату"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Ел не аймақ"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Провайдеріңіздің ел не аймағын таңдаңыз"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Өз провайдеріңізді тізі_мнен таңдаңыз:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Өз провайдерімді таба алмадым, оны қол_мен енгіземін:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Менің провайдерім GSM қолдануда (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Менің провайдерім CDMA қолдануда (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Провайдеріңізді таңдаңыз"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "Жоспарыңызды таң_даңыз:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Төлеу жоспарын таңдаңыз"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Сіздің мобильді кеңжолақты байланысыңыз келесі баптаулармен бапталған:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Құрылғыңыз:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Провайдеріңіз:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Жоспарыңыз:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Мобильді кеңжолақты баптауларын растау"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Ешнәрсе)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "%s ішіндегі кілт"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "%s ішіндегі сертификаты"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Белгісіз)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Таңдау"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Бас тарту"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Файлдан таңдау…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "%s сертификатын таңдау"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s сертификат _паролі"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Кіру қатесі: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Сессияны ашу қатесі: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "Токенді бо_сату"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Шығарған"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "%s PIN кодын енгізіңіз"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Кіру"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "PIN кодын _есте сақтау"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Парольді тек бұл пайдаланушы үшін сақтау"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Парольді барлық пайдаланушылар үшін сақтау"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Әр рет бұл парольді сұрап отыру"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Пароль керек емес"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Пар_ольдерді көрсету"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "Ү_шіншілік пароль:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "Қо_сымша пароль:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Пароль:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Байланысу үшін шертіңіз"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Жаңа…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ешнәрсе"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Динамикалық WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "Жаса_у"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "\"%s\" Wi-Fi желісіне байланысу үшін пароль не шифрлеу кілттері керек."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi желі аутентификациясы керек"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi желісі үшін аутентификация керек"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Жаңа Wi-Fi желісін жасау"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Жаңа Wi-Fi желісі"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Жасалатын Wi-Fi желісінің атын енгізіңіз."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Жасырын Wi-Fi желісіне байланысу"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Жасырын Wi-Fi желісі"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Байланысты орнатқыңыз келетін Wi-Fi жасырын желісінің атын мен қауіпсіздік "
+"ақпаратын енгізіңіз."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi қауі_псіздігі"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "Ба_йланыс"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi _құрылғысы"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Өз провайдерімді таба алмадым, оны қол_мен енгіземін:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Провайдер:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Ел не аймақтар тізімі:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Ел не аймақ"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Сымды"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC желісі"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Пароль жоқ болып тұр, немесе байланыс жарамсыз болып тұр. Егер жарамсыз "
+"болса, алдымен байланысты nm-connection-editor көмегімен түзетуіңіз керек"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi қауі_псіздігі:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Желі а_тауы:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Ба_йланыс:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi _құрылғысы:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Қолданылуы:"
@@ -4146,25 +4613,25 @@ msgstr "СО сертификаты таңдалмады"
 msgid "selected CA certificate file does not exist"
 msgstr "таңдалған СО сертификат файлы жоқ болып тұр"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC файлы жоқ"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "PAC файлын таңдаңыз"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC файлдары (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Барлық файлдар"
 
@@ -4200,16 +4667,16 @@ msgstr "І_шкі аутентификация"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Автоматты PAC ұсы_нуды рұқсат ету"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP пайдаланушы аты жоқ"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP паролі жоқ"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4244,15 +4711,15 @@ msgstr ""
 msgid "_Domain"
 msgstr "_Домен"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "EAP пайдаланушы аты жоқ"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "EAP паролі жоқ"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4266,23 +4733,23 @@ msgstr "WEP 128 биттік кілттік фразасы"
 msgid "Sh_ow passphrase"
 msgstr "Пар_ольдерді көрсету"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS identity жоқ"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "пайдаланушы сертификаты таңдалмады"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "таңдалған пайдаланушы сертификат файлы жоқ болып тұр"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "кілт таңдалмады"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "таңдалған кілттер файлы жоқ болып тұр"
 
@@ -4290,7 +4757,7 @@ msgstr "таңдалған кілттер файлы жоқ болып тұр"
 msgid "I_dentity"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (EAP жоқ)"
 
@@ -4328,15 +4795,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Аутент_ификация"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "leap-username жоқ"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "leap-password жоқ"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "EAP паролі жоқ"
@@ -4345,24 +4812,24 @@ msgstr "EAP паролі жоқ"
 msgid "_Type"
 msgstr "_Түрі"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "wep-key жоқ"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4371,11 +4838,11 @@ msgstr ""
 "жарамсыз wep-key: кілт ұзындығы %zu қате. Кілт ұзындығы 5/13 (ascii) немесе "
 "10/26 (оналтылық) болуы тиіс"
 
-#: src/wireless-security/ws-wep-key.c:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "жарамсыз wep-key: кілттік фраза бос емес болуы тиіс"
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "жарамсыз wep-key: кілттік фраза 64 таңбадан аз болуы тиіс"
 
@@ -4403,7 +4870,7 @@ msgstr "Кіл_тті көрсету"
 msgid "WEP inde_x"
 msgstr "WEP и_ндексі"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4412,307 +4879,12 @@ msgstr ""
 "жарамсыз wpa-psk: кілт ұзындығы %zu жарамсыз. Ол [8,63] байт немесе 64 "
 "оналтылық сан болуы тиіс"
 
-#: src/wireless-security/ws-wpa-psk.c:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "жарамсыз wpa-psk: 64 байты бар кілтті он алтылық кілт ретінде талдау мүмкін "
 "емес"
 
-#~ msgid "No certificate set"
-#~ msgstr "Сертификат көрсетілмеген"
-
-#~ msgid "No key set"
-#~ msgstr "Кілт көрсетілмеді"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "%s сертификаты үшін кілтті таңдаңыз"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "%s жеке _кілті"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "%s кілт _паролі"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "%s сертификатын таңдаңыз"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s _сертификаты"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Менің елім көрсетілмеген"
-
-#~ msgid "Unlisted"
-#~ msgstr "Тізілмеген"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Менің жоспарым тізімде жоқ…"
-
-#~ msgid "Provider"
-#~ msgstr "Провайдер"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Орнатылған GSM құрылғысы"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Орнатылған CDMA құрылғысы"
-
-#~ msgid "Any device"
-#~ msgstr "Кез-келген құрылғы"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Жаңа мобильді кеңжолақты байланысы"
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Сізге келесі ақпарат керек болады:"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Бұ_л мобильді кеңжолақты құрылғы үшін байланысты жасау:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Мобильді кеңжолақты байланысты орнату"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Ел не аймақ"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Провайдеріңіздің ел не аймағын таңдаңыз"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Өз провайдеріңізді тізі_мнен таңдаңыз:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Өз провайдерімді таба алмадым, оны қол_мен енгіземін:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Менің провайдерім GSM қолдануда (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Менің провайдерім CDMA қолдануда (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Провайдеріңізді таңдаңыз"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "Жоспарыңызды таң_даңыз:"
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Төлеу жоспарын таңдаңыз"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Сіздің мобильді кеңжолақты байланысыңыз келесі баптаулармен бапталған:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Құрылғыңыз:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Провайдеріңіз:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Жоспарыңыз:"
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Мобильді кеңжолақты баптауларын растау"
-
-#~ msgid "(None)"
-#~ msgstr "(Ешнәрсе)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "%s ішіндегі кілт"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "%s ішіндегі сертификаты"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Белгісіз)"
-
-#~ msgid "Select"
-#~ msgstr "Таңдау"
-
-#~ msgid "Cancel"
-#~ msgstr "Бас тарту"
-
-#~ msgid "Select from file…"
-#~ msgstr "Файлдан таңдау…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "%s сертификатын таңдау"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "%s сертификат _паролі"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Кіру қатесі: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Сессияны ашу қатесі: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "Токенді бо_сату"
-
-#~ msgid "Issued By"
-#~ msgstr "Шығарған"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "%s PIN кодын енгізіңіз"
-
-#~ msgid "_Login"
-#~ msgstr "_Кіру"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "PIN кодын _есте сақтау"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Парольді тек бұл пайдаланушы үшін сақтау"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Парольді барлық пайдаланушылар үшін сақтау"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Әр рет бұл парольді сұрап отыру"
-
-#~ msgid "The password is not required"
-#~ msgstr "Пароль керек емес"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Пар_ольдерді көрсету"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Ү_шіншілік пароль:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "Қо_сымша пароль:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Пароль:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Байланысу үшін шертіңіз"
-
-#~ msgid "New…"
-#~ msgstr "Жаңа…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Ешнәрсе"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Динамикалық WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "Жаса_у"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "\"%s\" Wi-Fi желісіне байланысу үшін пароль не шифрлеу кілттері керек."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wi-Fi желі аутентификациясы керек"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Wi-Fi желісі үшін аутентификация керек"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Жаңа Wi-Fi желісін жасау"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Жаңа Wi-Fi желісі"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Жасалатын Wi-Fi желісінің атын енгізіңіз."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Жасырын Wi-Fi желісіне байланысу"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Жасырын Wi-Fi желісі"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Байланысты орнатқыңыз келетін Wi-Fi жасырын желісінің атын мен "
-#~ "қауіпсіздік ақпаратын енгізіңіз."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wi-Fi қауі_псіздігі"
-
-#~ msgid "C_onnection"
-#~ msgstr "Ба_йланыс"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-Fi _құрылғысы"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Өз провайдерімді таба алмадым, оны қол_мен енгіземін:"
-
-#~ msgid "Provider:"
-#~ msgstr "Провайдер:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Ел не аймақтар тізімі:"
-
-#~ msgid "Country or region"
-#~ msgstr "Ел не аймақ"
-
-#~ msgid "Wired"
-#~ msgstr "Сымды"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC желісі"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Пароль жоқ болып тұр, немесе байланыс жарамсыз болып тұр. Егер жарамсыз "
-#~ "болса, алдымен байланысты nm-connection-editor көмегімен түзетуіңіз керек"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wi-Fi қауі_псіздігі:"
-
-#~ msgid "_Network name:"
-#~ msgstr "Желі а_тауы:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Ба_йланыс:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-Fi _құрылғысы:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/km.po b/po/km.po
index e1735b04..2bbcee32 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: po_nm-applet-km\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2014-04-23 15:44+0700\n"
 "Last-Translator: Sophea Sok <sophea open org kh>\n"
 "Language-Team: Khmer <>\n"
@@ -23,6 +23,7 @@ msgstr ""
 "X-Language: km-KH\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "បណ្ដាញ"
 
@@ -205,16 +206,20 @@ msgstr "ការ​ផ្ទៀងផ្ទាត់ 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 #, fuzzy
 msgid "C_onnect"
 msgstr "បាន​តភ្ជាប់"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "ឈ្មោះ​បណ្ដាញ៖"
@@ -566,7 +571,7 @@ msgstr "រលកអាកាស​ចល័ត (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "រលកអាកាស​ចល័ត"
 
@@ -688,7 +693,9 @@ msgstr "ការ​ផ្ទៀងផ្ទាត់ DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -793,6 +800,7 @@ msgid "Error displaying connection information:"
 msgstr "កំហុស​ក្នុង​ការ​បង្ហាញ​ព័ត៌មាន​តភ្ជាប់៖"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -943,7 +951,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "ពាក្យសម្ងាត់៖"
@@ -968,7 +976,8 @@ msgstr "ស្លាក VPN ៖"
 msgid "Base Connection"
 msgstr "ការ​តភ្ជាប់គោល៖"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "មិនស្គាល់"
 
@@ -1733,6 +1742,7 @@ msgid "_Service"
 msgstr "សេវា៖"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2389,6 +2399,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "អនុញ្ញាត​ឲ្យ​រ៉ូមីង ប្រសិនបើ​មិន​មាន​បណ្ដាញ​ផ្ទះ"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
 
@@ -2793,13 +2804,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "អ៊ីសឺរណិត"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3123,12 +3135,12 @@ msgstr ""
 "តភ្ជាប់​បរាជ័យ សូម​សាកល្បង​បិទ​ការ​គាំទ្រ​វិធីសាស្ត្រ​មួយ​ចំនួន។"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "វ៉ាយហ្វាយ"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "ប៊្លូធូស"
 
@@ -3138,22 +3150,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bond"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Team"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Bridge"
 
@@ -3440,6 +3455,7 @@ msgid "Select a connection to delete"
 msgstr "ការ​តភ្ជាប់ Team %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "ឈ្មោះ"
 
@@ -3663,6 +3679,8 @@ msgstr "ការ​តភ្ជាប់​អ៊ីសឺណិត %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "លំនាំដើម"
 
@@ -3890,35 +3908,35 @@ msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញ
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា CDMA-based (ឧ. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4082,10 +4100,12 @@ msgid "Wi-Fi connection %d"
 msgstr "ការ​តភ្ជាប់​វ៉ាយហ្វាយ %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Key (Hex ឬ ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "ឃ្លា​សម្ងាត់ WEP 128-bit"
 
@@ -4094,14 +4114,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP (802.1X) ថាមវន្ត"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ផ្ទាល់ខ្លួន"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ក្រុមហ៊ុន"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 ផ្ទាល់ខ្លួន"
@@ -4176,6 +4199,475 @@ msgstr "ព័ត៌មាន​តភ្ជាប់"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "ជ្រើស​វិញ្ញាបនបត្រ CA"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "សោ​ឯកជន៖"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "ពាក្យសម្ងាត់​សោ​ឯកជន៖"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "ជ្រើស​វិញ្ញាបនបត្រ CA"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "វិញ្ញាបនបត្រ​អ្នកប្រើ៖"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "ប្រទេស​របស់​ខ្ញុំ​មិន​ត្រូវ​បាន​រាយ"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "មិន​បាន​រាយ"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "គម្រោង​របស់​ខ្ញុំ​​មិន​ត្រូវ​បាន​រាយ..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "ក្រុមហ៊ុន​ផ្ដល់"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "ឧបករណ៍ GSM ដែល​បាន​ដំឡើង"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "ឧបករណ៍ CDMA ដែល​បាន​ដំឡើង"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "ឧបករណ៍​ណាមួយ"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ថ្មី"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr "អ្នកជំនួយការ​នឹង​ជួយ​អ្នក​ក្នុង​ការ​រៀបចំ​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ទៅកាន់​បណ្ដាញ​ទូរស័ព្ទ (3G) ។"
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "អ្នក​នឹង​ត្រូវការ​ព័ត៌មាន​ដូច​ខាងក្រោម៖"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "ឈ្មោះ​ក្រុម​ហ៊ុន​ផ្ដល់​​រលក​អាកាស​របស់​អ្នក"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "ឈ្មោះ​គម្រោង​ចេញ​វិក្កយបត្រ​រលកអាកាស​របស់​អ្នក"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(ក្នុង​ករណី​ខ្លះ​) គម្រោង​ចេញ​វិក្កយបត្រ​រលកអាកាស​​​របស់​ APN (Access Point Name)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "បង្កើត​ការ​តភ្ជាប់​សម្រាប់​ឧបករណ៍​រលកអាកាស​ចល័ត​នេះ៖"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "រៀបចំ​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "ប្រទេស ឬ​តំបន់"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "ជ្រើស​ប្រទេស ឬ​តំបន់​របស់​ក្រុមហ៊ុន​ផ្ដល់"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "ជ្រើស​ក្រុមហ៊ុន​ផ្ដល់​ពី​បញ្ជី៖"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "ខ្ញុំ​មិន​អាច​រក​ឃើញ​ក្រុមហ៊ុន​ផ្ដល់ ហើយ​ខ្ញុំ​ចង់​វាយ​បញ្ចូល​វា​ដោយ​ដៃ៖"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា GSM  (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា CDMA  (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "ជ្រើស​ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "ជ្រើស​គម្រោង​របស់​អ្នក៖"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "បាន​ជ្រើស​គម្រោង APN (Access Point Name) ៖"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"ព្រមាន​៖ ការ​ជ្រើស​គម្រោង​មិន​ត្រឹមត្រូវ​អាច​​​បង្ហាញ​លទ្ធផល​នៅ​ក្នុង​ការ​ចេញ​វិក្កយបត្រ​ 
សម្រាប់​គណនី​រលកអាកាស ឬ​"
+"អាច​រារាំង​ការ​តភ្ជាប់​របស់​អ្នក។\n"
+"\n"
+"បើ​​អ្នក​មិន​ប្រាកដ​ជាមួយ​គម្រោង​របស់​អ្នក​ទេ​ ​សូម​​សួរ​ក្រុម​ហ៊ុន​ផ្ដល់​​របស់​អ្នក​ អំពី​​គម្រោង APN 
របស់​អ្នក។"
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "ជ្រើស​គម្រោង​ចេញ​វិក្កយបត្រ​របស់​អ្នក"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​របស់​អ្នក​ត្រូវ​បាន​កំណត់​រចនាសម្ព័ន្ធ​​ដូច​ខាងក្រោម៖"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "ឧបករណ៍​របស់​អ្នក៖"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក៖"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "គម្រោង​របស់​អ្នក៖"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"ឥឡូវនេះ 
ការ​តភ្ជាប់​នឹង​ត្រូវ​បាន​ភ្ជាប់​ទៅកាន់​ក្រុមហ៊ុន​ផ្ដល់​រលកអាកាស​ចល័ត​ដោយ​ប្រើ​ការ​កំណត់​ដែល​អ្នក​បាន​"
+"ជ្រើស។ ប្រសិនបើ​ការ​តភ្ជាប់​បរាជ័យ ឬ​អ្នក​មិន​អាច​ចូល​ប្រើ​ធនធាន​បណ្ដាញ​បាន 
សូម​ពិនិត្យមើល​ការ​កំណត់​របស់​អ្នក​"
+"ឡើងវិញ។ ដើម្បី​កែប្រែ​ការ​កំណត់​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​របស់​អ្នក ជ្រើស \"ការ​តភ្ជាប់​បណ្ដាញ\" ពី​ម៉ឺនុយ "
+"ប្រព័ន្ធ >> ចំណូលចិត្ត ។"
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "បញ្ចាក់​ការ​កំណត់​រលកអាកាស​ចល័ត"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(គ្មាន)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "វិញ្ញាបនបត្រ CA ៖"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "មិនស្គាល់"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "ជ្រើស​វិញ្ញាបនបត្រ CA"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "វិញ្ញាបនបត្រ​អ្នកប្រើ៖"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "កំហុស​ក្នុង​ការ​កែសម្រួល​ការ​តភ្ជាប់"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "ដោះ​សោ"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "រក្សាទុក​ពាក្យសម្ងាត់​​សម្រាប់​តែ​អ្នកប្រើ​នេះ​ប៉ុណ្ណោះ"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "រក្សាទុក​ពាក្យសម្ងាត់​សម្រាប់​គ្រប់​អ្នកប្រើ​ទាំងអស់"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "សួរ​រក​ពាក្យសម្ងាត់​នេះ​រាល់ពេល"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "បាន​ទាមទារ​ពាក្យសម្ងាត់​ដើម្បី​តភ្ជាប់​ទៅ '%s' ។"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "ពាក្យសម្ងាត់៖"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "ពាក្យសម្ងាត់៖"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "ពាក្យសម្ងាត់៖"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "ផ្ដាច់"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "គ្មាន"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP (802.1X) ថាមវន្ត"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "បង្កើត"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "បាន​ទាមទារ​ពាក្យសម្ងាត់ ឬ​សោ​ការ​ដាក់​លេខកូដ ដើម្បី​ចូល​ដំណើរការ​បណ្ដាញ​វ៉ាយហ្វាយ '%s' ។"
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​បណ្ដាញ​វ៉ាយហ្វាយ"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​តាម​បណ្ដាញ​វ៉ាយហ្វាយ"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "បង្កើត​បណ្ដាញ​វ៉ាយហ្វាយ​ថ្មី"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "បណ្ដាញ​វ៉ាយហ្វាយ​ថ្មី"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "បញ្ចូល​ឈ្មោះ​សម្រាប់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​អ្នក​ចង់​បង្កើត។"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "តភ្ជាប់​ទៅកាន់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​លាក់"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​លាក់"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "បញ្ចូល​ព័ត៌មាន​លម្អិត​អំពី​ឈ្មោះ និង​សុវត្ថិភាព​របស់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​អ្នក​ចង់​តភ្ជាប់។"
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "សុវត្ថិភាព​វ៉ាយហ្វាយ៖"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "ការ​តភ្ជាប់៖"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "អាដាប់ទ័រ​វ៉ាយហ្វាយ៖"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "ខ្ញុំ​មិន​អាច​រក​ឃើញ​ក្រុមហ៊ុន​ផ្ដល់ ហើយ​ខ្ញុំ​ចង់​វាយ​បញ្ចូល​វា​ដោយ​ដៃ៖"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "ក្រុមហ៊ុន​ផ្ដល់៖"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "បញ្ជី​ប្រទេស ឬ​តំបន់៖"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "ប្រទេស ឬ​តំបន់"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "មាន​ខ្សែ"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "សុវត្ថិភាព​វ៉ាយហ្វាយ៖"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "ឈ្មោះ​បណ្ដាញ៖"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "ការ​តភ្ជាប់៖"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "អាដាប់ទ័រ​វ៉ាយហ្វាយ៖"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "ការ​ប្រើប្រាស់៖"
@@ -4326,26 +4818,26 @@ msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនប
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ជ្រើស​ឯកសារ PAC..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "ឯកសារ PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "ឯកសារ​ទាំងអស់"
 
@@ -4384,16 +4876,16 @@ msgstr "ការ​ផ្ទៀងផ្ទាត់​ខាងក្នុង
 msgid "Allow automatic PAC pro_visioning"
 msgstr "អនុញ្ញាត​ការ​ផ្ដល់ PAC ដោយ​ស្វ័យប្រវត្តិ"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4429,15 +4921,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4451,24 +4943,24 @@ msgstr "ឃ្លា​សម្ងាត់ WEP 128-bit"
 msgid "Sh_ow passphrase"
 msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4477,7 +4969,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "អត្តសញ្ញាណ៖"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4517,15 +5009,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "ផ្ទៀងផ្ទាត់៖"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "ពាក្យសម្ងាត់​សោ​ឯកជន៖"
@@ -4535,33 +5027,33 @@ msgstr "ពាក្យសម្ងាត់​សោ​ឯកជន៖"
 msgid "_Type"
 msgstr "ប្រភេទ៖"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4591,328 +5083,17 @@ msgstr "បង្ហាញ​សោ"
 msgid "WEP inde_x"
 msgstr "លិបិក្រម WEP៖"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "ជ្រើស​វិញ្ញាបនបត្រ CA"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "សោ​ឯកជន៖"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "ពាក្យសម្ងាត់​សោ​ឯកជន៖"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "ជ្រើស​វិញ្ញាបនបត្រ CA"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "វិញ្ញាបនបត្រ​អ្នកប្រើ៖"
-
-#~ msgid "My country is not listed"
-#~ msgstr "ប្រទេស​របស់​ខ្ញុំ​មិន​ត្រូវ​បាន​រាយ"
-
-#~ msgid "Unlisted"
-#~ msgstr "មិន​បាន​រាយ"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "គម្រោង​របស់​ខ្ញុំ​​មិន​ត្រូវ​បាន​រាយ..."
-
-#~ msgid "Provider"
-#~ msgstr "ក្រុមហ៊ុន​ផ្ដល់"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "ឧបករណ៍ GSM ដែល​បាន​ដំឡើង"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "ឧបករណ៍ CDMA ដែល​បាន​ដំឡើង"
-
-#~ msgid "Any device"
-#~ msgstr "ឧបករណ៍​ណាមួយ"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ថ្មី"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr "អ្នកជំនួយការ​នឹង​ជួយ​អ្នក​ក្នុង​ការ​រៀបចំ​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ទៅកាន់​បណ្ដាញ​ទូរស័ព្ទ (3G) ។"
-
-#~ msgid "You will need the following information:"
-#~ msgstr "អ្នក​នឹង​ត្រូវការ​ព័ត៌មាន​ដូច​ខាងក្រោម៖"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "ឈ្មោះ​ក្រុម​ហ៊ុន​ផ្ដល់​​រលក​អាកាស​របស់​អ្នក"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "ឈ្មោះ​គម្រោង​ចេញ​វិក្កយបត្រ​រលកអាកាស​របស់​អ្នក"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(ក្នុង​ករណី​ខ្លះ​) គម្រោង​ចេញ​វិក្កយបត្រ​រលកអាកាស​​​របស់​ APN (Access Point Name)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "បង្កើត​ការ​តភ្ជាប់​សម្រាប់​ឧបករណ៍​រលកអាកាស​ចល័ត​នេះ៖"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "រៀបចំ​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "ប្រទេស ឬ​តំបន់"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "ជ្រើស​ប្រទេស ឬ​តំបន់​របស់​ក្រុមហ៊ុន​ផ្ដល់"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "ជ្រើស​ក្រុមហ៊ុន​ផ្ដល់​ពី​បញ្ជី៖"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "ខ្ញុំ​មិន​អាច​រក​ឃើញ​ក្រុមហ៊ុន​ផ្ដល់ ហើយ​ខ្ញុំ​ចង់​វាយ​បញ្ចូល​វា​ដោយ​ដៃ៖"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា GSM  (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា CDMA  (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "ជ្រើស​ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "ជ្រើស​គម្រោង​របស់​អ្នក៖"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "បាន​ជ្រើស​គម្រោង APN (Access Point Name) ៖"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "ព្រមាន​៖ ការ​ជ្រើស​គម្រោង​មិន​ត្រឹមត្រូវ​អាច​​​បង្ហាញ​លទ្ធផល​នៅ​ក្នុង​ការ​ចេញ​វិក្កយបត្រ​ សម្រាប់​គណនី​"
-#~ "រលកអាកាស ឬ​អាច​រារាំង​ការ​តភ្ជាប់​របស់​អ្នក។\n"
-#~ "\n"
-#~ "បើ​​អ្នក​មិន​ប្រាកដ​ជាមួយ​គម្រោង​របស់​អ្នក​ទេ​ ​សូម​​សួរ​ក្រុម​ហ៊ុន​ផ្ដល់​​របស់​អ្នក​ អំពី​​គម្រោង APN 
របស់​អ្នក។"
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "ជ្រើស​គម្រោង​ចេញ​វិក្កយបត្រ​របស់​អ្នក"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​របស់​អ្នក​ត្រូវ​បាន​កំណត់​រចនាសម្ព័ន្ធ​​ដូច​ខាងក្រោម៖"
-
-#~ msgid "Your Device:"
-#~ msgstr "ឧបករណ៍​របស់​អ្នក៖"
-
-#~ msgid "Your Provider:"
-#~ msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក៖"
-
-#~ msgid "Your Plan:"
-#~ msgstr "គម្រោង​របស់​អ្នក៖"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "ឥឡូវនេះ 
ការ​តភ្ជាប់​នឹង​ត្រូវ​បាន​ភ្ជាប់​ទៅកាន់​ក្រុមហ៊ុន​ផ្ដល់​រលកអាកាស​ចល័ត​ដោយ​ប្រើ​ការ​កំណត់​ដែល​អ្នក​បាន​"
-#~ "ជ្រើស។ ប្រសិនបើ​ការ​តភ្ជាប់​បរាជ័យ ឬ​អ្នក​មិន​អាច​ចូល​ប្រើ​ធនធាន​បណ្ដាញ​បាន 
សូម​ពិនិត្យមើល​ការ​កំណត់​របស់​"
-#~ "អ្នក​ឡើងវិញ។ ដើម្បី​កែប្រែ​ការ​កំណត់​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​របស់​អ្នក ជ្រើស \"ការ​តភ្ជាប់​បណ្ដាញ\" "
-#~ "ពី​ម៉ឺនុយ ប្រព័ន្ធ >> ចំណូលចិត្ត ។"
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "បញ្ចាក់​ការ​កំណត់​រលកអាកាស​ចល័ត"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(គ្មាន)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "វិញ្ញាបនបត្រ CA ៖"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "មិនស្គាល់"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "ជ្រើស​វិញ្ញាបនបត្រ CA"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "វិញ្ញាបនបត្រ​អ្នកប្រើ៖"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "កំហុស​ក្នុង​ការ​កែសម្រួល​ការ​តភ្ជាប់"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "ដោះ​សោ"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "រក្សាទុក​ពាក្យសម្ងាត់​​សម្រាប់​តែ​អ្នកប្រើ​នេះ​ប៉ុណ្ណោះ"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "រក្សាទុក​ពាក្យសម្ងាត់​សម្រាប់​គ្រប់​អ្នកប្រើ​ទាំងអស់"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "សួរ​រក​ពាក្យសម្ងាត់​នេះ​រាល់ពេល"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "បាន​ទាមទារ​ពាក្យសម្ងាត់​ដើម្បី​តភ្ជាប់​ទៅ '%s' ។"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "ពាក្យសម្ងាត់៖"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "ពាក្យសម្ងាត់៖"
-
-#~ msgid "_Password:"
-#~ msgstr "ពាក្យសម្ងាត់៖"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "ផ្ដាច់"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "គ្មាន"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP (802.1X) ថាមវន្ត"
-
-#~ msgid "C_reate"
-#~ msgstr "បង្កើត"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr "បាន​ទាមទារ​ពាក្យសម្ងាត់ ឬ​សោ​ការ​ដាក់​លេខកូដ ដើម្បី​ចូល​ដំណើរការ​បណ្ដាញ​វ៉ាយហ្វាយ '%s' ។"
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​បណ្ដាញ​វ៉ាយហ្វាយ"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​តាម​បណ្ដាញ​វ៉ាយហ្វាយ"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "បង្កើត​បណ្ដាញ​វ៉ាយហ្វាយ​ថ្មី"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "បណ្ដាញ​វ៉ាយហ្វាយ​ថ្មី"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "បញ្ចូល​ឈ្មោះ​សម្រាប់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​អ្នក​ចង់​បង្កើត។"
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "តភ្ជាប់​ទៅកាន់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​លាក់"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​លាក់"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr "បញ្ចូល​ព័ត៌មាន​លម្អិត​អំពី​ឈ្មោះ និង​សុវត្ថិភាព​របស់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​អ្នក​ចង់​តភ្ជាប់។"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "សុវត្ថិភាព​វ៉ាយហ្វាយ៖"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "ការ​តភ្ជាប់៖"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "អាដាប់ទ័រ​វ៉ាយហ្វាយ៖"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "ខ្ញុំ​មិន​អាច​រក​ឃើញ​ក្រុមហ៊ុន​ផ្ដល់ ហើយ​ខ្ញុំ​ចង់​វាយ​បញ្ចូល​វា​ដោយ​ដៃ៖"
-
-#~ msgid "Provider:"
-#~ msgstr "ក្រុមហ៊ុន​ផ្ដល់៖"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "បញ្ជី​ប្រទេស ឬ​តំបន់៖"
-
-#~ msgid "Country or region"
-#~ msgstr "ប្រទេស ឬ​តំបន់"
-
-#~ msgid "Wired"
-#~ msgstr "មាន​ខ្សែ"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "សុវត្ថិភាព​វ៉ាយហ្វាយ៖"
-
-#~ msgid "_Network name:"
-#~ msgstr "ឈ្មោះ​បណ្ដាញ៖"
-
-#~ msgid "C_onnection:"
-#~ msgstr "ការ​តភ្ជាប់៖"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "អាដាប់ទ័រ​វ៉ាយហ្វាយ៖"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (លំនាំដើម)"
 
diff --git a/po/kn.po b/po/kn.po
index 9bf7abf1..1515af35 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2014-12-02 05:10-0500\n"
 "Last-Translator: Shankar <svenkate redhat com>\n"
 "Language-Team: kn_IN <kde-i18n-doc kde org>\n"
@@ -22,6 +22,7 @@ msgstr ""
 "X-Generator: Zanata 3.5.1\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 #, fuzzy
 msgid "Network"
 msgstr "%s ಜಾಲಬಂಧ"
@@ -222,15 +223,19 @@ msgstr "ತಂತಿಸಹಿತ 802.1X ದೃಢೀಕರಣ"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "ಸಂಪರ್ಕ ಜೋಡಿಸು(_o)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "ಜಾಲಬಂಧದ ಹೆಸರು(_N):"
@@ -587,7 +592,7 @@ msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್"
 
@@ -716,7 +721,9 @@ msgstr "DSL ದೃಢೀಕರಣ"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -828,6 +835,7 @@ msgid "Error displaying connection information:"
 msgstr "ಸಂಪರ್ಕದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -981,7 +989,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "ಗುಪ್ತಪದ:"
@@ -1010,7 +1018,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "ಸಂಪರ್ಕ(_n):"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "ಅಜ್ಞಾತ"
 
@@ -1773,6 +1782,7 @@ msgid "_Service"
 msgstr "ಸೇವೆ(_S):"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2434,6 +2444,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "ನೆಲೆ(ಹೋಮ್) ಜಾಲಬಂಧ ಲಭ್ಯವಿಲ್ಲದೆ ಇಲ್ಲದೆ ಇದ್ದಲ್ಲಿ ರೋಮಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸು"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "ಗುಪ್ತಪದಗಳನ್ನು ತೋರಿಸು(_w)"
 
@@ -2839,14 +2850,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "ಸ್ವಯಂ ಎತರ್ನೆಟ್"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3173,12 +3185,12 @@ msgstr ""
 "ಪ್ರಯತ್ನಿಸಿ.</i>"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3188,22 +3200,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "ಬಾಂಡ್"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "ಬ್ರಿಜ್"
 
@@ -3497,6 +3512,7 @@ msgid "Select a connection to delete"
 msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "ಹೆಸರು"
 
@@ -3729,6 +3745,8 @@ msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
 
@@ -3958,35 +3976,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "ನನಗೆ ಒದಗಿಸುವವರು _CDMA-ಆಧರಿತವಾದ ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (ಅಂದರೆ, 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4152,10 +4170,12 @@ msgid "Wi-Fi connection %d"
 msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-ಬಿಟ್ ಕೀಲಿ (ಹೆಕ್ಸ್ ಅಥವ ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit ಗುಪ್ತವಾಕ್ಯ"
 
@@ -4164,14 +4184,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "ಡೈನಮಿಕ್ WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ವೈಯಕ್ತಿಕ"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ಎಂಟರ್ಪ್ರೈಸ್"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 ವೈಯಕ್ತಿಕ"
@@ -4251,6 +4274,501 @@ msgstr "ಸಂಪರ್ಕದ ಮಾಹಿತಿ"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ:"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "ಖಾಸಗಿ ಕೀಲಿ(_k):"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "ಖಾಸಗಿ ಕೀಲಿ ಗುಪ್ತಪದ(_P):"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "ಬಳಕೆದಾರ ಪ್ರಮಾಣಪತ್ರ(_U):"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "ನನ್ನ ದೇಶವನ್ನು ಪಟ್ಟಿ ಮಾಡಲಾಗಿಲ್ಲ"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "ಪಟ್ಟಿ ಮಾಡದೆ ಇರುವ"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "ನನ್ನ ಯೋಜನೆ(ಪ್ಲಾನ್) ಅನ್ನು ಪಟ್ಟಿ ಮಾಡಲಾಗಿಲ್ಲ..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "ಒದಗಿಸುವವರು"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "ಅನುಸ್ಥಾಪಿಸಲಾದ GSM ಸಾಧನ"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "ಅನುಸ್ಥಾಪಿಸಲಾದ CDMA ಸಾಧನ"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "ಯಾವುದೆ ಸಾಧನ"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "ಹೊಸ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"ಈ ಸಹಾಯಕವು ಒಂದು ಸೆಲ್ಯುಲಾರ್ (3G) ಜಾಲಬಂಧಕ್ಕಾಗಿ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನು "
+"ಸಜ್ಜುಗೊಳಿಸಲು ನೆರವಾಗುತ್ತದೆ."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "ನೀವು ಈ ಕೆಳಗಿನ ಮಾಹಿತಿಯನ್ನು ನೀಡಬೇಕಾಗುತ್ತದೆ:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಒದಗಿಸಿದವರ ಹೆಸರು"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಬಿಲ್ಲಿಂಗ್ ಯೋಜನೆಯ(ಪ್ಲಾನ್) ಹೆಸರು"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(ಕೆಲವು ಸಂದರ್ಭಗಳಲ್ಲಿ) ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಬಿಲ್ಲಿಂಗ್ ಯೋಜನೆಯ APN (ಎಕ್ಸೆಸ್ ಪಾಯಿಂಟ್ ನೇಮ್)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "ಈ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಕ್ಕಾಗಿ ಸಂಪರ್ಕವನ್ನು ರಚಿಸು(_t):"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನ ಸಜ್ಜುಗೊಳಿಸಿ"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "ದೇಶದ ಪಟ್ಟಿ:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರ ದೇಶವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರನ್ನು ಪಟ್ಟಿಯಿಂದ ಆಯ್ಕೆ ಮಾಡಿ(_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"ನನಗೆ ಒದಗಿಸುವವರನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಹಾಗು ನಾನೆ ಸ್ವತಃ ನಮೂದಿಸಲು "
+"ಬಯಸುತ್ತೇನೆ(_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "ನನಗೆ ಒದಗಿಸುವವರು GSM ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "ನನಗೆ ಒದಗಿಸುವವರು CDMA ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "ನಿಮ್ಮ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ಆಯ್ಕೆ ಮಾಡಿ(_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಯೋಜನೆಯ (ಪ್ಲಾನ್) _APN (ಎಕ್ಸೆಸ್ ಪಾಯಿಂಟ್ ಹೆಸರು):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"ಎಚ್ಚರಿಕೆ: ನಿಮ್ಮ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ತಪ್ಪಾಗಿ ಆಯ್ಕೆ ಮಾಡಿದಲ್ಲಿ ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಖಾತೆಯ "
+"ಬಿಲ್ಲಿಂಗ್‌ ಸಮಸ್ಯೆಗಳಿಗೆ ಅಥವ ಸಂಪರ್ಕವು ಕಡಿದುಹೋಗಲು ಕಾರಣವಾಗಬಹುದು .\n"
+"\n"
+"ನಿಮ್ಮ ಯೋಜನೆಯ ಬಗೆಗೆ ನಿಮಗೆ ಮಾಹಿತಿ ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ ನಿಮ್ಮ ಯೋಜನೆಯ APN ಗಾಗಿ "
+"ಒದಗಿಸುವವರನ್ನು ಕೇಳಿ."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "ನಿಮ್ಮ ಬಿಲ್ಲಿಂಗ್ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "ನಿಮ್ಮ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನು ಈ ಕೆಳಗಿನ ಸಿದ್ಧತೆಗಳೊಂದಿಗೆ ಸಂರಚಿಸಲಾಗಿದೆ:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "ನಿಮ್ಮ ಸಾಧನ:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರು:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "ನಿಮ್ಮ ಯೋಜನೆ(ಪ್ಲಾನ್):"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"ನೀವು ಆಯ್ಕೆ ಮಾಡಿದ ಸಿದ್ಧತೆಗಳನ್ನು ಬಳಸಿಕೊಂಡಿ ನಿಮ್ಮ ಮೊಬೈಲ್‌ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಒದಗಿಸುವವರೊಂದಿಗೆ "
+"ಒಂದು ಸಂಪರ್ಕವನ್ನು ಏರ್ಪಡಿಸಲಾಗುವುದು.  ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಲ್ಲಿ ಅಥವ ಜಾಲಬಂಧ ಸಂಪನ್ಮೂಲಗಳನ್ನು "
+"ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಾಗದೆ ಇದ್ದರೆ, ನಿಮ್ಮ ಸಿದ್ಧತೆಗಳ ಮೇಲೆ ಎರಡು ಬಾರಿ ಕ್ಲಿಕ್ಕಿಸಿ.  ನಿಮ್ಮ "
+"ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕದ ಸಿದ್ಧತೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು, ವ್ಯವಸ್ಥೆ >> ಆದ್ಯತೆಗಳ ಮೆನುವಿನಿಂದ "
+"\"ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು\" ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಿದ್ಧತೆಗಳನ್ನು ಖಚಿತಪಡಿಸಿ"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ಯಾವುದೂ ಇಲ್ಲ)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A ಪ್ರಮಾಣಪತ್ರ:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "ಅಜ್ಞಾತ"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "ಬಳಕೆದಾರ ಪ್ರಮಾಣಪತ್ರ(_U):"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "ಸಂಪರ್ಕವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "ಅನ್‌ಲಾಕ್ ಮಾಡು(_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "ಪ್ರತಿ ಬಾರಿಯೂ ಈ ಗುಪ್ತಪದಕ್ಕಾಗಿ ಕೇಳು(_k)"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "'%s' ನೊಂದಿಗೆ ಸಂಪರ್ಕಹೊಂದಲು ಅಗತ್ಯವಿರುವ ಗುಪ್ತಪದ."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "ಗುಪ್ತಪದಗಳನ್ನು ತೋರಿಸು(_w)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "ಗುಪ್ತಪದ(_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "ಗುಪ್ತಪದ(_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "ಗುಪ್ತಪದ(_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕು"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "ಯಾವುದೂ ಇಲ್ಲ"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "ಡೈನಮಿಕ್ WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "ರಚಿಸು(_r)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ '%s' ಅನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಗುಪ್ತಪದ ಅಥವ ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಯ "
+"ಅಗತ್ಯವಿರುತ್ತದೆ."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕಾಗಿ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "ಹೊಸ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧವನ್ನು ರಚಿಸಿ"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "ಹೊಸ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "ನೀವು ನಿರ್ಮಿಸಲು ಬಯಸುವ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧದ ಹೆಸರನ್ನು ನಮೂದಿಸಿ."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"ನೀವು ಸಂಪರ್ಕ ಹೊಂದಲು ಬಯಸುವ ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಸಂಪರ್ಕದ ಸುರಕ್ಷತಾ ವಿವರಗಳನ್ನು ನಮೂದಿಸಿ."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "ಸುರಕ್ಷತೆ(_S):"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "ಸಂಪರ್ಕ(_n):"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "ವೈರ್ಲೆಸ್ ಅಡಾಪ್ಟರ್(_a):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"ನನಗೆ ಒದಗಿಸುವವರನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಹಾಗು ನಾನೆ ಸ್ವತಃ ನಮೂದಿಸಲು "
+"ಬಯಸುತ್ತೇನೆ(_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "ಒದಗಿಸುವವರು:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+#, fuzzy
+msgid "Country or Region List:"
+msgstr "ದೇಶದ ಪಟ್ಟಿ:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+#, fuzzy
+msgid "Country or region"
+msgstr "ದೇಶದ ಪಟ್ಟಿ:"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "ತಂತಿಯುಕ್ತ"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "ಸುರಕ್ಷತೆ(_S):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "ಜಾಲಬಂಧದ ಹೆಸರು(_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "ಸಂಪರ್ಕ(_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "ವೈರ್ಲೆಸ್ ಅಡಾಪ್ಟರ್(_a):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "ಬಳಕೆ:"
@@ -4404,26 +4922,26 @@ msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯ
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ಒಂದು PAC ಕಡತವನ್ನು ಆರಿಸು..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ಕಡತಗಳು (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "ಎಲ್ಲಾ ಕಡತಗಳು"
 
@@ -4465,16 +4983,16 @@ msgstr "ಆಂತರಿಕ ದೃಢೀಕರಣ(_n):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ಸ್ವಯಂಚಾಲಿತ P_AC ಪ್ರಾವಿಶನಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸು"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4510,15 +5028,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4532,24 +5050,24 @@ msgstr "WEP 128-bit ಗುಪ್ತವಾಕ್ಯ"
 msgid "Sh_ow passphrase"
 msgstr "ಗುಪ್ತಪದಗಳನ್ನು ತೋರಿಸು(_w)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ:"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4558,7 +5076,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "ಗುರುತು(_d):"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4598,15 +5116,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "ದೃಢೀಕರಣ(_A):"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "ಖಾಸಗಿ ಕೀಲಿ ಗುಪ್ತಪದ(_P):"
@@ -4616,33 +5134,33 @@ msgstr "ಖಾಸಗಿ ಕೀಲಿ ಗುಪ್ತಪದ(_P):"
 msgid "_Type"
 msgstr "ಬಗೆ(_T):"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4683,332 +5201,17 @@ msgstr "ಕೀಲಿಯನ್ನು ತೋರಿಸು(_w)"
 msgid "WEP inde_x"
 msgstr "WEP ಸೂಚಿ(_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ:"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "ಖಾಸಗಿ ಕೀಲಿ(_k):"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "ಖಾಸಗಿ ಕೀಲಿ ಗುಪ್ತಪದ(_P):"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "ಬಳಕೆದಾರ ಪ್ರಮಾಣಪತ್ರ(_U):"
-
-#~ msgid "My country is not listed"
-#~ msgstr "ನನ್ನ ದೇಶವನ್ನು ಪಟ್ಟಿ ಮಾಡಲಾಗಿಲ್ಲ"
-
-#~ msgid "Unlisted"
-#~ msgstr "ಪಟ್ಟಿ ಮಾಡದೆ ಇರುವ"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "ನನ್ನ ಯೋಜನೆ(ಪ್ಲಾನ್) ಅನ್ನು ಪಟ್ಟಿ ಮಾಡಲಾಗಿಲ್ಲ..."
-
-#~ msgid "Provider"
-#~ msgstr "ಒದಗಿಸುವವರು"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "ಅನುಸ್ಥಾಪಿಸಲಾದ GSM ಸಾಧನ"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "ಅನುಸ್ಥಾಪಿಸಲಾದ CDMA ಸಾಧನ"
-
-#~ msgid "Any device"
-#~ msgstr "ಯಾವುದೆ ಸಾಧನ"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "ಹೊಸ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "ಈ ಸಹಾಯಕವು ಒಂದು ಸೆಲ್ಯುಲಾರ್ (3G) ಜಾಲಬಂಧಕ್ಕಾಗಿ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನು "
-#~ "ಸಜ್ಜುಗೊಳಿಸಲು ನೆರವಾಗುತ್ತದೆ."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "ನೀವು ಈ ಕೆಳಗಿನ ಮಾಹಿತಿಯನ್ನು ನೀಡಬೇಕಾಗುತ್ತದೆ:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಒದಗಿಸಿದವರ ಹೆಸರು"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಬಿಲ್ಲಿಂಗ್ ಯೋಜನೆಯ(ಪ್ಲಾನ್) ಹೆಸರು"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(ಕೆಲವು ಸಂದರ್ಭಗಳಲ್ಲಿ) ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಬಿಲ್ಲಿಂಗ್ ಯೋಜನೆಯ APN (ಎಕ್ಸೆಸ್ ಪಾಯಿಂಟ್ ನೇಮ್)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "ಈ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಕ್ಕಾಗಿ ಸಂಪರ್ಕವನ್ನು ರಚಿಸು(_t):"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನ ಸಜ್ಜುಗೊಳಿಸಿ"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "ದೇಶದ ಪಟ್ಟಿ:"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರ ದೇಶವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರನ್ನು ಪಟ್ಟಿಯಿಂದ ಆಯ್ಕೆ ಮಾಡಿ(_l):"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "ನನಗೆ ಒದಗಿಸುವವರನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಹಾಗು ನಾನೆ ಸ್ವತಃ ನಮೂದಿಸಲು "
-#~ "ಬಯಸುತ್ತೇನೆ(_m):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "ನನಗೆ ಒದಗಿಸುವವರು GSM ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "ನನಗೆ ಒದಗಿಸುವವರು CDMA ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "ನಿಮ್ಮ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ಆಯ್ಕೆ ಮಾಡಿ(_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಯೋಜನೆಯ (ಪ್ಲಾನ್) _APN (ಎಕ್ಸೆಸ್ ಪಾಯಿಂಟ್ ಹೆಸರು):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "ಎಚ್ಚರಿಕೆ: ನಿಮ್ಮ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ತಪ್ಪಾಗಿ ಆಯ್ಕೆ ಮಾಡಿದಲ್ಲಿ ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಖಾತೆಯ "
-#~ "ಬಿಲ್ಲಿಂಗ್‌ ಸಮಸ್ಯೆಗಳಿಗೆ ಅಥವ ಸಂಪರ್ಕವು ಕಡಿದುಹೋಗಲು ಕಾರಣವಾಗಬಹುದು .\n"
-#~ "\n"
-#~ "ನಿಮ್ಮ ಯೋಜನೆಯ ಬಗೆಗೆ ನಿಮಗೆ ಮಾಹಿತಿ ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ ನಿಮ್ಮ ಯೋಜನೆಯ APN ಗಾಗಿ "
-#~ "ಒದಗಿಸುವವರನ್ನು ಕೇಳಿ."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "ನಿಮ್ಮ ಬಿಲ್ಲಿಂಗ್ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "ನಿಮ್ಮ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನು ಈ ಕೆಳಗಿನ ಸಿದ್ಧತೆಗಳೊಂದಿಗೆ ಸಂರಚಿಸಲಾಗಿದೆ:"
-
-#~ msgid "Your Device:"
-#~ msgstr "ನಿಮ್ಮ ಸಾಧನ:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರು:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "ನಿಮ್ಮ ಯೋಜನೆ(ಪ್ಲಾನ್):"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "ನೀವು ಆಯ್ಕೆ ಮಾಡಿದ ಸಿದ್ಧತೆಗಳನ್ನು ಬಳಸಿಕೊಂಡಿ ನಿಮ್ಮ ಮೊಬೈಲ್‌ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ "
-#~ "ಒದಗಿಸುವವರೊಂದಿಗೆ ಒಂದು ಸಂಪರ್ಕವನ್ನು ಏರ್ಪಡಿಸಲಾಗುವುದು.  ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಲ್ಲಿ ಅಥವ "
-#~ "ಜಾಲಬಂಧ ಸಂಪನ್ಮೂಲಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಾಗದೆ ಇದ್ದರೆ, ನಿಮ್ಮ ಸಿದ್ಧತೆಗಳ ಮೇಲೆ "
-#~ "ಎರಡು ಬಾರಿ ಕ್ಲಿಕ್ಕಿಸಿ.  ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕದ ಸಿದ್ಧತೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು, ವ್ಯವಸ್ಥೆ "
-#~ ">> ಆದ್ಯತೆಗಳ ಮೆನುವಿನಿಂದ \"ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು\" ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಿದ್ಧತೆಗಳನ್ನು ಖಚಿತಪಡಿಸಿ"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(ಯಾವುದೂ ಇಲ್ಲ)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "C_A ಪ್ರಮಾಣಪತ್ರ:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "ಅಜ್ಞಾತ"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "ಬಳಕೆದಾರ ಪ್ರಮಾಣಪತ್ರ(_U):"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "ಸಂಪರ್ಕವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "ಅನ್‌ಲಾಕ್ ಮಾಡು(_U)"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "ಪ್ರತಿ ಬಾರಿಯೂ ಈ ಗುಪ್ತಪದಕ್ಕಾಗಿ ಕೇಳು(_k)"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "'%s' ನೊಂದಿಗೆ ಸಂಪರ್ಕಹೊಂದಲು ಅಗತ್ಯವಿರುವ ಗುಪ್ತಪದ."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "ಗುಪ್ತಪದಗಳನ್ನು ತೋರಿಸು(_w)"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "ಗುಪ್ತಪದ(_P):"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "ಗುಪ್ತಪದ(_P):"
-
-#~ msgid "_Password:"
-#~ msgstr "ಗುಪ್ತಪದ(_P):"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕು"
-
-#, fuzzy
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "ಯಾವುದೂ ಇಲ್ಲ"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "ಡೈನಮಿಕ್ WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "ರಚಿಸು(_r)"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ '%s' ಅನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಗುಪ್ತಪದ ಅಥವ ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಯ "
-#~ "ಅಗತ್ಯವಿರುತ್ತದೆ."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕಾಗಿ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "ಹೊಸ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧವನ್ನು ರಚಿಸಿ"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "ಹೊಸ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "ನೀವು ನಿರ್ಮಿಸಲು ಬಯಸುವ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧದ ಹೆಸರನ್ನು ನಮೂದಿಸಿ."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "ನೀವು ಸಂಪರ್ಕ ಹೊಂದಲು ಬಯಸುವ ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಸಂಪರ್ಕದ ಸುರಕ್ಷತಾ ವಿವರಗಳನ್ನು ನಮೂದಿಸಿ."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "ಸುರಕ್ಷತೆ(_S):"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "ಸಂಪರ್ಕ(_n):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "ವೈರ್ಲೆಸ್ ಅಡಾಪ್ಟರ್(_a):"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "ನನಗೆ ಒದಗಿಸುವವರನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಹಾಗು ನಾನೆ ಸ್ವತಃ ನಮೂದಿಸಲು "
-#~ "ಬಯಸುತ್ತೇನೆ(_m):"
-
-#~ msgid "Provider:"
-#~ msgstr "ಒದಗಿಸುವವರು:"
-
-#, fuzzy
-#~ msgid "Country or Region List:"
-#~ msgstr "ದೇಶದ ಪಟ್ಟಿ:"
-
-#, fuzzy
-#~ msgid "Country or region"
-#~ msgstr "ದೇಶದ ಪಟ್ಟಿ:"
-
-#~ msgid "Wired"
-#~ msgstr "ತಂತಿಯುಕ್ತ"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "ಸುರಕ್ಷತೆ(_S):"
-
-#~ msgid "_Network name:"
-#~ msgstr "ಜಾಲಬಂಧದ ಹೆಸರು(_N):"
-
-#, fuzzy
-#~ msgid "C_onnection:"
-#~ msgstr "ಸಂಪರ್ಕ(_n):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "ವೈರ್ಲೆಸ್ ಅಡಾಪ್ಟರ್(_a):"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
diff --git a/po/ko.po b/po/ko.po
index 5715fae1..d7b793af 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -23,7 +23,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet 1.8.22\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\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"
@@ -35,6 +35,7 @@ msgstr ""
 "X-Generator: Zanata 4.6.2\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "네트워크"
 
@@ -224,15 +225,19 @@ msgstr "802.1X 인증"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "취소(_C)"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "연결(_O)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "네트워크 이름(_N):"
@@ -589,7 +594,7 @@ msgstr "모바일 광대역(%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "모바일 광대역"
 
@@ -711,7 +716,9 @@ msgstr "DSL 인증"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_OK"
 
@@ -816,6 +823,7 @@ msgid "Error displaying connection information:"
 msgstr "연결 정보 보이기 오류:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -965,7 +973,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "핫스팟"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "암호:"
@@ -990,7 +998,8 @@ msgstr "가상 사설망 추방자"
 msgid "Base Connection"
 msgstr "기반 연결"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "알 수 없음"
 
@@ -1776,6 +1785,7 @@ msgid "_Service"
 msgstr "서비스(_S):"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2448,6 +2458,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "홈 네트워크가 사용 불가능할 경우 로밍을 허용(_R)"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "암호 보이기(_W)"
 
@@ -2868,13 +2879,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "이더넷"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "가상 LAN"
 
@@ -3208,12 +3220,12 @@ msgstr ""
 "이 실패하면, 몇몇 방법을 사용하지 않아 보십시오."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "와이파이"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "블루투스"
 
@@ -3223,22 +3235,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "인피니밴드"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "본딩"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "팀"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "브릿지"
 
@@ -3527,6 +3542,7 @@ msgid "Select a connection to delete"
 msgstr "삭제할 연결 선택"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "이름"
 
@@ -3746,6 +3762,8 @@ msgstr "이더넷 연결 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "기본"
 
@@ -3974,35 +3992,35 @@ msgstr "통신사가 _GSM 기반의 기술을 사용합니다(예: GPRS, EDGE, U
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "통신사가 C_DMA 기반의 기술을 사용합니다(예: 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4167,10 +4185,12 @@ msgid "Wi-Fi connection %d"
 msgstr "와이파이 연결 %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128비트 키(Hex 또는 ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128비트 열쇠글"
 
@@ -4179,14 +4199,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "동적 WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "개인용 WPA 또는 WPA2"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "기업용 WPA 또는 WPA2"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "개인용 WPA 또는 WPA2"
@@ -4264,6 +4287,476 @@ msgstr "연결 정보"
 msgid "_Close"
 msgstr "종료(_C)"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "CA 인증서 불필요(_R)"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "키가 설정되지 않았습니다."
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "개인 인증서 선택..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "비밀키(_K):"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "비밀키 암호(_P):"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "개인 인증서 선택..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "사용자 인증서(_U):"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "내 나라가 목록에 없습니다"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "목록에없음"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "내 요금제가 목록에 없습니다..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "통신사"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "설치된 GSM 장치"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "설치된 CDMA 장치"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "모든 장치"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "새 모바일 광대역 연결"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"이 도우미를 이용해 휴대전화(3G) 네트워크를 사용하는 모바일 광대역 연결을 손쉽"
+"게 설정할 수 있습니다."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "다음 정보가 필요합니다:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "통신사의 이름"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "통신사의 요금제 이름"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(어떤 경우엔) 통신사의 요금제 APN (AP 이름)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "이 모바일 광대역 장치에 대한 연결 만들기(_T):"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "모바일 광대역 연결을 설정"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "국가 혹은 지역"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "통신사의 국가 혹은 지역 선택"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "목록에서 통신사 선택(_L):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "통신사가 없으므로 직접 입력(_M):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "내 통신사는 GSM 기반 기술을 사용합니다(GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "내 통신사는 CDMA 기반 기술을 사용합니다(1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "통신사를 선택하십시오"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "요금제 선택(_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "요금제 _APN(억세스 포인트 이름):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"경고: 잘못된 요금제를 선택하면 휴대전화 인터넷 과금에 문제가 발생하거나, 연결"
+"이 불가능할 수 있습니다.\n"
+"\n"
+"만약 요금제가 확실하지 않다면, 통신사에 요금제의 APN에 대해 문의하십시오."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "요금제를 선택하십시오"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "모바일 광대역 연결이 다음과 같이 설정되었습니다:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "장치:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "통신사:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "요금제:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"선택한 설정을 사용해 모바일 광대역 통신사에 연결합니다. 만약 연결이 실패하거"
+"나 네트워크에 연결할 수 없다면, 설정을 여러번 다시 검토하십시오. 모바일 광대"
+"역 연결 설정을 변경하려면, 시스템 >> 기본 설정 메뉴에서 \"네트워크 연결\"을 "
+"선택하십시오."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "모바일 광대역 설정 확인"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(없음)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "열쇠 입력 %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA 인증서(_A):"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(알 수 없음)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "선택 "
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "취소 "
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "파일에서 선택 ..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "개인 인증서 선택..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "사용자 인증서(_U):"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "로그인 오류 : "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "연결을 편집하는데 오류"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "잠금 해제(_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "발급자"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "들어가다 %s 핀"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "로그인(_L)"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Remember PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "이 사용자에 대해서만 암호 저장(_U)"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "모든 사용자에 대해 암호 저장(_A)"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "매번 이 암호 물어보기"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "'%s'에 연결하려면 암호가 필요합니다."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "암호 보이기(_O)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "보조 암호(_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "보조 암호(_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "암호(_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "연결 끊김"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "새로운…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "없음"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "동적 WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "만들기(_R)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"와이파이 네트워크 '%s'에 연결하려면 암호 또는 암호화 키가 있어야 합니다."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "와이파이 네트워크 인증이 필요합니다"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "와이파이 네트워크에 인증이 필요합니다"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "새 와이파이 네트워크 만들기"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "새 와이파이 네트워크"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "연결하려는 와이파이 네트워크의 이름을 입력하십시오."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "감춰진 와이파이 네트워크에 연결"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "숨겨진 와이파이 네트워크"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "연결하려는 숨겨진 와이파이 네트워크의 이름과 보안 설정을 입력하십시오."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "와이파이 보안(_S):"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "연결 이름(_O):"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "와이파이 어댑터(_A):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "통신사가 없으므로 직접 입력(_M):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "통신사:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "국가 혹은 지역 목록:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "국가 혹은 지역"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "유선"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC 메쉬"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"암호가 누락되었거나 연결이 유효하지 않습니다. 후자의 경우 먼저 nm-connection-"
+"editor를 사용하여 연결을 편집해야합니다"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "와이파이 보안(_S):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "네트워크 이름(_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "연결 이름(_O):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "와이파이 어댑터(_A):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "사용법:"
@@ -4414,26 +4907,26 @@ msgstr "CA 인증서 불필요(_R)"
 msgid "selected CA certificate file does not exist"
 msgstr "선택한 CA 인증서 파일이 존재하지 않습니다."
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC 파일이 누락되었습니다."
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC 파일 선택..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC 파일(*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "모든 파일"
 
@@ -4472,16 +4965,16 @@ msgstr "내부 인증(_I):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "자동 PAC 인증 허용(_V)"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP 사용자 이름 누락"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "누락 된 EAP-LEAP 암호"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4517,15 +5010,15 @@ msgstr "서버 인증서 이름의 접미사입니다."
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "EAP 사용자 이름 누락"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "누락 된 EAP 암호"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4539,24 +5032,24 @@ msgstr "WEP 128비트 열쇠글"
 msgid "Sh_ow passphrase"
 msgstr "암호 보이기(_O)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS 신원 누락"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA 인증서 불필요(_R)"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "선택한 사용자 인증서 파일이 존재하지 않습니다."
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "선택된 키 없음"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "선택한 키 파일이 존재하지 않습니다."
 
@@ -4565,7 +5058,7 @@ msgstr "선택한 키 파일이 존재하지 않습니다."
 msgid "I_dentity"
 msgstr "인증 정보(_D):"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4606,15 +5099,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "인증(_T):"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "누락 된 사용자 이름"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "누락 된 도약 - 암호"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "누락 된 EAP 암호"
@@ -4624,22 +5117,22 @@ msgstr "누락 된 EAP 암호"
 msgid "_Type"
 msgstr "형식(_T):"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "wep-key 누락"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4648,11 +5141,11 @@ msgstr ""
 "잘못된 wep-key : 잘못된 키 길이 %zu. 키는 길이 5/13 (ascii) 또는 10/26 (hex) "
 "중 하나 여야합니다."
 
-#: src/wireless-security/ws-wep-key.c:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "잘못된 wep-key : 암호가 비어 있어야합니다."
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "잘못된 wep-key : 암호는 64 자보다 짧아야합니다."
 
@@ -4682,7 +5175,7 @@ msgstr "키 표시(_W)"
 msgid "WEP inde_x"
 msgstr "WEP 인덱스(_X):"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4691,360 +5184,7 @@ msgstr ""
 "잘못된 wpa-psk : 잘못된 키 길이 %zu. [8,63] 바이트 또는 64 자리 16 진수 여야"
 "합니다."
 
-#: src/wireless-security/ws-wpa-psk.c:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "유효하지 않은 wpa-psk : 16 진수로 64 바이트의 키를 해석 할 수 없습니다."
-
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "CA 인증서 불필요(_R)"
-
-#~ msgid "No key set"
-#~ msgstr "키가 설정되지 않았습니다."
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "개인 인증서 선택..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "비밀키(_K):"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "비밀키 암호(_P):"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "개인 인증서 선택..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "사용자 인증서(_U):"
-
-#~ msgid "My country is not listed"
-#~ msgstr "내 나라가 목록에 없습니다"
-
-#~ msgid "Unlisted"
-#~ msgstr "목록에없음"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "내 요금제가 목록에 없습니다..."
-
-#~ msgid "Provider"
-#~ msgstr "통신사"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "설치된 GSM 장치"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "설치된 CDMA 장치"
-
-#~ msgid "Any device"
-#~ msgstr "모든 장치"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "새 모바일 광대역 연결"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "이 도우미를 이용해 휴대전화(3G) 네트워크를 사용하는 모바일 광대역 연결을 "
-#~ "손쉽게 설정할 수 있습니다."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "다음 정보가 필요합니다:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "통신사의 이름"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "통신사의 요금제 이름"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(어떤 경우엔) 통신사의 요금제 APN (AP 이름)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "이 모바일 광대역 장치에 대한 연결 만들기(_T):"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "모바일 광대역 연결을 설정"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "국가 혹은 지역"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "통신사의 국가 혹은 지역 선택"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "목록에서 통신사 선택(_L):"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "통신사가 없으므로 직접 입력(_M):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "내 통신사는 GSM 기반 기술을 사용합니다(GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "내 통신사는 CDMA 기반 기술을 사용합니다(1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "통신사를 선택하십시오"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "요금제 선택(_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "요금제 _APN(억세스 포인트 이름):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "경고: 잘못된 요금제를 선택하면 휴대전화 인터넷 과금에 문제가 발생하거나, "
-#~ "연결이 불가능할 수 있습니다.\n"
-#~ "\n"
-#~ "만약 요금제가 확실하지 않다면, 통신사에 요금제의 APN에 대해 문의하십시오."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "요금제를 선택하십시오"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "모바일 광대역 연결이 다음과 같이 설정되었습니다:"
-
-#~ msgid "Your Device:"
-#~ msgstr "장치:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "통신사:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "요금제:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "선택한 설정을 사용해 모바일 광대역 통신사에 연결합니다. 만약 연결이 실패하"
-#~ "거나 네트워크에 연결할 수 없다면, 설정을 여러번 다시 검토하십시오. 모바일 "
-#~ "광대역 연결 설정을 변경하려면, 시스템 >> 기본 설정 메뉴에서 \"네트워크 연"
-#~ "결\"을 선택하십시오."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "모바일 광대역 설정 확인"
-
-#~ msgid "(None)"
-#~ msgstr "(없음)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "열쇠 입력 %s"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "CA 인증서(_A):"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(알 수 없음)"
-
-#~ msgid "Select"
-#~ msgstr "선택 "
-
-#~ msgid "Cancel"
-#~ msgstr "취소 "
-
-#~ msgid "Select from file…"
-#~ msgstr "파일에서 선택 ..."
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "개인 인증서 선택..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "사용자 인증서(_U):"
-
-#~ msgid "Error logging in: "
-#~ msgstr "로그인 오류 : "
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "연결을 편집하는데 오류"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "잠금 해제(_U)"
-
-#~ msgid "Issued By"
-#~ msgstr "발급자"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "들어가다 %s 핀"
-
-#~ msgid "_Login"
-#~ msgstr "로그인(_L)"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Remember PIN"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "이 사용자에 대해서만 암호 저장(_U)"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "모든 사용자에 대해 암호 저장(_A)"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "매번 이 암호 물어보기"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "'%s'에 연결하려면 암호가 필요합니다."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "암호 보이기(_O)"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "보조 암호(_S):"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "보조 암호(_S):"
-
-#~ msgid "_Password:"
-#~ msgstr "암호(_P):"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "연결 끊김"
-
-#~ msgid "New…"
-#~ msgstr "새로운…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "없음"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "동적 WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "만들기(_R)"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "와이파이 네트워크 '%s'에 연결하려면 암호 또는 암호화 키가 있어야 합니다."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "와이파이 네트워크 인증이 필요합니다"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "와이파이 네트워크에 인증이 필요합니다"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "새 와이파이 네트워크 만들기"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "새 와이파이 네트워크"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "연결하려는 와이파이 네트워크의 이름을 입력하십시오."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "감춰진 와이파이 네트워크에 연결"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "숨겨진 와이파이 네트워크"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "연결하려는 숨겨진 와이파이 네트워크의 이름과 보안 설정을 입력하십시오."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "와이파이 보안(_S):"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "연결 이름(_O):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "와이파이 어댑터(_A):"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "통신사가 없으므로 직접 입력(_M):"
-
-#~ msgid "Provider:"
-#~ msgstr "통신사:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "국가 혹은 지역 목록:"
-
-#~ msgid "Country or region"
-#~ msgstr "국가 혹은 지역"
-
-#~ msgid "Wired"
-#~ msgstr "유선"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC 메쉬"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "암호가 누락되었거나 연결이 유효하지 않습니다. 후자의 경우 먼저 nm-"
-#~ "connection-editor를 사용하여 연결을 편집해야합니다"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "와이파이 보안(_S):"
-
-#~ msgid "_Network name:"
-#~ msgstr "네트워크 이름(_N):"
-
-#~ msgid "C_onnection:"
-#~ msgstr "연결 이름(_O):"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "와이파이 어댑터(_A):"
diff --git a/po/ku.po b/po/ku.po
index 4bc4fbac..63ee90ac 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: network-manager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2011-10-18 15:16+0200\n"
 "Last-Translator: Erdal Ronahî <erdal dot ronahi at gmail dot com>\n"
 "Language-Team: Kurdish Team http://pckurd.net\n";
@@ -21,6 +21,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-10-17 13:00+0000\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Tor"
 
@@ -202,15 +203,19 @@ msgstr ""
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Girêdan"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Navê torê:"
@@ -555,7 +560,7 @@ msgstr ""
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr ""
 
@@ -683,7 +688,9 @@ msgstr ""
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -796,6 +803,7 @@ msgid "Error displaying connection information:"
 msgstr ""
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr ""
@@ -947,7 +955,7 @@ msgstr ""
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Şîfre:"
@@ -975,7 +983,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "Girêdanên VPN"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr ""
 
@@ -1704,6 +1713,7 @@ msgid "_Service"
 msgstr "_Servîs:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2332,6 +2342,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr ""
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Şîfreyan _nîşan bide"
 
@@ -2727,14 +2738,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "Tora biqablo (%s)"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3048,12 +3060,12 @@ msgid ""
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3063,22 +3075,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3370,6 +3385,7 @@ msgid "Select a connection to delete"
 msgstr "Girêdana torê biqablo %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nav"
 
@@ -3592,6 +3608,8 @@ msgstr "Girêdana torê biqablo %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Standard"
 
@@ -3808,35 +3826,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3988,10 +4006,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Girêdana torê biqablo %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Mifteya WEP a 40/128-bit (Hex an ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Şîfreya WEP a 128-bit"
 
@@ -4000,14 +4020,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP a dînamîk (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA Personal"
@@ -4081,6 +4104,463 @@ msgstr "Agahiya girêdanê"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Sertîfikaya _bikarhêner:"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Mifteya _taybet:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Şî_freya mifteya taybet:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Sertîfikaya _bikarhêner:"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Sertîfikaya _bikarhêner:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr ""
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr ""
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(tune)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Sertîfikaya _bikarhêner:"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Sertîfikaya _bikarhêner:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Nikarî girêdana VPN ya '%s' bibîne"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Kîlît rake"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "Şîfreyan _nîşan bide"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "Şî_fre:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "Şî_fre:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "Şî_fre:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Veqetîne"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Tune"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP a dînamîk (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Afirandin"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "Niha bi tora bêqablo '%s' re girêdayî yî."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Mifteya tora bêqablo pêwîst e"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "Tora bêqablo ya nû biafirîne"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "Tora bêqablo ya nû biafirîne"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Tora bêqablo ya nû"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Li tora bêqablo ya veşartî girê bide..."
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "Tora bêqablo ya veşartî"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Ewlehiya bêqablo:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "_Girêdan:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Ewlehiya bêqablo:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Ewlehiya bêqablo:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Navê torê:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Girêdan:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr ""
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Bikaranîn:"
@@ -4230,25 +4710,25 @@ msgstr "Sertîfikaya _bikarhêner:"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4284,16 +4764,16 @@ msgstr ""
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr ""
@@ -4328,15 +4808,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4350,24 +4830,24 @@ msgstr "Şîfreya WEP a 128-bit"
 msgid "Sh_ow passphrase"
 msgstr "Şîfreyan _nîşan bide"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Sertîfikaya _bikarhêner:"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4376,7 +4856,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "_Nasname:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4415,15 +4895,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Şî_freya mifteya taybet:"
@@ -4433,33 +4913,33 @@ msgstr "Şî_freya mifteya taybet:"
 msgid "_Type"
 msgstr "_Cure:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4489,139 +4969,17 @@ msgstr "Mifteyê _nîşan bide"
 msgid "WEP inde_x"
 msgstr "Ende_ksa WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Sertîfikaya _bikarhêner:"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Mifteya _taybet:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Şî_freya mifteya taybet:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Sertîfikaya _bikarhêner:"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Sertîfikaya _bikarhêner:"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(tune)"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Sertîfikaya _bikarhêner:"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Sertîfikaya _bikarhêner:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Nikarî girêdana VPN ya '%s' bibîne"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Kîlît rake"
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Şîfreyan _nîşan bide"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Şî_fre:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "Şî_fre:"
-
-#~ msgid "_Password:"
-#~ msgstr "Şî_fre:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Veqetîne"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Tune"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP a dînamîk (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Afirandin"
-
-#, 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î."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Mifteya tora bêqablo pêwîst e"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Tora bêqablo ya nû biafirîne"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Tora bêqablo ya nû biafirîne"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Tora bêqablo ya nû"
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Li tora bêqablo ya veşartî girê bide..."
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Tora bêqablo ya veşartî"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Ewlehiya bêqablo:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "_Girêdan:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Ewlehiya bêqablo:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Ewlehiya bêqablo:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Navê torê:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "_Girêdan:"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "1 (Standard)"
diff --git a/po/lt.po b/po/lt.po
index b2832f9c..32a66ced 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2018-12-08 14:39+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4 gmail com>\n"
 "Language-Team: Lietuvių <gnome-lt lists akl lt>\n"
@@ -26,6 +26,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Tinklas"
 
@@ -228,15 +229,19 @@ msgstr "802.1X tapatybės nustatymas"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "Prisi_jungti"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Tinklo pavadinimas"
 
@@ -579,7 +584,7 @@ msgstr "Mobilusis plačiajuostis ryšys (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobilusis plačiajuostis ryšys"
 
@@ -700,7 +705,9 @@ msgstr "DSL tapatybės nustatymas"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_Gerai"
 
@@ -806,6 +813,7 @@ msgid "Error displaying connection information:"
 msgstr "Klaida rodant ryšio informaciją:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -954,7 +962,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Prieigos taškas"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Slaptažodis:"
@@ -979,7 +987,8 @@ msgstr "VPN reklamjuostė"
 msgid "Base Connection"
 msgstr "Bazinis ryšys"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Nežinoma"
 
@@ -1735,6 +1744,7 @@ msgid "_Service"
 msgstr "_Paslauga"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2393,6 +2403,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Naudoti _tarptinklinį ryšį, jei neprieinamas namų tinklas"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "R_odyti slaptažodžius"
 
@@ -2803,13 +2814,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Laidinis tinklas"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3131,12 +3143,12 @@ msgstr ""
 "palaikymą."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Belaidis"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3146,22 +3158,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bond"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Komanda"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Tinklų tiltas"
 
@@ -3452,6 +3467,7 @@ msgid "Select a connection to delete"
 msgstr "Pasirinkite ryšį, kurį ištrinti"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Pavadinimas"
 
@@ -3662,6 +3678,8 @@ msgstr "Laidinis ryšys %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Numatytasis"
 
@@ -3889,35 +3907,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Mano tiekėjas naudoja C_DMA paremtą technologiją (t. y. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4074,10 +4092,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Belaidis ryšys %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 bitų raktas (šešioliktainis arba ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bitų slaptafrazė"
 
@@ -4086,14 +4106,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dinaminis WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ir WPA2 asmeninis"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ir WPA2 industrinis"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA ir WPA2 asmeninis"
@@ -4167,6 +4190,466 @@ msgstr "Ryšio informacija"
 msgid "_Close"
 msgstr "_Užverti"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Nenustatytas joks liudijimas"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Nenustatytas joks raktas"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Pasirinkite raktą, skirtą %s liudijimui"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "%s privatusis ra_ktas"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "%s rakto sla_ptažodis"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Pasirinkite %s liudijimą"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "%s _liudijimas"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Mano šalies nėra sąraše"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Nėra sąraše"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Mano plano sąraše nėra…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Tiekėjas"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Įdiegtas GSM įrenginys"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Įdiegtas CDMA įrenginys"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Bet koks įrenginys"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Naujas mobilusis plačiajuostis ryšys"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Šis pagelbiklis leidžia lengvai nustatyti mobilųjį plačiajuostį ryšį su "
+"mobiliuoju (3G) tinklu."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Jums prireiks šios informacijos:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Jūsų plačiojuosčio ryšio tiekėjo pavadinimas"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Jūsų plačiajuosčio ryšio mokėjimo plano vardas"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(kai kuriais atvejais) Jūsų plačiajuosčio ryšio mokėjimo plano APN (prieigos "
+"taško vardas)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Sukurti ryšį _šiam mobiliojo plačiajuosčio ryšio įrenginiui:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Nustatyti mobilųjį plačiajuostį ryšį"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Šalis ar regionas"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Pasirinkite savo tiekėjo šalį ar regioną"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Pasirinkite savo tiekėją iš _sąrašo:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Nerandu savo tiekėjo ir noriu nurodyti jį _rankiniu būdu:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Mano tiekėjas naudoja GSM technologiją (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Mano tiekėjas naudoja CDMA technologiją (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Pasirinkite savo tiekėją"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Pasirinkite savo planą:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Pasirinktas plano _APN (prieigos taško vardas):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Įspėjimas: pasirinkę neteisingą planą galite turėti problemų dėl savo "
+"plačiajuosčio ryšio tarifų arba gali nepavykti prisijungti apskritai.\n"
+"\n"
+"Jeigu nesate tikri dėl savo plano, paklauskite savo tiekėjo, koks yra jūsų "
+"plano APN (prieigos taško vardas)."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Pasirinkite savo mokėjimo planą"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Jūsų mobilusis plačiajuostis ryšys nustatytas, naudojant šiuos nustatymus:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Jūsų įrenginys:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Jūsų tiekėjas:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Jūsų planas:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Dabar bus sukurtas ryšys su jūsų mobiliojo plačiajuosčio ryšio tiekėju, "
+"naudojant jūsų nurodytus nustatymus. Jeigu ryšio sukurti nepavyks arba "
+"negalėsite pasiekti išteklių tinkle, dar kartą patikrinkite savo nustatymus. "
+"Norėdami pakeisti savo mobiliojo plačiajuosčio ryšio nustatymus, pasirinkite "
+"meniu Sistema → Nuostatos punktą „Tinklo ryšiai“."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Patvirtinkite mobiliojo plačiajuosčio ryšio nustatymus"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Nėra)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Raktas, esantis %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Liudijimas, esantis %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Nežinoma)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Pasirinkti"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Atsisakyti"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Pasirinkti iš failo…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Pasirinkite %s liudijimą"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s liudijimo sla_ptažodis"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Klaida jungiantis į: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Klaida atveriant seansą: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Atrakinti leksemą"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Išdavė"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Įveskite %s PIN"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Prisijungti"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "P_risiminti PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Įrašyti slaptažodį tik šiam naudotojui"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Įrašyti slaptažodį visiems naudotojams"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Klausti šio slaptažodžio kiekvieną kartą"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Slaptažodis nereikalingas"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "R_odyti slaptažodžius"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Tretinis slaptažodis:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Antrinis slaptažodis:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Slaptažodis:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Spustelėkite, norėdami prisijungti"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Naujas…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Nėra"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dinaminis WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "Suku_rti"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Norint gauti prieigą prie belaidžio tinklo „%s“ reikalingi slaptažodžiai ar "
+"šifravimo raktai."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Reikia nustatyti jūsų tapatybę belaidžiame tinkle"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Belaidis tinklas prašo nustatyti jūsų tapatybę"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Sukurti naują belaidį tinklą"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Naujas belaidis tinklas"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Įveskite pageidaujamo sukurti belaidžio tinklo pavadinimą."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Prisijungti prie paslėpto belaidžio tinklo"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Paslėptas belaidis tinklas"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Įveskite paslėpto belaidžio tinklo, prie kurio norite jungtis, pavadinimą ir "
+"saugos informaciją."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Belaidžio ryšio _sauga"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "_Ryšys"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Belaidis _adapteris"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Nerandu savo tiekėjo ir noriu nurodyti jį _rankiniu būdu:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Tiekėjas:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Šalių ar regionų sąrašas:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Šalis ar regionas"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Laidinis"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC junglusis tinklas"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Trūksta slaptažodžio arba ryšys yra netinkamas. Pastaruoju atveju reikia "
+"pirma paredaguoti ryšį naudojant nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Belaidžio ryšio _sauga:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Tinklo pavadinimas:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Ryšys:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Belaidis _adapteris:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Naudojimas:"
@@ -4314,25 +4797,25 @@ msgstr "nepasirinktas joks LĮ liudijimas"
 msgid "selected CA certificate file does not exist"
 msgstr "pasirinkto LĮ liudijimo failo nėra"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "trūksta EAP-FAST PAC failo"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Pasirinkite PAC failą"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC failai (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Visi failai"
 
@@ -4368,16 +4851,16 @@ msgstr "_Vidinis tapatybės nustatymas"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Leisti automatinį PAC _teikimą"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "trūksta EAP-LEAP naudotojo vardo"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "trūksta EAP-LEAP slaptažodžio"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4412,15 +4895,15 @@ msgstr "Serverio liudijimo pavadinimo priesaga."
 msgid "_Domain"
 msgstr "_Sritis"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "trūksta EAP naudotojo vardo"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "trūksta EAP slaptažodžio"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "trūksta EAP kliento privataus rakto slaptafrazės"
 
@@ -4432,23 +4915,23 @@ msgstr "P_rivataus rakto slaptafrazė"
 msgid "Sh_ow passphrase"
 msgstr "R_odyti slaptafrazę"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "trūksta EAP-TLS identiteto"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "nepasirinktas naudotojo liudijimas"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "pasirinkto naudotojo liudijimo failo nėra"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "nepasirinktas raktas"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "pasirinkto rakto failo nėra"
 
@@ -4456,7 +4939,7 @@ msgstr "pasirinkto rakto failo nėra"
 msgid "I_dentity"
 msgstr "_Tapatybė"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (be EAP)"
 
@@ -4494,15 +4977,15 @@ msgstr "Sukonfigūruota išorėje"
 msgid "Au_thentication"
 msgstr "_Tapatybės nustatymas"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "trūksta leap-username"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "trūksta leap-password"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "trūksta EAP slaptažodžio"
@@ -4511,24 +4994,24 @@ msgstr "trūksta EAP slaptažodžio"
 msgid "_Type"
 msgstr "_Tipas"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "trūksta wep-key"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4537,11 +5020,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "netinkamas wep-key: slaptafrazė turi būti trumpesnė nei 64 simboliai"
 
@@ -4569,7 +5052,7 @@ msgstr "R_odyti raktą"
 msgid "WEP inde_x"
 msgstr "WEP inde_ksas"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4578,354 +5061,12 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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 "No certificate set"
-#~ msgstr "Nenustatytas joks liudijimas"
-
-#~ msgid "No key set"
-#~ msgstr "Nenustatytas joks raktas"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Pasirinkite raktą, skirtą %s liudijimui"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "%s privatusis ra_ktas"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "%s rakto sla_ptažodis"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Pasirinkite %s liudijimą"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s _liudijimas"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Mano šalies nėra sąraše"
-
-#~ msgid "Unlisted"
-#~ msgstr "Nėra sąraše"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Mano plano sąraše nėra…"
-
-#~ msgid "Provider"
-#~ msgstr "Tiekėjas"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Įdiegtas GSM įrenginys"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Įdiegtas CDMA įrenginys"
-
-#~ msgid "Any device"
-#~ msgstr "Bet koks įrenginys"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Naujas mobilusis plačiajuostis ryšys"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Šis pagelbiklis leidžia lengvai nustatyti mobilųjį plačiajuostį ryšį su "
-#~ "mobiliuoju (3G) tinklu."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Jums prireiks šios informacijos:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Jūsų plačiojuosčio ryšio tiekėjo pavadinimas"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Jūsų plačiajuosčio ryšio mokėjimo plano vardas"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(kai kuriais atvejais) Jūsų plačiajuosčio ryšio mokėjimo plano APN "
-#~ "(prieigos taško vardas)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Sukurti ryšį _šiam mobiliojo plačiajuosčio ryšio įrenginiui:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Nustatyti mobilųjį plačiajuostį ryšį"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Šalis ar regionas"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Pasirinkite savo tiekėjo šalį ar regioną"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Pasirinkite savo tiekėją iš _sąrašo:"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Nerandu savo tiekėjo ir noriu nurodyti jį _rankiniu būdu:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Mano tiekėjas naudoja GSM technologiją (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Mano tiekėjas naudoja CDMA technologiją (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Pasirinkite savo tiekėją"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Pasirinkite savo planą:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Pasirinktas plano _APN (prieigos taško vardas):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Įspėjimas: pasirinkę neteisingą planą galite turėti problemų dėl savo "
-#~ "plačiajuosčio ryšio tarifų arba gali nepavykti prisijungti apskritai.\n"
-#~ "\n"
-#~ "Jeigu nesate tikri dėl savo plano, paklauskite savo tiekėjo, koks yra "
-#~ "jūsų plano APN (prieigos taško vardas)."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Pasirinkite savo mokėjimo planą"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Jūsų mobilusis plačiajuostis ryšys nustatytas, naudojant šiuos nustatymus:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Jūsų įrenginys:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Jūsų tiekėjas:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Jūsų planas:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Dabar bus sukurtas ryšys su jūsų mobiliojo plačiajuosčio ryšio tiekėju, "
-#~ "naudojant jūsų nurodytus nustatymus. Jeigu ryšio sukurti nepavyks arba "
-#~ "negalėsite pasiekti išteklių tinkle, dar kartą patikrinkite savo "
-#~ "nustatymus. Norėdami pakeisti savo mobiliojo plačiajuosčio ryšio "
-#~ "nustatymus, pasirinkite meniu Sistema → Nuostatos punktą „Tinklo ryšiai“."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Patvirtinkite mobiliojo plačiajuosčio ryšio nustatymus"
-
-#~ msgid "(None)"
-#~ msgstr "(Nėra)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Raktas, esantis %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Liudijimas, esantis %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Nežinoma)"
-
-#~ msgid "Select"
-#~ msgstr "Pasirinkti"
-
-#~ msgid "Cancel"
-#~ msgstr "Atsisakyti"
-
-#~ msgid "Select from file…"
-#~ msgstr "Pasirinkti iš failo…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Pasirinkite %s liudijimą"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "%s liudijimo sla_ptažodis"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Klaida jungiantis į: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Klaida atveriant seansą: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Atrakinti leksemą"
-
-#~ msgid "Issued By"
-#~ msgstr "Išdavė"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Įveskite %s PIN"
-
-#~ msgid "_Login"
-#~ msgstr "_Prisijungti"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "P_risiminti PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Įrašyti slaptažodį tik šiam naudotojui"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Įrašyti slaptažodį visiems naudotojams"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Klausti šio slaptažodžio kiekvieną kartą"
-
-#~ msgid "The password is not required"
-#~ msgstr "Slaptažodis nereikalingas"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "R_odyti slaptažodžius"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Tretinis slaptažodis:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Antrinis slaptažodis:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Slaptažodis:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Spustelėkite, norėdami prisijungti"
-
-#~ msgid "New…"
-#~ msgstr "Naujas…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Nėra"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dinaminis WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "Suku_rti"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Norint gauti prieigą prie belaidžio tinklo „%s“ reikalingi slaptažodžiai "
-#~ "ar šifravimo raktai."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Reikia nustatyti jūsų tapatybę belaidžiame tinkle"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Belaidis tinklas prašo nustatyti jūsų tapatybę"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Sukurti naują belaidį tinklą"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Naujas belaidis tinklas"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Įveskite pageidaujamo sukurti belaidžio tinklo pavadinimą."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Prisijungti prie paslėpto belaidžio tinklo"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Paslėptas belaidis tinklas"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Įveskite paslėpto belaidžio tinklo, prie kurio norite jungtis, pavadinimą "
-#~ "ir saugos informaciją."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Belaidžio ryšio _sauga"
-
-#~ msgid "C_onnection"
-#~ msgstr "_Ryšys"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Belaidis _adapteris"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Nerandu savo tiekėjo ir noriu nurodyti jį _rankiniu būdu:"
-
-#~ msgid "Provider:"
-#~ msgstr "Tiekėjas:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Šalių ar regionų sąrašas:"
-
-#~ msgid "Country or region"
-#~ msgstr "Šalis ar regionas"
-
-#~ msgid "Wired"
-#~ msgstr "Laidinis"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC junglusis tinklas"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Trūksta slaptažodžio arba ryšys yra netinkamas. Pastaruoju atveju reikia "
-#~ "pirma paredaguoti ryšį naudojant nm-connection-editor"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Belaidžio ryšio _sauga:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Tinklo pavadinimas:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "_Ryšys:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Belaidis _adapteris:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/lv.po b/po/lv.po
index d821ea72..5259338e 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager.HEAD2\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2018-03-23 22:08+0200\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs mazurs gmail com>\n"
 "Language-Team: Latvian <lata-l10n googlegroups com>\n"
@@ -25,6 +25,7 @@ msgstr ""
 "X-Generator: Lokalize 2.0\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Tīkls"
 
@@ -225,15 +226,19 @@ msgstr "802.1X autentifikācija"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "At_celt"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "Savien_oties"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "Tīkla _nosaukums:"
@@ -578,7 +583,7 @@ msgstr "Mobilais platjoslas tīkls (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobilā platjosla"
 
@@ -702,7 +707,9 @@ msgstr "DSL autentifikācija"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_Labi"
 
@@ -808,6 +815,7 @@ msgid "Error displaying connection information:"
 msgstr "Kļūda, rādot informāciju par savienojumu:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -957,7 +965,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Tīklājs"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Parole:"
@@ -982,7 +990,8 @@ msgstr "VPN karogs"
 msgid "Base Connection"
 msgstr "Bāzes savienojums"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Nezināms"
 
@@ -1732,6 +1741,7 @@ msgid "_Service"
 msgstr "_Pakalpojums"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2386,6 +2396,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Atļaut _viesabonēšanu, ja mājas tīkls nav pieejams"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Rādīt paroles"
 
@@ -2796,13 +2807,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Vadu"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3124,12 +3136,12 @@ msgstr ""
 "metožu atbalstu."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Bezvadu"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3139,22 +3151,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Saistīts"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Sajūgts"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Tilts"
 
@@ -3453,6 +3468,7 @@ msgid "Select a connection to delete"
 msgstr "Izvēlieties savienojumu, ko izdzēst"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nosaukums"
 
@@ -3666,6 +3682,8 @@ msgstr "Vadu tīkla savienojums %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Noklusējuma"
 
@@ -3892,35 +3910,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Mans operators izmanto C_DMA tehnoloģiju (piemēram, 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4078,10 +4096,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Bezvadu tīkla savienojums %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 bitu atslēga (Hex vai ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bitu parole"
 
@@ -4090,14 +4110,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamiskais WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA un WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA un WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA un WPA2 Personal"
@@ -4175,6 +4198,471 @@ msgstr "Savienojuma informācija"
 msgid "_Close"
 msgstr "_Aizvērt"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Nav iestatīts sertifikāts"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Nav iestatītas atslēgas"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Izvēlieties atslēgu %s sertifikātam"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "%s privātā _atslēga:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "%s atslēgas _parole:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Izvēlieties %s sertifikātu"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "%s _sertifikāts:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Mana valsts nav sarakstā"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Nav sarakstā"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Mans plāns nav sarakstā…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Operators"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Uzstādītā GSM ierīce"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Uzstādītā CDMA ierīce"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Jebkura ierīce"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Jauns mobilās platjoslas tīkla savienojums"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Šis asistents palīdzēs jums ērti uzstādīt mobilās platjoslas tīkla "
+"savienojumu ar mobilo (3G) tīklu."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Jums vajadzēs sekojošo informāciju:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Jūsu platjoslas pakalpojuma sniedzēja nosaukums"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Jūsu platjoslas rēķinu plāna nosaukums"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(dažos gadījumos) platjoslas rēķinu plāna APN (pieejas punkta nosaukums)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Izveidot savienojumu šai mobilās pla_tjoslas tīkla ierīcei:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Iestatīt mobilās platjoslas tīkla savienojumu"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Valsts vai reģions"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Izvēlieties pakalpojuma sniedzēja valsti vai reģionu"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Izvē_lieties operatoru no saraksta:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"Es nevaru atrast savu pakalpojuma sniedzēju un vēlos to ievadīt _pašrocīgi:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Mans operators izmanto GSM tehnoloģiju (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Mans operators izmanto CDMA tehnoloģiju (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Izvēlieties savu operatoru"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "Izvēlietie_s plānu:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Izvēlēts plāns _APN (pieejas punkta nosaukums):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Brīdinājums — nepareiza plāna izvēle var radīt problēmas ar rēķiniem "
+"platjoslas tīkla kontam, vai arī var neizdoties savienošanās.\n"
+"\n"
+"Ja nezināt, kāds jums ir plāns, jautājiet sava plāna APN."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Izvēlieties rēķina plānu"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Mobilais platjoslas tīkla savienojums ir konfigurēts ar sekojošajiem "
+"iestatījumiem:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Jūsu ierīce:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Jūsu operators:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Jūsu plāns:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Tagad tiks izveidots savienojums ar jūsu mobilās platjoslas pakalpojuma "
+"sniedzēju, izmantojot jūsu izvēlētos iestatījumus. Ja savienojums neizdodas, "
+"vai jūs nevarat piekļūt tīkla resursiem, vēlreiz pārbaudiet iestatījumus. "
+"Lai mainītu savas mobilās platjoslas tīkla iestatījumus, izvēlieties “Tīkla "
+"savienojumi” no izvēlnes Sistēma → Iestatījumi."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Apstiprināt mobilās platjoslas iestatījumus"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(nav)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "%s atslēga"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "%s sertifikāts"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Nezināms)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Izvēlēties"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Atcelt"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Izvēlieties no datnes…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Izvēlieties %s sertifikātu"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "%s sertifikāta _parole:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Kļūda ierakstoties: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Kļūda, atverot sesiju: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Atbloķēt marķieri"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Izdevējs"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Ievadiet %s PIN"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Ierakstīties"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "Atce_rēties PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Glabā paroli tikai šim lietotājam"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Glabā paroli visiem lietotājiem"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Katru reizi prasīt paroli"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Parole nav nepieciešama"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Rādīt par_oles"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Terciārā parole:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Sekundārā parole:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Parole:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Spiediet, lai savienotos"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Jauns…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Nav"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dinamiskais WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "Iz_veidot"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Lai piekļūtu bezvadu tīklam “%s”, ir nepieciešamas paroles vai šifrēšanas "
+"atslēgas."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Nepieciešama bezvadu tīkla autentifikācija"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Bezvadu tīklam ir nepieciešama autentifikācija"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Izveidot jaunu bezvadu tīklu"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Jauns bezvadu tīklu"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Ievadiet izveidojamā bezvadu tīkla nosaukumu."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Savienoties ar slēptu bezvadu tīklu"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Slēpts bezvadu tīkls"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Ievadiet nosaukumu un drošības iestatījums bezvadu tīklam, ar kuru vēlaties "
+"savienoties."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Bez_vadu drošība:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Savien_ojums:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Bezv_adu tīkla ierīce:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"Es nevaru atrast savu pakalpojuma sniedzēju un vēlos to ievadīt _pašrocīgi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Operators:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Valstu vai reģionu saraksts:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Valsts vai reģions"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Vadu"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC režģtīkls"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Vai nu trūkst paroles, vai arī savienojums ir nederīgs. Otrajā gadījumā jums "
+"vispirms jārediģē savienojums ar nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Bez_vadu drošība:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Tīkla _nosaukums:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Savien_ojums:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Bezv_adu tīkla ierīce:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Lietojums:"
@@ -4321,25 +4809,25 @@ msgstr "nav izvēlēts CA sertifikāts"
 msgid "selected CA certificate file does not exist"
 msgstr "izvēlētā CA sertifikāta datne neeksistē"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "trūkst EAP-FAST PAC datnes"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Izvēlieties PAC datni"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC datne (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Visas datnes"
 
@@ -4375,16 +4863,16 @@ msgstr "_Iekšējā autentifikācija"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Atļaut automātisku PAC _nodrošinājumu"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "trūkst EAP-LEAP lietotājvārds"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "trūkst EAP-LEAP paroles"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4419,15 +4907,15 @@ msgstr "Servera sertifikāta nosaukuma sufikss."
 msgid "_Domain"
 msgstr "_Domēns"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "trūkst EAP lietotājvārds"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "trūkst EAP paroles"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4441,23 +4929,23 @@ msgstr "WEP 128 bitu parole"
 msgid "Sh_ow passphrase"
 msgstr "Rādīt paroli"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "trūkst EAP-TLS identitātes"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "nav izvēlēts lietotāja sertifikāts"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 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:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "nav izvēlētu atslēgu"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "izvēlētā atslēgas datne neeksistē"
 
@@ -4465,7 +4953,7 @@ msgstr "izvēlētā atslēgas datne neeksistē"
 msgid "I_dentity"
 msgstr "I_dentitāte"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP)"
 
@@ -4503,15 +4991,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Au_tentifikācija"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "trūkst leap lietotāja"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "trūkst leap paroles"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "trūkst EAP paroles"
@@ -4520,18 +5008,18 @@ msgstr "trūkst EAP paroles"
 msgid "_Type"
 msgstr "_Tips"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "trūkst wep atslēgas"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4539,7 +5027,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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4548,11 +5036,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 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"
 
@@ -4580,7 +5068,7 @@ msgstr "_Rādīt atslēgu"
 msgid "WEP inde_x"
 msgstr "WEP inde_kss"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4589,360 +5077,11 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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 "No certificate set"
-#~ msgstr "Nav iestatīts sertifikāts"
-
-#~ msgid "No key set"
-#~ msgstr "Nav iestatītas atslēgas"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Izvēlieties atslēgu %s sertifikātam"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "%s privātā _atslēga:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "%s atslēgas _parole:"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Izvēlieties %s sertifikātu"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s _sertifikāts:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Mana valsts nav sarakstā"
-
-#~ msgid "Unlisted"
-#~ msgstr "Nav sarakstā"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Mans plāns nav sarakstā…"
-
-#~ msgid "Provider"
-#~ msgstr "Operators"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Uzstādītā GSM ierīce"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Uzstādītā CDMA ierīce"
-
-#~ msgid "Any device"
-#~ msgstr "Jebkura ierīce"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Jauns mobilās platjoslas tīkla savienojums"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Šis asistents palīdzēs jums ērti uzstādīt mobilās platjoslas tīkla "
-#~ "savienojumu ar mobilo (3G) tīklu."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Jums vajadzēs sekojošo informāciju:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Jūsu platjoslas pakalpojuma sniedzēja nosaukums"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Jūsu platjoslas rēķinu plāna nosaukums"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(dažos gadījumos) platjoslas rēķinu plāna APN (pieejas punkta nosaukums)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Izveidot savienojumu šai mobilās pla_tjoslas tīkla ierīcei:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Iestatīt mobilās platjoslas tīkla savienojumu"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Valsts vai reģions"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Izvēlieties pakalpojuma sniedzēja valsti vai reģionu"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Izvē_lieties operatoru no saraksta:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "Es nevaru atrast savu pakalpojuma sniedzēju un vēlos to ievadīt "
-#~ "_pašrocīgi:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Mans operators izmanto GSM tehnoloģiju (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Mans operators izmanto CDMA tehnoloģiju (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Izvēlieties savu operatoru"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "Izvēlietie_s plānu:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Izvēlēts plāns _APN (pieejas punkta nosaukums):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Brīdinājums — nepareiza plāna izvēle var radīt problēmas ar rēķiniem "
-#~ "platjoslas tīkla kontam, vai arī var neizdoties savienošanās.\n"
-#~ "\n"
-#~ "Ja nezināt, kāds jums ir plāns, jautājiet sava plāna APN."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Izvēlieties rēķina plānu"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Mobilais platjoslas tīkla savienojums ir konfigurēts ar sekojošajiem "
-#~ "iestatījumiem:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Jūsu ierīce:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Jūsu operators:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Jūsu plāns:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Tagad tiks izveidots savienojums ar jūsu mobilās platjoslas pakalpojuma "
-#~ "sniedzēju, izmantojot jūsu izvēlētos iestatījumus. Ja savienojums "
-#~ "neizdodas, vai jūs nevarat piekļūt tīkla resursiem, vēlreiz pārbaudiet "
-#~ "iestatījumus. Lai mainītu savas mobilās platjoslas tīkla iestatījumus, "
-#~ "izvēlieties “Tīkla savienojumi” no izvēlnes Sistēma → Iestatījumi."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Apstiprināt mobilās platjoslas iestatījumus"
-
-#~ msgid "(None)"
-#~ msgstr "(nav)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "%s atslēga"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "%s sertifikāts"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Nezināms)"
-
-#~ msgid "Select"
-#~ msgstr "Izvēlēties"
-
-#~ msgid "Cancel"
-#~ msgstr "Atcelt"
-
-#~ msgid "Select from file…"
-#~ msgstr "Izvēlieties no datnes…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Izvēlieties %s sertifikātu"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "%s sertifikāta _parole:"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Kļūda ierakstoties: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Kļūda, atverot sesiju: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Atbloķēt marķieri"
-
-#~ msgid "Issued By"
-#~ msgstr "Izdevējs"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Ievadiet %s PIN"
-
-#~ msgid "_Login"
-#~ msgstr "_Ierakstīties"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "Atce_rēties PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Glabā paroli tikai šim lietotājam"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Glabā paroli visiem lietotājiem"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Katru reizi prasīt paroli"
-
-#~ msgid "The password is not required"
-#~ msgstr "Parole nav nepieciešama"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Rādīt par_oles"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Terciārā parole:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Sekundārā parole:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Parole:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Spiediet, lai savienotos"
-
-#~ msgid "New…"
-#~ msgstr "Jauns…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Nav"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dinamiskais WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "Iz_veidot"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Lai piekļūtu bezvadu tīklam “%s”, ir nepieciešamas paroles vai šifrēšanas "
-#~ "atslēgas."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Nepieciešama bezvadu tīkla autentifikācija"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Bezvadu tīklam ir nepieciešama autentifikācija"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Izveidot jaunu bezvadu tīklu"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Jauns bezvadu tīklu"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Ievadiet izveidojamā bezvadu tīkla nosaukumu."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Savienoties ar slēptu bezvadu tīklu"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Slēpts bezvadu tīkls"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Ievadiet nosaukumu un drošības iestatījums bezvadu tīklam, ar kuru "
-#~ "vēlaties savienoties."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Bez_vadu drošība:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Savien_ojums:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Bezv_adu tīkla ierīce:"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "Es nevaru atrast savu pakalpojuma sniedzēju un vēlos to ievadīt "
-#~ "_pašrocīgi:"
-
-#~ msgid "Provider:"
-#~ msgstr "Operators:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Valstu vai reģionu saraksts:"
-
-#~ msgid "Country or region"
-#~ msgstr "Valsts vai reģions"
-
-#~ msgid "Wired"
-#~ msgstr "Vadu"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC režģtīkls"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Vai nu trūkst paroles, vai arī savienojums ir nederīgs. Otrajā gadījumā "
-#~ "jums vispirms jārediģē savienojums ar nm-connection-editor"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Bez_vadu drošība:"
-
-#~ msgid "_Network name:"
-#~ msgstr "Tīkla _nosaukums:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Savien_ojums:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Bezv_adu tīkla ierīce:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/mk.po b/po/mk.po
index 6e299b53..e6a7c742 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet.HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2011-12-24 21:35+0100\n"
 "Last-Translator: Jovan N\n"
 "Language-Team: Macedonian <ossm-members hedona on net mk>\n"
@@ -24,6 +24,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Мрежа"
 
@@ -225,15 +226,19 @@ msgstr "Жичена 802.1X автентикација"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "В_рзи се"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "Име на _мрежа:"
@@ -595,7 +600,7 @@ msgstr "Мобилен широкопојасен пристап (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Мобилен бродбенд"
 
@@ -724,7 +729,9 @@ msgstr "DSL автентикација"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -838,6 +845,7 @@ msgid "Error displaying connection information:"
 msgstr "Грешка во прикажувањето на информациите за поврзувањето:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -989,7 +997,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Лозинка:"
@@ -1014,7 +1022,8 @@ msgstr "VPN банер"
 msgid "Base Connection"
 msgstr "Основна врска"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Непознато"
 
@@ -1768,6 +1777,7 @@ msgid "_Service"
 msgstr "_Сервис:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2429,6 +2439,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Дозволи роминг, ако домашната мрежа не е достапна"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Покажи ги лозин_ките"
 
@@ -2827,14 +2838,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "Автоматски етернет"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3161,12 +3173,12 @@ msgstr ""
 "методите."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3176,22 +3188,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3496,6 +3511,7 @@ msgid "Select a connection to delete"
 msgstr "Жичена врска %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Име"
 
@@ -3725,6 +3741,8 @@ msgstr "Жичена врска %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Стандардно"
 
@@ -3956,35 +3974,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Мојот оператор користи C_DMA базирана технологија (пр.. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4152,10 +4170,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Жичена врска %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit клуч (Хексадецимален или ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit фраза за лозинка"
 
@@ -4164,14 +4184,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Динамичен WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
@@ -4251,6 +4274,496 @@ msgstr "Информации за поврзувањето"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Сертификат на C_A:"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Изберете личен сертификат..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Приватен _клуч:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Лозинка на _приватниот клуч:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Изберете личен сертификат..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_Кориснички сертификат:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Мојата земја не е во листата"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Не е во листата"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Мојата тарифа не е во листата..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Оператор"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Инсталиран GSM уред"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Инсталиран CDMA уред"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Било кој уред"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Нова мобилна широкопојасна врска"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Овој помошник Ви помага лесно да ја поставите врската за мобилен интернет на "
+"мобилна (3G) мрежа."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Ви требаат следните податоци:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Името на Вашиот оператор за широкопојасна врска"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Името на тарифата"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(во некои случаеви) Вашето APN за тарифата која ја користите"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Креирај врска за  _овој уред за мобилен широкопојасен пристап:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Поставете мобилна широкопојасна врска"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Држава или регион"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Изберете ја земјата на Вашиот оператор"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Изберете го Вашиот оператор од _листата:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Не можам да го најдам мојот оператор и сакам да го внесам _рачно:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Мојот оператор користи GSM технологија (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Мојот оператор користи CDMA технологија (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Изберете го Вашиот оператор"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Изберете ја Вашата тарифа:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Изберете го Вашиот _APN (име на пристапна точка):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Предупредување: со избирање на неточна тарифа може да предизвика неправилна "
+"наплата за сметката за широкопојасен пристап или да ја спречи врската.\n"
+"\n"
+"Ако не сте сигурни која тарифа да ја изберете, прашајте го Вашиот оператор "
+"да ви го APN за Вашата тарифа."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Изберете ја Вашата тарифа"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Вашата мобилна широкопојасна врска е конфигурирана со следните поставувања:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Вашиот уред:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Вашиот оператор:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Вашата тарифа:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Сега ќе биде остварена мобилна широкопојасна врска со вашиот оператор со "
+"користење на поставувањата кои ги избравте.  Ако врската не успее или не "
+"можете да пристапите на мрежните ресурси, повторно проверете ги "
+"поставувањата.  За да ги измените поставувањата за мобилната широкопојасна "
+"врска изберете „Мрежни врск“ од менито Систем >> Преференци."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Потврдете ги поставувањата за мобилна широкопојасна врска"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ништо)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Сертификат на C_A:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Непознато"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Изберете датотека"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Изберете датотека"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Изберете личен сертификат..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Кориснички сертификат:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Грешка при уредувањето на врската"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Отклучи"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "Ба_рај ја оваа лозинка секогаш"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Потребна е лозинка за поврзување со „%s“."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "Покажи ги лозин_ките"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Лозинка:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Лозинка:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Лозинка:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Исклучи се"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ништо"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Динамичен WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "К_реирај"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"За да и пристапите на оваа безжична мрежа потребен е енкриптиран клуч или "
+"лозинка '%s'."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Потребна е автентикација за безжична мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "Потребна е автентикација за безжичната мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "Креирај нова безжична мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Нова безжична мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Внесете име на безжичната мрежа на која што сакате да се врзете."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Поврзи се со скриена безжична мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "Скриена безжична мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Внесете име и безбедносни податоци за безжичната мрежа на која што сакате да "
+"се врзете."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Безжична безбедност:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Вр_ска:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Безжичен _адаптер:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Не можам да го најдам мојот оператор и сакам да го внесам _рачно:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Оператор:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Листа на држави и региони:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Држава или регион"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Жичено"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Безжична безбедност:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Име на _мрежа:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Вр_ска:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Безжичен _адаптер:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Искористеност:"
@@ -4403,25 +4916,25 @@ msgstr "Сертификат на C_A:"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4461,16 +4974,16 @@ msgstr "В_натрешна автентикација:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4507,15 +5020,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4529,24 +5042,24 @@ msgstr "WEP 128-bit фраза за лозинка"
 msgid "Sh_ow passphrase"
 msgstr "Покажи ја фразата за лозинка"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Сертификат на C_A:"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4555,7 +5068,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "И_дентитет:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4595,15 +5108,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Автентикација:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Лозинка на _приватниот клуч:"
@@ -4613,33 +5126,33 @@ msgstr "Лозинка на _приватниот клуч:"
 msgid "_Type"
 msgstr "_Тип:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4669,334 +5182,17 @@ msgstr "Пок_ажи го клучот"
 msgid "WEP inde_x"
 msgstr "WEP инде_кс:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Сертификат на C_A:"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Изберете личен сертификат..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Приватен _клуч:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Лозинка на _приватниот клуч:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Изберете личен сертификат..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Кориснички сертификат:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Мојата земја не е во листата"
-
-#~ msgid "Unlisted"
-#~ msgstr "Не е во листата"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Мојата тарифа не е во листата..."
-
-#~ msgid "Provider"
-#~ msgstr "Оператор"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Инсталиран GSM уред"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Инсталиран CDMA уред"
-
-#~ msgid "Any device"
-#~ msgstr "Било кој уред"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Нова мобилна широкопојасна врска"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Овој помошник Ви помага лесно да ја поставите врската за мобилен интернет "
-#~ "на мобилна (3G) мрежа."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Ви требаат следните податоци:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Името на Вашиот оператор за широкопојасна врска"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Името на тарифата"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(во некои случаеви) Вашето APN за тарифата која ја користите"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Креирај врска за  _овој уред за мобилен широкопојасен пристап:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Поставете мобилна широкопојасна врска"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Држава или регион"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Изберете ја земјата на Вашиот оператор"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Изберете го Вашиот оператор од _листата:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Не можам да го најдам мојот оператор и сакам да го внесам _рачно:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Мојот оператор користи GSM технологија (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Мојот оператор користи CDMA технологија (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Изберете го Вашиот оператор"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Изберете ја Вашата тарифа:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Изберете го Вашиот _APN (име на пристапна точка):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Предупредување: со избирање на неточна тарифа може да предизвика "
-#~ "неправилна наплата за сметката за широкопојасен пристап или да ја спречи "
-#~ "врската.\n"
-#~ "\n"
-#~ "Ако не сте сигурни која тарифа да ја изберете, прашајте го Вашиот "
-#~ "оператор да ви го APN за Вашата тарифа."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Изберете ја Вашата тарифа"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Вашата мобилна широкопојасна врска е конфигурирана со следните "
-#~ "поставувања:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Вашиот уред:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Вашиот оператор:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Вашата тарифа:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Сега ќе биде остварена мобилна широкопојасна врска со вашиот оператор со "
-#~ "користење на поставувањата кои ги избравте.  Ако врската не успее или не "
-#~ "можете да пристапите на мрежните ресурси, повторно проверете ги "
-#~ "поставувањата.  За да ги измените поставувањата за мобилната "
-#~ "широкопојасна врска изберете „Мрежни врск“ од менито Систем >> Преференци."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Потврдете ги поставувањата за мобилна широкопојасна врска"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(ништо)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Сертификат на C_A:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Непознато"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "Изберете датотека"
-
-#, fuzzy
-#~ msgid "Select from file…"
-#~ msgstr "Изберете датотека"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Изберете личен сертификат..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Кориснички сертификат:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Грешка при уредувањето на врската"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Отклучи"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "Ба_рај ја оваа лозинка секогаш"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Потребна е лозинка за поврзување со „%s“."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Покажи ги лозин_ките"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Лозинка:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Лозинка:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Лозинка:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Исклучи се"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Ништо"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Динамичен WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "К_реирај"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "За да и пристапите на оваа безжична мрежа потребен е енкриптиран клуч или "
-#~ "лозинка '%s'."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Потребна е автентикација за безжична мрежа"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Потребна е автентикација за безжичната мрежа"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Креирај нова безжична мрежа"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Нова безжична мрежа"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Внесете име на безжичната мрежа на која што сакате да се врзете."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Поврзи се со скриена безжична мрежа"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Скриена безжична мрежа"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Внесете име и безбедносни податоци за безжичната мрежа на која што сакате "
-#~ "да се врзете."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Безжична безбедност:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Вр_ска:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Безжичен _адаптер:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Не можам да го најдам мојот оператор и сакам да го внесам _рачно:"
-
-#~ msgid "Provider:"
-#~ msgstr "Оператор:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Листа на држави и региони:"
-
-#~ msgid "Country or region"
-#~ msgstr "Држава или регион"
-
-#~ msgid "Wired"
-#~ msgstr "Жичено"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Безжична безбедност:"
-
-#~ msgid "_Network name:"
-#~ msgstr "Име на _мрежа:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Вр_ска:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Безжичен _адаптер:"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "1 (стандардно)"
diff --git a/po/ml.po b/po/ml.po
index 67af20a6..4ffc562c 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet.master.ml\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2013-04-21 23:43+0530\n"
 "Last-Translator: Balasankar C <c balasankar gmail com>\n"
 "Language-Team: Swatantra Malayalam Computing\n"
@@ -23,6 +23,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "ശൃംഖല"
 
@@ -216,15 +217,19 @@ msgstr "802.1X ആധികാരികത"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_കണക്ട് ചെയ്യുക"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_ശൃംഖലയുടെ പേരു്:"
@@ -579,7 +584,7 @@ msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ്"
 
@@ -704,7 +709,9 @@ msgstr "ഡിഎസ്എല്‍ ആധികാരികത ഉറപ്പ
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -811,6 +818,7 @@ msgid "Error displaying connection information:"
 msgstr "ബന്ധം സംബന്ധിച്ചുള്ള വിവരം കാണിക്കുന്നതില്‍ പിശക്"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "എല്‍ഇഎപി"
@@ -961,7 +969,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "അടയാളവാക്ക്:"
@@ -986,7 +994,8 @@ msgstr "വിപിഎന്‍ ബാനര്‍"
 msgid "Base Connection"
 msgstr "അടിസ്ഥാന ബന്ധം"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "അപരിചിതം"
 
@@ -1748,6 +1757,7 @@ msgid "_Service"
 msgstr "_സേവനം:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2407,6 +2417,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "വീട്ടിലെ ശൃംഖല ലഭ്യമല്ലെങ്കില്‍ _പുറത്തുള്ളവ അനുവദിക്കുക"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "അടയാളവാക്കുകള്‍ _കാണിക്കുക"
 
@@ -2810,13 +2821,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "ഈഥര്‍നെറ്റ്"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3141,12 +3153,12 @@ msgstr ""
 "വീണ്ടും ശ്രമിക്കുക."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "വയര്‍ലസ്സ്"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "ബ്ലൂടൂത്ത്"
 
@@ -3156,22 +3168,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "ഇന്‍ഫിനിബാന്‍ഡ്"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "ബോണ്ട്"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "ബ്രിഡ്ജ്"
 
@@ -3468,6 +3483,7 @@ msgid "Select a connection to delete"
 msgstr "DSL ബന്ധം%d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "പേര്"
 
@@ -3692,6 +3708,8 @@ msgstr "ഈഥര്‍നെറ്റ് ബന്ധം %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "സ്വതവേയുള്ള"
 
@@ -3918,35 +3936,35 @@ msgstr "എന്റെ പ്രൊവൈഡര്‍ _GSM ടെക്നോ
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "എന്റെ പ്രൊവൈഡര്‍ C_DMA ടെക്നോളജി ഉപയോഗിക്കുന്നു (i.e. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "സിഡിഎംഎ"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "ജിഎസ്എം"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4113,10 +4131,12 @@ msgid "Wi-Fi connection %d"
 msgstr "വയര്‍ലസ് ബന്ധം %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "ഡബ്ലിയുഇപി 40/128-bit കീ (ഹെക്സോ ആസ്കിയോ)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit പാസ്‌ഫ്രെയിസ്"
 
@@ -4125,14 +4145,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "ഡൈനമിക് WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 പേഴ്സണല്‍"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 എന്റര്‍പ്രൈസ്"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 പേഴ്സണല്‍"
@@ -4207,6 +4230,480 @@ msgstr "ബന്ധവിവരം"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്:"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "സ്വകാര്യ _കീ:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_സ്വകാര്യ കീ അടയാളവാക്ക്:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_ഉപയോക്താവിന്റെ സര്‍ട്ടിഫീക്കേറ്റ്:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "എന്റെ രാജ്യം ലഭ്യമല്ല"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "പട്ടികയിലില്ലാത്ത"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "എന്റെ പ്ലാന്‍ പട്ടികയിലില്ല..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "പ്രൊവൈഡര്‍"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്തിരിക്കുന്ന GSM ഡിവൈസ്"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്തിരിക്കുന്ന CDMA ഡിവൈസ്"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "ഏതെങ്കിലും ഡിവൈസ്"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "പുതിയ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് കണക്ഷന്‍"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"ഈ സഹായി നിങ്ങളെ എളുപ്പത്തില്‍ ഒരു സെല്ലുലാര്‍ (3G) നെറ്റ്‌വര്‍ക്കിലേക്ക് നിങ്ങളുടെമൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് "
+"ബന്ധം സജ്ജമാക്കുന്നു."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "നിങ്ങള്‍ക്ക് ഈ വിവരങ്ങള്‍ ആവശ്യമാകുന്നു:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "നിങ്ങളുടെ ബ്രോഡ്ബാന്‍ഡ് പ്രൊവൈഡറിന്റെ പേര്"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "നിങ്ങളുടെ ബ്രോഡ്ബാന്‍ഡ് ബില്ലിങ് പ്ലാന്‍"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(ചില സാഹചര്യങ്ങളില്‍) നിങ്ങളുടെ ബ്രോഡ്ബാന്‍ഡ് ബില്ലിങ് പ്ലാന്‍ APN (ആക്സസ് പോയിന്റ് നെയിം)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "ഈ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ഡിവൈസിനു് ഒരു ബന്ധം ഉണ്ടാക്കുക:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "ഒരു മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം സജ്ജമാക്കുക"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "രാജ്യമോ പ്രദേശമോ"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "നിങ്ങളുടെ ദാതാവിന്റെ രാജ്യമോ പ്രദേശമോ തിരഞ്ഞെടുക്കുക"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "_പട്ടികയില്‍ നിന്നും നിങ്ങളുടെ പ്രൊവൈഡര്‍ തെരഞ്ഞെടുക്കുക:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "എന്റെ പ്രൊവൈഡര്‍ ലഭ്യമല്ല, സ്വയം നല്‍കുവാന്‍ ആഗ്രഹിക്കുന്നു:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "എന്റെ പ്രൊവൈഡര്‍ GSM ടെക്നോളജി ഉപയോഗിക്കുന്നു (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "എന്റെ പ്രൊവൈഡര്‍ CDMA ടെക്നോളജി ഉപയോഗിക്കുന്നു (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "നിങ്ങളുടെ പ്രൊവൈഡര്‍ തെരഞ്ഞെടുക്കുക"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "നിങ്ങളുടെ പ്ലാന്‍ _തെരെഞ്ഞെടുക്കുക:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "തെരഞ്ഞെടുത്ത പ്ലാന്‍ _APN (ആക്സസ് പോയിന്റ് നെയിം):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"മുന്നറിയിപ്പു്: തെറ്റായ പ്ലാന്‍ തെരഞ്ഞെടുക്കുന്നതു് ബില്ലിങില്‍ പ്രശ്നങ്ങള്‍ ഉണ്ടാക്കുന്നു, അല്ലെങ്കില്‍ 
ബന്ധം "
+"തടസ്സപ്പെടുത്തുന്നു.\n"
+"\n"
+"നിങ്ങളുടെ പ്ലാന്‍ ഏതെന്നുറപ്പല്ലെങ്കില്‍, ദയവായി നിങ്ങളുടെ പ്രൊവൈഡറില്‍ നിന്നും APN ലഭ്യമാക്കുക."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "നിങ്ങളുടെ ബില്ലിങ് പ്ലാന്‍ തെരഞ്ഞെടുക്കുക"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"നിങ്ങളുടെ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം താഴെ പറഞ്ഞിരിക്കുന്ന ക്രമീകരണങ്ങള്‍കൊണ്ട് സജ്ജമാക്കിയിരിക്കുന്നു:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "നിങ്ങളുടെ ഡിവൈസ്:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "നിങ്ങളുടെ പ്രൊവൈഡര്‍:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "നിങ്ങളുടെ പ്ലാന്‍:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"നിങ്ങള്‍ തെരഞ്ഞെടുത്ത ക്രമീകരണങ്ങള്‍ ഉപയോഗിച്ച് നിങ്ങളുടെ മൊബൈല്‍ പ്രൊവൈഡറിലേക്ക് ഒരു ബന്ധം ഇപ്പോള്‍ "
+"നല്‍കുന്നു. ബന്ധം പരാജയപ്പെടുകയോ, ശൃംഖല സോഴ്സുകള്‍ ലഭ്യമാക്കുകയോ സാധ്യമല്ലെങ്കില്‍, ക്രമീകരണങ്ങളില്‍ "
+"ഡബിള്‍ ക്ലിക്ക് ചെയ്യുക. നിങ്ങളുടെ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം ക്രമീകരണങ്ങള്‍ മാറ്റുന്നതിനായി, "
+"സിസ്റ്റം >> മുന്‍ഗണനകള്‍ എന്ന മെനുവില്‍ നിന്നും \"ശൃംഖല ബന്ധങ്ങള്‍\" തെരഞ്ഞെടുക്കുക."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് സജ്ജീകരണങ്ങള്‍ ഉറപ്പാക്കുക"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ഒന്നുമില്ല)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A സര്‍ട്ടിഫീക്കേറ്റ്:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "അപരിചിതം"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_ഉപയോക്താവിന്റെ സര്‍ട്ടിഫീക്കേറ്റ്:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "ബന്ധം ചിട്ടപ്പെടുത്തുന്നതില്‍ പിശക്"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_പൂട്ട് തുറക്കുക"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "അടയാളവാക്ക് എപ്പോഴും ചോ_ദിക്കുക"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "'%s'-ലേക്കു് ബന്ധപ്പെടുന്നതിനായി ഒരു അടയാളവാക്ക് ആവശ്യമുണ്ടു്."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "അടയാളവാക്കുക _കാണിക്കുക"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_ദ്വിതീയ തലത്തിലുള്ള അടയാളവാക്ക്:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_ദ്വിതീയ തലത്തിലുള്ള അടയാളവാക്ക്:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_അടയാളവാക്ക്:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "ബന്ധം വിഛേദിക്കുക"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "ഒന്നുമില്ല"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "ഡൈനമിക് WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_ഉണ്ടാക്കുക"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"വയര്‍ലെസ് ശൃംഖല '%s'-ലേക്ക് പ്രവേശിക്കുന്നതിനായി അടയാളവാക്കുകള്‍ അല്ലെങ്കില്‍ എന്‍ക്രിപ്ഷന്‍ കീകള്‍ "
+"ആവശ്യമുണ്ടു്."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "വയര്‍ലെസ് ശൃംഖല ആധികാരികത ആവശ്യമുണ്ടു്"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "വയര്‍ലെസ് ശൃംഖല ആധികാരികത ഉറപ്പിക്കുന്നതിനായി ആവശ്യപ്പെട്ടിരിക്കുന്നു"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "പുതിയ വയര്‍ലെസ് ശൃംഖല ഉണ്ടാക്കുക"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "പുതിയ വയര്‍ലെസ് ശൃംഖല"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "നിങ്ങള്‍ ഉണ്ടാക്കുവാന്‍ ആഗ്രഹിക്കുന്ന വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിന്റെ പേരു് നല്‍കുക."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "അദൃശ്യമായ വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിലേക്ക് കണക്ട് ചെയ്യുക"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "അദൃശ്യമായ വയര്‍ലെസ് ശൃംഖല"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"നിങ്ങള്‍ കണക്ട് ചെയ്യുവാന്‍ ആഗ്രഹിക്കുന്ന അദൃശ്യമായ വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിന്റ് പേരും സുരക്ഷാ "
+"വിശദാംശങ്ങളും നല്‍കുക"
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_വയര്‍ലെസ് സുരക്ഷ:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "ക_ണക്ഷന്‍:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "വയര്‍ലെസ് _അഡാപ്ടര്‍:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "എന്റെ പ്രൊവൈഡര്‍ ലഭ്യമല്ല, സ്വയം നല്‍കുവാന്‍ ആഗ്രഹിക്കുന്നു:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "പ്രൊവൈഡര്‍:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "രാജ്യങ്ങളുടേയോ പ്രദേശങ്ങളുടേയോ പട്ടിക:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "രാജ്യമോ പ്രദേശമോ"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "വയര്‍ഡ്"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC മെഷ്"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "യുഎസ്ബി"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_വയര്‍ലെസ് സുരക്ഷ:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_ശൃംഖലയുടെ പേരു്:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "ക_ണക്ഷന്‍:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "വയര്‍ലെസ് _അഡാപ്ടര്‍:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "ഉപയോഗം:"
@@ -4356,26 +4853,26 @@ msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവ
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ഒരു പിഎസി ഫയല്‍ തിരഞ്ഞെടുക്കുക..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "പിഎസി ഫയലുകള്‍ (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "എല്ലാ ഫയലുകളും"
 
@@ -4414,16 +4911,16 @@ msgstr "_ആന്തരിക ആധികാരികത ഉറപ്പാക
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ഓട്ടോമാറ്റിക് പിഎസി അനുവദിയ്ക്കുക"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4459,15 +4956,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4481,24 +4978,24 @@ msgstr "WEP 128-bit പാസ്‌ഫ്രെയിസ്"
 msgid "Sh_ow passphrase"
 msgstr "അടയാളവാക്കുക _കാണിക്കുക"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്:"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4507,7 +5004,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "_തിരിച്ചറിയല്‍:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4547,15 +5044,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_തിരിച്ചറിയല്‍:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_സ്വകാര്യ കീ അടയാളവാക്ക്:"
@@ -4565,33 +5062,33 @@ msgstr "_സ്വകാര്യ കീ അടയാളവാക്ക്:"
 msgid "_Type"
 msgstr "_തരം:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4621,330 +5118,17 @@ msgstr "കീ കാ_ണിക്കുക"
 msgid "WEP inde_x"
 msgstr "WEP _സൂചിക:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്:"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "സ്വകാര്യ _കീ:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_സ്വകാര്യ കീ അടയാളവാക്ക്:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_ഉപയോക്താവിന്റെ സര്‍ട്ടിഫീക്കേറ്റ്:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "എന്റെ രാജ്യം ലഭ്യമല്ല"
-
-#~ msgid "Unlisted"
-#~ msgstr "പട്ടികയിലില്ലാത്ത"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "എന്റെ പ്ലാന്‍ പട്ടികയിലില്ല..."
-
-#~ msgid "Provider"
-#~ msgstr "പ്രൊവൈഡര്‍"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്തിരിക്കുന്ന GSM ഡിവൈസ്"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്തിരിക്കുന്ന CDMA ഡിവൈസ്"
-
-#~ msgid "Any device"
-#~ msgstr "ഏതെങ്കിലും ഡിവൈസ്"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "പുതിയ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് കണക്ഷന്‍"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "ഈ സഹായി നിങ്ങളെ എളുപ്പത്തില്‍ ഒരു സെല്ലുലാര്‍ (3G) നെറ്റ്‌വര്‍ക്കിലേക്ക് നിങ്ങളുടെമൊബൈല്‍ ബ്രോഡ്ബാന്‍"
-#~ "ഡ് ബന്ധം സജ്ജമാക്കുന്നു."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "നിങ്ങള്‍ക്ക് ഈ വിവരങ്ങള്‍ ആവശ്യമാകുന്നു:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "നിങ്ങളുടെ ബ്രോഡ്ബാന്‍ഡ് പ്രൊവൈഡറിന്റെ പേര്"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "നിങ്ങളുടെ ബ്രോഡ്ബാന്‍ഡ് ബില്ലിങ് പ്ലാന്‍"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(ചില സാഹചര്യങ്ങളില്‍) നിങ്ങളുടെ ബ്രോഡ്ബാന്‍ഡ് ബില്ലിങ് പ്ലാന്‍ APN (ആക്സസ് പോയിന്റ് നെയിം)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "ഈ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ഡിവൈസിനു് ഒരു ബന്ധം ഉണ്ടാക്കുക:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "ഒരു മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം സജ്ജമാക്കുക"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "രാജ്യമോ പ്രദേശമോ"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "നിങ്ങളുടെ ദാതാവിന്റെ രാജ്യമോ പ്രദേശമോ തിരഞ്ഞെടുക്കുക"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "_പട്ടികയില്‍ നിന്നും നിങ്ങളുടെ പ്രൊവൈഡര്‍ തെരഞ്ഞെടുക്കുക:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "എന്റെ പ്രൊവൈഡര്‍ ലഭ്യമല്ല, സ്വയം നല്‍കുവാന്‍ ആഗ്രഹിക്കുന്നു:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "എന്റെ പ്രൊവൈഡര്‍ GSM ടെക്നോളജി ഉപയോഗിക്കുന്നു (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "എന്റെ പ്രൊവൈഡര്‍ CDMA ടെക്നോളജി ഉപയോഗിക്കുന്നു (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "നിങ്ങളുടെ പ്രൊവൈഡര്‍ തെരഞ്ഞെടുക്കുക"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "നിങ്ങളുടെ പ്ലാന്‍ _തെരെഞ്ഞെടുക്കുക:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "തെരഞ്ഞെടുത്ത പ്ലാന്‍ _APN (ആക്സസ് പോയിന്റ് നെയിം):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "മുന്നറിയിപ്പു്: തെറ്റായ പ്ലാന്‍ തെരഞ്ഞെടുക്കുന്നതു് ബില്ലിങില്‍ പ്രശ്നങ്ങള്‍ ഉണ്ടാക്കുന്നു, അല്ലെങ്കില്‍ 
"
-#~ "ബന്ധം തടസ്സപ്പെടുത്തുന്നു.\n"
-#~ "\n"
-#~ "നിങ്ങളുടെ പ്ലാന്‍ ഏതെന്നുറപ്പല്ലെങ്കില്‍, ദയവായി നിങ്ങളുടെ പ്രൊവൈഡറില്‍ നിന്നും APN ലഭ്യമാക്കുക."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "നിങ്ങളുടെ ബില്ലിങ് പ്ലാന്‍ തെരഞ്ഞെടുക്കുക"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "നിങ്ങളുടെ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം താഴെ പറഞ്ഞിരിക്കുന്ന ക്രമീകരണങ്ങള്‍കൊണ്ട് "
-#~ "സജ്ജമാക്കിയിരിക്കുന്നു:"
-
-#~ msgid "Your Device:"
-#~ msgstr "നിങ്ങളുടെ ഡിവൈസ്:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "നിങ്ങളുടെ പ്രൊവൈഡര്‍:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "നിങ്ങളുടെ പ്ലാന്‍:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "നിങ്ങള്‍ തെരഞ്ഞെടുത്ത ക്രമീകരണങ്ങള്‍ ഉപയോഗിച്ച് നിങ്ങളുടെ മൊബൈല്‍ പ്രൊവൈഡറിലേക്ക് ഒരു ബന്ധം "
-#~ "ഇപ്പോള്‍ നല്‍കുന്നു. ബന്ധം പരാജയപ്പെടുകയോ, ശൃംഖല സോഴ്സുകള്‍ ലഭ്യമാക്കുകയോ സാധ്യമല്ലെങ്കില്‍, "
-#~ "ക്രമീകരണങ്ങളില്‍ ഡബിള്‍ ക്ലിക്ക് ചെയ്യുക. നിങ്ങളുടെ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം ക്രമീകരണങ്ങള്‍ "
-#~ "മാറ്റുന്നതിനായി, സിസ്റ്റം >> മുന്‍ഗണനകള്‍ എന്ന മെനുവില്‍ നിന്നും \"ശൃംഖല ബന്ധങ്ങള്‍\" "
-#~ "തെരഞ്ഞെടുക്കുക."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് സജ്ജീകരണങ്ങള്‍ ഉറപ്പാക്കുക"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(ഒന്നുമില്ല)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "C_A സര്‍ട്ടിഫീക്കേറ്റ്:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "അപരിചിതം"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_ഉപയോക്താവിന്റെ സര്‍ട്ടിഫീക്കേറ്റ്:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "ബന്ധം ചിട്ടപ്പെടുത്തുന്നതില്‍ പിശക്"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_പൂട്ട് തുറക്കുക"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "അടയാളവാക്ക് എപ്പോഴും ചോ_ദിക്കുക"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "'%s'-ലേക്കു് ബന്ധപ്പെടുന്നതിനായി ഒരു അടയാളവാക്ക് ആവശ്യമുണ്ടു്."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "അടയാളവാക്കുക _കാണിക്കുക"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_ദ്വിതീയ തലത്തിലുള്ള അടയാളവാക്ക്:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_ദ്വിതീയ തലത്തിലുള്ള അടയാളവാക്ക്:"
-
-#~ msgid "_Password:"
-#~ msgstr "_അടയാളവാക്ക്:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "ബന്ധം വിഛേദിക്കുക"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "ഒന്നുമില്ല"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "ഡൈനമിക് WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_ഉണ്ടാക്കുക"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "വയര്‍ലെസ് ശൃംഖല '%s'-ലേക്ക് പ്രവേശിക്കുന്നതിനായി അടയാളവാക്കുകള്‍ അല്ലെങ്കില്‍ എന്‍ക്രിപ്ഷന്‍ കീകള്‍ "
-#~ "ആവശ്യമുണ്ടു്."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "വയര്‍ലെസ് ശൃംഖല ആധികാരികത ആവശ്യമുണ്ടു്"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "വയര്‍ലെസ് ശൃംഖല ആധികാരികത ഉറപ്പിക്കുന്നതിനായി ആവശ്യപ്പെട്ടിരിക്കുന്നു"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "പുതിയ വയര്‍ലെസ് ശൃംഖല ഉണ്ടാക്കുക"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "പുതിയ വയര്‍ലെസ് ശൃംഖല"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "നിങ്ങള്‍ ഉണ്ടാക്കുവാന്‍ ആഗ്രഹിക്കുന്ന വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിന്റെ പേരു് നല്‍കുക."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "അദൃശ്യമായ വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിലേക്ക് കണക്ട് ചെയ്യുക"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "അദൃശ്യമായ വയര്‍ലെസ് ശൃംഖല"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "നിങ്ങള്‍ കണക്ട് ചെയ്യുവാന്‍ ആഗ്രഹിക്കുന്ന അദൃശ്യമായ വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിന്റ് പേരും സുരക്ഷാ "
-#~ "വിശദാംശങ്ങളും നല്‍കുക"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_വയര്‍ലെസ് സുരക്ഷ:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "ക_ണക്ഷന്‍:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "വയര്‍ലെസ് _അഡാപ്ടര്‍:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "എന്റെ പ്രൊവൈഡര്‍ ലഭ്യമല്ല, സ്വയം നല്‍കുവാന്‍ ആഗ്രഹിക്കുന്നു:"
-
-#~ msgid "Provider:"
-#~ msgstr "പ്രൊവൈഡര്‍:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "രാജ്യങ്ങളുടേയോ പ്രദേശങ്ങളുടേയോ പട്ടിക:"
-
-#~ msgid "Country or region"
-#~ msgstr "രാജ്യമോ പ്രദേശമോ"
-
-#~ msgid "Wired"
-#~ msgstr "വയര്‍ഡ്"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC മെഷ്"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "യുഎസ്ബി"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_വയര്‍ലെസ് സുരക്ഷ:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_ശൃംഖലയുടെ പേരു്:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "ക_ണക്ഷന്‍:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "വയര്‍ലെസ് _അഡാപ്ടര്‍:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (സഹജം)"
 
diff --git a/po/mr.po b/po/mr.po
index 4d723b68..60bb296c 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: mr\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2011-03-28 16:06+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak redhat com>\n"
 "Language-Team: Marathi <fedora-trans-mr redhat com>\n"
@@ -21,6 +21,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "नेटवर्क"
 
@@ -211,15 +212,19 @@ msgstr "Wired 802.1X ओळख पटवा"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "जुळवा (_o)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "नेटवर्कचे नाव (_N):"
@@ -575,7 +580,7 @@ msgstr "मोबाइल ब्रॉडबँड (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "मोबाइल ब्रॉडबँड"
 
@@ -704,7 +709,9 @@ msgstr "DSL ओळख पटवणे"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -817,6 +824,7 @@ msgid "Error displaying connection information:"
 msgstr "जोडणी माहिती प्रदर्शित करतेवेळी त्रुटी आढळली:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -968,7 +976,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "पासवर्ड:"
@@ -997,7 +1005,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "जोडणी (_n):"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "अपरिचीत"
 
@@ -1750,6 +1759,7 @@ msgid "_Service"
 msgstr "सर्व्हिस (_S):"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2407,6 +2417,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "होम नेटवर्क उपलब्ध नसल्यास रोमींग स्वीकारा"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "पासवर्डस् दाखवा (_w)"
 
@@ -2807,14 +2818,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "स्वयं Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3137,12 +3149,12 @@ msgstr ""
 "अपयशी ठरल्यास, काहिक पद्धतीकरीता समर्थन अकार्यान्वीत करण्याचा प्रयत्न करा."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3152,22 +3164,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "इंफिनिबँड"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "बाँड"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "ब्रिज"
 
@@ -3460,6 +3475,7 @@ msgid "Select a connection to delete"
 msgstr "वायर्ड जोडणी %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "नाव"
 
@@ -3688,6 +3704,8 @@ msgstr "वायर्ड जोडणी %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "पूर्वनिर्धारीत"
 
@@ -3916,35 +3934,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "माझे प्रोव्हाइडर CDMA-आधारीत विज्ञानाचा (म्हणजेच 1xRTT, EVDO) वापर करतात (_D)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4111,10 +4129,12 @@ msgid "Wi-Fi connection %d"
 msgstr "वायर्ड जोडणी %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-बीट कि (Hex किंवा ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit गोपनीयता"
 
@@ -4123,14 +4143,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "गतिक WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 खाजगी"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 एन्टरप्राइज"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 खाजगी"
@@ -4208,6 +4231,491 @@ msgstr "जोडणी माहिती"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "प्राइव्हेट कि (_k):"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "प्राइव्हेट कि पासवर्ड (_P):"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "वापरकर्त्याचे प्रमाणपत्र (_U):"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "माझे देश सूचीत नाही"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "सूचीत नाही"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "माजे प्लॅन सूचीत नाही..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "प्रोव्हाइडर"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "प्रतिष्ठापीत GSM साधन"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "प्रतिष्ठापीत CDMA साधन"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "कुठलेही साधण"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "नवीन मोबाइल ब्रॉडबँड जोडणी"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"सहाय्यक तुम्हाला मोबाईल ब्रॉडबँड जोडणी सेल्यूलर (3G) नेटवर्ककरीता सेट अप करण्यास मदत "
+"करतो."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "तुम्हाला खालील माहितीची आवश्यकता आहे:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "तुमच्या ब्रॉडबँड प्रोव्हाइडरचे नवा"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "तुमच्या ब्रॉडबँड बिलींग प्लॅनचे नाव"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(काहिक घटनांमध्ये) तुमचे ब्रॉडबँड बिलींग प्लॅन APN (ऍक्सेस पॉईंट नेम)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "या मोबाइल ब्रॉडबँड साधण करीता जोडणी निर्माण करा (_t):"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "मोबाइल ब्रॉडबँड जोडणी सेटअप करा"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "देश किंवा प्रांत"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "प्रोव्हाइडरचे देश किंवा प्रांत नीवडा"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "सूचीतून प्रोव्हाइडर नीवडा (_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "माझे प्रोव्हाइडर शोधणे शक्य नाही व मला स्वहस्ते द्यायचे आहे (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "माझे प्रोव्हाइडर GSM विज्ञानाचा (GPRS, EDGE, UMTS, HSPA) वापर करते"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "माझे प्रोव्हाइडर CDMA विज्ञानचा (1xRTT, EVDO) वापर करते"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "आपली प्राइव्हेट कि नीवडा"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "तुमचे प्लॅन नीवडा (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "नीवडलेले प्लॅन APN (ऍक्सेस् पॉईंट नेम) (_A):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"सावधान: अयोग्य प्लॅन नीवडल्यास ब्रॉडबँड खातेकरीता बिलींग अडचणींकरीता कारणीभूत ठरू शकतात "
+"किंवा जोडणी टाळू शकतात.\n"
+"\n"
+"प्लॅन विषयी खात्री नसल्यास कृपया प्रोव्हाइडरला तुमच्या प्लॅन APN विषयी विचारा."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "तुमचे बिलींग प्लॅन नीवडा"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "तुमची मोबाईल ब्रॉडबँड जोडणी आत्ता खालील सेटिंग्स् सह संरचीत केले आहे:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "तुमचे साधण:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "तुमचे प्रोव्हाइडर:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "तुमचे प्लॅन:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"नीवडलेल्या सेटिंग्स् सह तुमच्या मोबाईल ब्रॉडबँड प्रोव्हाइडरसह जोडणी स्थापीत केली जाईल.  "
+"जोडणी अपयशी ठरल्यास किंवा नेटवर्क स्रोतकरीता प्रवेश प्राप्त न झाल्यस, सेटिंग्स् दोनवेळ "
+"तपासा.  मबाईल ब्रॉडबँड जोडणीच्या सेटिंग्स् संपादीत करण्यासाठी, System >> Preferences "
+"मेन्यू पासून \"Network Connections\" नीवडा."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "मोबाइल ब्रॉडबँड सेटिंग्स्ची खात्री करा"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(काहिच नाही)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA प्रमाणपत्र (_A):"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "अपरिचीत"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "वापरकर्त्याचे प्रमाणपत्र (_U):"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "जोडणी संपादीत करतेवेळी त्रुटी"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "कुलूपबंद अशक्य करा (_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "प्रत्येकवेळी या पासवर्डकरीता विचारा (_k)"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "'%s' शी जोडणी स्थापीत करण्याकरीता पासवर्ड आवश्यक आहे."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "पासवर्डस् दाखवा (_w)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "पासवर्ड (_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "पासवर्ड (_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "पासवर्ड (_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "जोडणी मोडा"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "काहीच नाही"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "गतिक WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "बनवा (_r)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"वायरलेस नेटवर्क '%s' करीता प्रवेश प्राप्त करण्यासाठी पासवर्ड किंवा एनक्रीपसन कि आवश्यक "
+"आहे."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "वायरलेस नेटवर्क ओळख पटवणे आवश्यक"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "वायरलेस नेटवर्क द्वारे ओळख पटवणे आवश्यक आहे"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "नवीन वायरलेस नेटवर्क बनवा"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "नवीन वायरलेस नेटवर्क"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "पसंतीचे वायरलेस नेटवर्क करीता नाव प्रविष्ट करा."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "लपवलेले वायरलेस नेटवर्कशी जुळवा"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "लपविलेले वायरलेस नेटवर्क"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"पसंतीचे लपविलेले वायरलेस नेटवर्कशी जोडणी स्थापीत करण्याकरीता नाव व सुरक्षा तपशील प्रविष्ट "
+"करा."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "वायरलेस सुरक्षा (_W):"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "जोडणी (_n):"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "वायरलेस अडॅप्टर (_a):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "माझे प्रोव्हाइडर शोधणे शक्य नाही व मला स्वहस्ते द्यायचे आहे (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "प्रोव्हाइडर:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "देश किंवा प्रांताची सूची:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "देश किंवा प्रांत"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "वार्यर्ड"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "वायरलेस सुरक्षा (_W):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "नेटवर्कचे नाव (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "जोडणी (_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "वायरलेस अडॅप्टर (_a):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "वापर:"
@@ -4360,26 +4868,26 @@ msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC फाइल पसंत करा..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC फाइल्स (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "सर्व फाइल्स"
 
@@ -4420,16 +4928,16 @@ msgstr "आंतरीक ओळख पटवा (_n):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4465,15 +4973,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4487,24 +4995,24 @@ msgstr "WEP 128-bit गोपनीयता"
 msgid "Sh_ow passphrase"
 msgstr "पासवर्डस् दाखवा (_w)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4513,7 +5021,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "ओळख (_d):"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4553,15 +5061,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "ओळख पटवा (_A):"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "प्राइव्हेट कि पासवर्ड (_P):"
@@ -4571,33 +5079,33 @@ msgstr "प्राइव्हेट कि पासवर्ड (_P):"
 msgid "_Type"
 msgstr "प्रकार (_T):"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4627,321 +5135,17 @@ msgstr "कि दाखवा (_w)"
 msgid "WEP inde_x"
 msgstr "WEP इंडेक्स् (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "प्राइव्हेट कि (_k):"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "प्राइव्हेट कि पासवर्ड (_P):"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "वापरकर्त्याचे प्रमाणपत्र (_U):"
-
-#~ msgid "My country is not listed"
-#~ msgstr "माझे देश सूचीत नाही"
-
-#~ msgid "Unlisted"
-#~ msgstr "सूचीत नाही"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "माजे प्लॅन सूचीत नाही..."
-
-#~ msgid "Provider"
-#~ msgstr "प्रोव्हाइडर"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "प्रतिष्ठापीत GSM साधन"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "प्रतिष्ठापीत CDMA साधन"
-
-#~ msgid "Any device"
-#~ msgstr "कुठलेही साधण"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "नवीन मोबाइल ब्रॉडबँड जोडणी"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "सहाय्यक तुम्हाला मोबाईल ब्रॉडबँड जोडणी सेल्यूलर (3G) नेटवर्ककरीता सेट अप करण्यास मदत "
-#~ "करतो."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "तुम्हाला खालील माहितीची आवश्यकता आहे:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "तुमच्या ब्रॉडबँड प्रोव्हाइडरचे नवा"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "तुमच्या ब्रॉडबँड बिलींग प्लॅनचे नाव"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(काहिक घटनांमध्ये) तुमचे ब्रॉडबँड बिलींग प्लॅन APN (ऍक्सेस पॉईंट नेम)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "या मोबाइल ब्रॉडबँड साधण करीता जोडणी निर्माण करा (_t):"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "मोबाइल ब्रॉडबँड जोडणी सेटअप करा"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "देश किंवा प्रांत"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "प्रोव्हाइडरचे देश किंवा प्रांत नीवडा"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "सूचीतून प्रोव्हाइडर नीवडा (_l):"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "माझे प्रोव्हाइडर शोधणे शक्य नाही व मला स्वहस्ते द्यायचे आहे (_m):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "माझे प्रोव्हाइडर GSM विज्ञानाचा (GPRS, EDGE, UMTS, HSPA) वापर करते"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "माझे प्रोव्हाइडर CDMA विज्ञानचा (1xRTT, EVDO) वापर करते"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "आपली प्राइव्हेट कि नीवडा"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "तुमचे प्लॅन नीवडा (_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "नीवडलेले प्लॅन APN (ऍक्सेस् पॉईंट नेम) (_A):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "सावधान: अयोग्य प्लॅन नीवडल्यास ब्रॉडबँड खातेकरीता बिलींग अडचणींकरीता कारणीभूत ठरू "
-#~ "शकतात किंवा जोडणी टाळू शकतात.\n"
-#~ "\n"
-#~ "प्लॅन विषयी खात्री नसल्यास कृपया प्रोव्हाइडरला तुमच्या प्लॅन APN विषयी विचारा."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "तुमचे बिलींग प्लॅन नीवडा"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "तुमची मोबाईल ब्रॉडबँड जोडणी आत्ता खालील सेटिंग्स् सह संरचीत केले आहे:"
-
-#~ msgid "Your Device:"
-#~ msgstr "तुमचे साधण:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "तुमचे प्रोव्हाइडर:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "तुमचे प्लॅन:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "नीवडलेल्या सेटिंग्स् सह तुमच्या मोबाईल ब्रॉडबँड प्रोव्हाइडरसह जोडणी स्थापीत केली जाईल.  "
-#~ "जोडणी अपयशी ठरल्यास किंवा नेटवर्क स्रोतकरीता प्रवेश प्राप्त न झाल्यस, सेटिंग्स् दोनवेळ "
-#~ "तपासा.  मबाईल ब्रॉडबँड जोडणीच्या सेटिंग्स् संपादीत करण्यासाठी, System >> "
-#~ "Preferences मेन्यू पासून \"Network Connections\" नीवडा."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "मोबाइल ब्रॉडबँड सेटिंग्स्ची खात्री करा"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(काहिच नाही)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "CA प्रमाणपत्र (_A):"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "अपरिचीत"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "वापरकर्त्याचे प्रमाणपत्र (_U):"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "जोडणी संपादीत करतेवेळी त्रुटी"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "कुलूपबंद अशक्य करा (_U)"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "प्रत्येकवेळी या पासवर्डकरीता विचारा (_k)"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "'%s' शी जोडणी स्थापीत करण्याकरीता पासवर्ड आवश्यक आहे."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "पासवर्डस् दाखवा (_w)"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "पासवर्ड (_P):"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "पासवर्ड (_P):"
-
-#~ msgid "_Password:"
-#~ msgstr "पासवर्ड (_P):"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "जोडणी मोडा"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "काहीच नाही"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "गतिक WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "बनवा (_r)"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "वायरलेस नेटवर्क '%s' करीता प्रवेश प्राप्त करण्यासाठी पासवर्ड किंवा एनक्रीपसन कि "
-#~ "आवश्यक आहे."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "वायरलेस नेटवर्क ओळख पटवणे आवश्यक"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "वायरलेस नेटवर्क द्वारे ओळख पटवणे आवश्यक आहे"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "नवीन वायरलेस नेटवर्क बनवा"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "नवीन वायरलेस नेटवर्क"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "पसंतीचे वायरलेस नेटवर्क करीता नाव प्रविष्ट करा."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "लपवलेले वायरलेस नेटवर्कशी जुळवा"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "लपविलेले वायरलेस नेटवर्क"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "पसंतीचे लपविलेले वायरलेस नेटवर्कशी जोडणी स्थापीत करण्याकरीता नाव व सुरक्षा तपशील "
-#~ "प्रविष्ट करा."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "वायरलेस सुरक्षा (_W):"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "जोडणी (_n):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "वायरलेस अडॅप्टर (_a):"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "माझे प्रोव्हाइडर शोधणे शक्य नाही व मला स्वहस्ते द्यायचे आहे (_m):"
-
-#~ msgid "Provider:"
-#~ msgstr "प्रोव्हाइडर:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "देश किंवा प्रांताची सूची:"
-
-#~ msgid "Country or region"
-#~ msgstr "देश किंवा प्रांत"
-
-#~ msgid "Wired"
-#~ msgstr "वार्यर्ड"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "वायरलेस सुरक्षा (_W):"
-
-#~ msgid "_Network name:"
-#~ msgstr "नेटवर्कचे नाव (_N):"
-
-#~ msgid "C_onnection:"
-#~ msgstr "जोडणी (_n):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "वायरलेस अडॅप्टर (_a):"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "1 (पूर्वनिर्धारीत)"
diff --git a/po/ms.po b/po/ms.po
index 0e11b9d5..14364fdf 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2011-11-14 13:25+0730\n"
 "Last-Translator: Umarzuki Bin Mochlis Moktar <umarzuki gmail com>\n"
 "Language-Team: Malay <gnome-ms googlegroups com>\n"
@@ -21,6 +21,7 @@ msgstr ""
 "X-Poedit-Country: MALAYSIA\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Rangkaian"
 
@@ -222,15 +223,19 @@ msgstr "Pengesahan 802.1X berwayar"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "S_ambung"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Nama Rangkain:"
@@ -587,7 +592,7 @@ msgstr "Jalurlebar Mudahalih (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Jalurlebar Mudahalih"
 
@@ -716,7 +721,9 @@ msgstr "Pengesahan DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -828,6 +835,7 @@ msgid "Error displaying connection information:"
 msgstr "Ralat memaparkan maklumat sambungan:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -979,7 +987,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Katalaluan:"
@@ -1004,7 +1012,8 @@ msgstr "Banner VPN"
 msgid "Base Connection"
 msgstr "Sambungan Asas"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
@@ -1760,6 +1769,7 @@ msgid "_Service"
 msgstr "_Servis:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2419,6 +2429,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Benarkan perantauan jika rangkaian rumah tidak tersedia"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Tunjuk katalaluan"
 
@@ -2815,14 +2826,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "Ethernet Automatik"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3145,12 +3157,12 @@ msgstr ""
 "kaedah."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3160,22 +3172,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3471,6 +3486,7 @@ msgid "Select a connection to delete"
 msgstr "Sambungan berwayar %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nama"
 
@@ -3700,6 +3716,8 @@ msgstr "Sambungan berwayar %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Piawai"
 
@@ -3929,35 +3947,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Pembekal saya menggunakan teknologi berasaskan C_DMA (iaitu 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4125,10 +4143,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Sambungan berwayar %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Kunci WEP 40/128-bit (Hex atau ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Frasalaluan WEP 128-bit"
 
@@ -4137,14 +4157,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP (802.1X) Dinamik"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Peribadi"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Perusahaan"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Peribadi"
@@ -4226,6 +4249,499 @@ msgstr "Maklumat Sambungan"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Sijil C_A"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Pilih sijil peribadi anda..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "_Kekunci peribadi"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_Katalaluan Kunci Persendirian:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Pilih sijil peribadi anda..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_Sijil pengesahan pengguna:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Negara saya tidak tersenarai"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Tidak tersenarai"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Plan saya tidak disenaraikan..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Pengendali"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Terpasang peranti GSM"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Terpasang peranti CDMA"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Mana-mana peranti"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Sambungan Baharu Jalurlebar Mudahalih"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Pembantu ini membantu anda untuk menetapkan sambungan broadban mudah alih ke "
+"rangkaian selular (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Anda akan memerlukan maklumat berikut:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Nama pembekal jalurlebar anda"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Nama pelan bil jalurlebar anda"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(dalam sesetengah kes) Pelan bil APN (Access Point Name) jalurlebar anda"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Cipta satu sambungan untuk peranti jalurlebar mudah alih _ini:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Tetapkan satu Sambungan Jalurlebar"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Negara atau kawasan"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Plih Negara Pembekal anda atau Kawasan"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Pilih pembekal anda dari _senarai:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"Saya tidak menjumpai nama pembekal saya dan memilih untuk memasukkannya "
+"secara _manual:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Pembekal saya menggunakan teknoloji GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Pembekal saya menggunakan teknoloji CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Pilih pengendali anda"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Pilih plan anda:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Memilih pelan _APN (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Amaran: Memilih plan yang salah boleh menyebabkan masalah bil akaun jalur "
+"lebar atau menghalang sambungan .\n"
+"\n"
+"Jika anda tidak pasti sila tanya pembekal plan APN anda."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Pilih Pelan Bil Anda"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Sambungan jalurlebar mudahalih anda dikonfigurasi dengan tetapan-tetapan "
+"berikut:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Peranti Anda:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Pengendali Anda:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Plan Anda:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Sambungan kini akan dibuat kepada pembekal jalur lebar mudah alih anda "
+"menggunakan tetapan yang anda pilih. Jika sambungan gagal atau anda tidak "
+"boleh mengakses sumber-sumber rangkaian, periksa tetapan anda. Untuk "
+"mengubah suai tetapan sambungan jalur lebar mudah alih anda, pilih "
+"\"Sambungan Rangkaian \" daripada Sistem>> Pilihan menu."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Sahkan Tetapan Jalurlebar Mudahalih"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(tiada)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Sijil C_A"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Tidak diketahui"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Pilih sijil peribadi anda..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Sijil pengesahan pengguna:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Ralat semasa menyunting sambungan"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "Buka k_unci"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "_Tanya kata laluan ini setiap kali"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Kata laluan diperlukan untuk sambung ke '%s'."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "_Tunjuk katalaluan"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Katalaluan:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Katalaluan:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Katalaluan:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Putuskan"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Tiada"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP (802.1X) Dinamik"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_ipta"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Kata laluan atau kunci penyulitan diperlukan untuk mengakses rangkaian tanpa "
+"wayar '% s'."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Pengesahan Rangkaian Wayarles Diperlukan"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "Pengesahan diperlukan oleh rangkaian wayarles"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "Cipta Sambungan Wayarles Baharu"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Rangkaian wayarles baharu"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Masukkan nama untuk rangkaian wayarles yang anda mahu buat."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Sambung ke Rangkaian Wayarles Tersembunyi"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "Rangkaian wayarles tersembunyi"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Masukkan nama dan perincian keselamatan rangkaian tanpa wayar yang "
+"tersembunyi yang anda ingin sambungkan ke."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Sekuriti _wayarles"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "S_ambungan:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Penyesuai w_ayarles:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"Saya tidak menjumpai nama pembekal saya dan memilih untuk memasukkannya "
+"secara _manual:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Pengendali:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Senarai Negara atau Kawasan:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Negara atau kawasan"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Berwayar"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "Sekuriti _wayarles"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nama Rangkain:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "S_ambungan:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Penyesuai w_ayarles:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Pengunaan:"
@@ -4378,25 +4894,25 @@ msgstr "Sijil C_A"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4436,16 +4952,16 @@ msgstr "Pengesahan Dalaman:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4482,15 +4998,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4504,24 +5020,24 @@ msgstr "Frasalaluan WEP 128-bit"
 msgid "Sh_ow passphrase"
 msgstr "_Tunjuk katalaluan"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Sijil C_A"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4530,7 +5046,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_dentiti:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4570,15 +5086,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Pengesahan:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_Katalaluan Kunci Persendirian:"
@@ -4588,33 +5104,33 @@ msgstr "_Katalaluan Kunci Persendirian:"
 msgid "_Type"
 msgstr "_Jenis:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4644,329 +5160,17 @@ msgstr "T_unjuk Kunci"
 msgid "WEP inde_x"
 msgstr "Inde_x WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Sijil C_A"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Pilih sijil peribadi anda..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "_Kekunci peribadi"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Katalaluan Kunci Persendirian:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Pilih sijil peribadi anda..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Sijil pengesahan pengguna:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Negara saya tidak tersenarai"
-
-#~ msgid "Unlisted"
-#~ msgstr "Tidak tersenarai"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Plan saya tidak disenaraikan..."
-
-#~ msgid "Provider"
-#~ msgstr "Pengendali"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Terpasang peranti GSM"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Terpasang peranti CDMA"
-
-#~ msgid "Any device"
-#~ msgstr "Mana-mana peranti"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Sambungan Baharu Jalurlebar Mudahalih"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Pembantu ini membantu anda untuk menetapkan sambungan broadban mudah alih "
-#~ "ke rangkaian selular (3G)."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Anda akan memerlukan maklumat berikut:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Nama pembekal jalurlebar anda"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Nama pelan bil jalurlebar anda"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(dalam sesetengah kes) Pelan bil APN (Access Point Name) jalurlebar anda"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Cipta satu sambungan untuk peranti jalurlebar mudah alih _ini:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Tetapkan satu Sambungan Jalurlebar"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Negara atau kawasan"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Plih Negara Pembekal anda atau Kawasan"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Pilih pembekal anda dari _senarai:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "Saya tidak menjumpai nama pembekal saya dan memilih untuk memasukkannya "
-#~ "secara _manual:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Pembekal saya menggunakan teknoloji GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Pembekal saya menggunakan teknoloji CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Pilih pengendali anda"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Pilih plan anda:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Memilih pelan _APN (Access Point Name):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Amaran: Memilih plan yang salah boleh menyebabkan masalah bil akaun jalur "
-#~ "lebar atau menghalang sambungan .\n"
-#~ "\n"
-#~ "Jika anda tidak pasti sila tanya pembekal plan APN anda."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Pilih Pelan Bil Anda"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Sambungan jalurlebar mudahalih anda dikonfigurasi dengan tetapan-tetapan "
-#~ "berikut:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Peranti Anda:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Pengendali Anda:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Plan Anda:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Sambungan kini akan dibuat kepada pembekal jalur lebar mudah alih anda "
-#~ "menggunakan tetapan yang anda pilih. Jika sambungan gagal atau anda tidak "
-#~ "boleh mengakses sumber-sumber rangkaian, periksa tetapan anda. Untuk "
-#~ "mengubah suai tetapan sambungan jalur lebar mudah alih anda, pilih "
-#~ "\"Sambungan Rangkaian \" daripada Sistem>> Pilihan menu."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Sahkan Tetapan Jalurlebar Mudahalih"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(tiada)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Sijil C_A"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Tidak diketahui"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Pilih sijil peribadi anda..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Sijil pengesahan pengguna:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Ralat semasa menyunting sambungan"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "Buka k_unci"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "_Tanya kata laluan ini setiap kali"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Kata laluan diperlukan untuk sambung ke '%s'."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "_Tunjuk katalaluan"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Katalaluan:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Katalaluan:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Katalaluan:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Putuskan"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Tiada"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP (802.1X) Dinamik"
-
-#~ msgid "C_reate"
-#~ msgstr "C_ipta"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Kata laluan atau kunci penyulitan diperlukan untuk mengakses rangkaian "
-#~ "tanpa wayar '% s'."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Pengesahan Rangkaian Wayarles Diperlukan"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Pengesahan diperlukan oleh rangkaian wayarles"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Cipta Sambungan Wayarles Baharu"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Rangkaian wayarles baharu"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Masukkan nama untuk rangkaian wayarles yang anda mahu buat."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Sambung ke Rangkaian Wayarles Tersembunyi"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Rangkaian wayarles tersembunyi"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Masukkan nama dan perincian keselamatan rangkaian tanpa wayar yang "
-#~ "tersembunyi yang anda ingin sambungkan ke."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Sekuriti _wayarles"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "S_ambungan:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Penyesuai w_ayarles:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "Saya tidak menjumpai nama pembekal saya dan memilih untuk memasukkannya "
-#~ "secara _manual:"
-
-#~ msgid "Provider:"
-#~ msgstr "Pengendali:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Senarai Negara atau Kawasan:"
-
-#~ msgid "Country or region"
-#~ msgstr "Negara atau kawasan"
-
-#~ msgid "Wired"
-#~ msgstr "Berwayar"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Sekuriti _wayarles"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nama Rangkain:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "S_ambungan:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Penyesuai w_ayarles:"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "1 (Piawai)"
diff --git a/po/nb.po b/po/nb.po
index c6c5bbc9..711d3e04 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager 1.1.x\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2015-02-11 19:39+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
@@ -20,6 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Nettverk"
 
@@ -215,15 +216,19 @@ msgstr "802.1X-autentisering"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "K_oble til"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Nettverksnavn:"
@@ -576,7 +581,7 @@ msgstr "Mobilt bredbånd (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobilt bredbånd"
 
@@ -698,7 +703,9 @@ msgstr "DSL-autentisering"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -804,6 +811,7 @@ msgid "Error displaying connection information:"
 msgstr "Feil under visning av tilkoblingsinformasjon:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -953,7 +961,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Passord:"
@@ -978,7 +986,8 @@ msgstr "VPN-topptekst"
 msgid "Base Connection"
 msgstr "Grunntilkobling"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -1747,6 +1756,7 @@ msgid "_Service"
 msgstr "Tjene_ste:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2407,6 +2417,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Tillat _roaming hvis hjemmenettverk ikke er tilgjengelig"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Vis passord"
 
@@ -2811,13 +2822,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3142,12 +3154,12 @@ msgstr ""
 "for noen metoder."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3157,22 +3169,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Koble sammen"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Bro"
 
@@ -3470,6 +3485,7 @@ msgid "Select a connection to delete"
 msgstr "DSL-tilkobling %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Navn"
 
@@ -3692,6 +3708,8 @@ msgstr "Ethernet-tilkobling %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Forvalg"
 
@@ -3922,35 +3940,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Min tilbyder bruker C_DMA-basert teknologi (f.eks 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4118,10 +4136,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi-tilkobling %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit nøkkel (Heksadesimal eller ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit passord"
 
@@ -4130,14 +4150,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamisk WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 personlig"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 personlig"
@@ -4214,6 +4237,484 @@ msgstr "Tilkoblingsinformasjon"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "CA-sertifikat k_reves ikke"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Velg ditt personlige sertifikat …"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Privat nø_kkel:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Passord for _privat nøkkel:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Velg ditt personlige sertifikat …"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Br_ukersertifikat:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Landet mitt er ikke på listen"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Ikke listet"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Min plan er ikke på listen …"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Tilbyder"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Installert GSM-enhet"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Installert CDMA-enhet"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Enhver enhet"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Ny mobil bredbåndstilkobling"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Denne assistenten hjelper deg å sette opp en mobil bredbåndstilkobling til "
+"et mobilnettverk (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Du trenger følgende informasjon:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Navnet på din bredbåndstilbyder"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Navn på betalingsplan for bredbånd"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(i enkelte tilfeller) APN (navn på aksesspunkt) for din betalingsplan for "
+"bredbånd"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Lag en tilkobling for _denne mobile bredbåndsenheten:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Sett opp en mobil bredbåndstilkobling"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land eller region"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Velg din tilbyders land eller region"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Velg din tilbyder fra en _liste:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Jeg kan ikke finne min tilbyder og ønsker å oppgi denne _manuelt:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Min tilbyder bruker GSM-teknologi (GPRS, EDGE, UMTS, HSDPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Min tilbyder bruker CDMA-teknologi (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Velg din tilbyder"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Velg din plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Navn på aksesspunkt) for valgt plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Advarsel: Hvis du velger feil plan kan dette resultere i ekstra utgifter på "
+"din bredbåndskonto eller forhindre tilkobling.\n"
+"\n"
+"Spør tilbyder om APN for ditt abonnement hvis du er usikker."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Velg din betalingsplan"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Din mobile bredbåndstilkobling er konfigurert med følgende innstillinger:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Din enhet:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Din tilbyder:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Din plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"En tilkobling til din bredbåndsleverandør for mobil blir nå satt opp med "
+"innstillingene du valgte. Hvis tilkoblingen feiler eller hvis du ikke får "
+"tilgang til nettverksressurser må du dobbeltsjekke innstillingene. For å "
+"endre dine innstillinger for mobil bredbåndstilkobling kan du velge "
+"«Nettverkstilkoblinger» fra menyen System->Brukervalg."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Bekreft innstillinger for mobilt bredbånd"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ingen)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A-sertifikat:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Ukjent"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Velg ditt personlige sertifikat …"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Br_ukersertifikat:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Feil under redigering av tilkobling"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "Lås _opp"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "Lagre passordet kun for denne br_ukeren"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "Lagre passordet for _alle brukere"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "Spør om dette passordet _hver gang"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Et passord kreves for å koble til «%s»."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Vis pass_ord"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Sekundært passord:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Sekundært passord:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Passord:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Koble fra"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ingen"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamisk WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Lag"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Passord eller krypteringsnøkler er nødvendig for å koble til Wi-Fi-nettverk "
+"«%s»."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Autentisering for Wi-Fi-nettverk kreves"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Autentisering kreves av Wi-Fi-nettverk"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Lag et nytt Wi-Fi-nettverk"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nytt Wi-Fi-nettverk"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Oppgi et navn på Wi-Fi-nettverket du ønsker å opprette."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Koble til skjult Wi-Fi-nettverk"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Skjult Wi-Fi-nettverk"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Oppgi navnet til det skjulte Wi-Fi-nettverket du ønsker å koble deg til."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi-_sikkerhet:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Tilkobli_ng:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi-_kort:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Jeg kan ikke finne min tilbyder og ønsker å oppgi denne _manuelt:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Tilbyder:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Liste med land eller regioner:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Land eller region"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Kablet"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi-_sikkerhet:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nettverksnavn:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Tilkobli_ng:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi-_kort:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Bruk:"
@@ -4364,26 +4865,26 @@ msgstr "CA-sertifikat k_reves ikke"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Velg en PAC-fil …"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Alle filer"
 
@@ -4422,16 +4923,16 @@ msgstr "_Indre autentisering:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillat automatisk PAC-pro_visjonering"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4467,15 +4968,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4489,24 +4990,24 @@ msgstr "WEP 128-bit passord"
 msgid "Sh_ow passphrase"
 msgstr "Vis pass_ord"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA-sertifikat k_reves ikke"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4515,7 +5016,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_dentitet:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4555,15 +5056,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Au_tentisering:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Passord for _privat nøkkel:"
@@ -4573,33 +5074,33 @@ msgstr "Passord for _privat nøkkel:"
 msgid "_Type"
 msgstr "_Type:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4629,337 +5130,17 @@ msgstr "_Vis nøkkel"
 msgid "WEP inde_x"
 msgstr "WEP-inde_ks:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "CA-sertifikat k_reves ikke"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Velg ditt personlige sertifikat …"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Privat nø_kkel:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Passord for _privat nøkkel:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Velg ditt personlige sertifikat …"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Br_ukersertifikat:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Landet mitt er ikke på listen"
-
-#~ msgid "Unlisted"
-#~ msgstr "Ikke listet"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Min plan er ikke på listen …"
-
-#~ msgid "Provider"
-#~ msgstr "Tilbyder"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Installert GSM-enhet"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Installert CDMA-enhet"
-
-#~ msgid "Any device"
-#~ msgstr "Enhver enhet"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Ny mobil bredbåndstilkobling"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Denne assistenten hjelper deg å sette opp en mobil bredbåndstilkobling "
-#~ "til et mobilnettverk (3G)."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Du trenger følgende informasjon:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Navnet på din bredbåndstilbyder"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Navn på betalingsplan for bredbånd"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(i enkelte tilfeller) APN (navn på aksesspunkt) for din betalingsplan for "
-#~ "bredbånd"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Lag en tilkobling for _denne mobile bredbåndsenheten:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Sett opp en mobil bredbåndstilkobling"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Land eller region"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Velg din tilbyders land eller region"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Velg din tilbyder fra en _liste:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Jeg kan ikke finne min tilbyder og ønsker å oppgi denne _manuelt:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Min tilbyder bruker GSM-teknologi (GPRS, EDGE, UMTS, HSDPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Min tilbyder bruker CDMA-teknologi (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Velg din tilbyder"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Velg din plan:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "_APN (Navn på aksesspunkt) for valgt plan:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Advarsel: Hvis du velger feil plan kan dette resultere i ekstra utgifter "
-#~ "på din bredbåndskonto eller forhindre tilkobling.\n"
-#~ "\n"
-#~ "Spør tilbyder om APN for ditt abonnement hvis du er usikker."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Velg din betalingsplan"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Din mobile bredbåndstilkobling er konfigurert med følgende innstillinger:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Din enhet:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Din tilbyder:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Din plan:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "En tilkobling til din bredbåndsleverandør for mobil blir nå satt opp med "
-#~ "innstillingene du valgte. Hvis tilkoblingen feiler eller hvis du ikke får "
-#~ "tilgang til nettverksressurser må du dobbeltsjekke innstillingene. For å "
-#~ "endre dine innstillinger for mobil bredbåndstilkobling kan du velge "
-#~ "«Nettverkstilkoblinger» fra menyen System->Brukervalg."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Bekreft innstillinger for mobilt bredbånd"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(ingen)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "C_A-sertifikat:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Ukjent"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Velg ditt personlige sertifikat …"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Br_ukersertifikat:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Feil under redigering av tilkobling"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "Lås _opp"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "Lagre passordet kun for denne br_ukeren"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "Lagre passordet for _alle brukere"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "Spør om dette passordet _hver gang"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Et passord kreves for å koble til «%s»."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Vis pass_ord"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Sekundært passord:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Sekundært passord:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Passord:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Koble fra"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Ingen"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynamisk WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Lag"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Passord eller krypteringsnøkler er nødvendig for å koble til Wi-Fi-"
-#~ "nettverk «%s»."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Autentisering for Wi-Fi-nettverk kreves"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Autentisering kreves av Wi-Fi-nettverk"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Lag et nytt Wi-Fi-nettverk"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nytt Wi-Fi-nettverk"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Oppgi et navn på Wi-Fi-nettverket du ønsker å opprette."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Koble til skjult Wi-Fi-nettverk"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Skjult Wi-Fi-nettverk"
-
-#~ 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."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wi-Fi-_sikkerhet:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Tilkobli_ng:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-Fi-_kort:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Jeg kan ikke finne min tilbyder og ønsker å oppgi denne _manuelt:"
-
-#~ msgid "Provider:"
-#~ msgstr "Tilbyder:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Liste med land eller regioner:"
-
-#~ msgid "Country or region"
-#~ msgstr "Land eller region"
-
-#~ msgid "Wired"
-#~ msgstr "Kablet"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wi-Fi-_sikkerhet:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nettverksnavn:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Tilkobli_ng:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-Fi-_kort:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (forvalg)"
 
diff --git a/po/ne.po b/po/ne.po
index de179e7e..7dcd5647 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet.network-manager-applet-0-6.ne\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2007-11-13 20:36+0545\n"
 "Last-Translator: Shyam Krishna Bal <shyamkrishna_bal yahoo com>\n"
 "Language-Team: Nepali <info mpp org np>\n"
@@ -21,6 +21,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 #, fuzzy
 msgid "Network"
 msgstr "सञ्जाल नाम:"
@@ -205,15 +206,19 @@ msgstr "प्रमाणीकरण:"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "जडान गर्नुहोस्"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "सञ्जाल नाम:"
@@ -550,7 +555,7 @@ msgstr ""
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr ""
 
@@ -680,7 +685,9 @@ msgstr "प्रमाणीकरण:"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -791,6 +798,7 @@ msgid "Error displaying connection information:"
 msgstr "जडान जानकारी प्रदर्शन गर्दा त्रुटि:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr ""
@@ -940,7 +948,7 @@ msgstr ""
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "पासवर्ड:"
@@ -968,7 +976,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "भीपीएन जडान"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr ""
 
@@ -1697,6 +1706,7 @@ msgid "_Service"
 msgstr ""
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2322,6 +2332,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr ""
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 #, fuzzy
 msgid "Sho_w passwords"
 msgstr "पासवर्ड देखाउनुहोस्"
@@ -2718,13 +2729,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3038,12 +3050,12 @@ msgid ""
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3053,22 +3065,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3361,6 +3376,7 @@ msgid "Select a connection to delete"
 msgstr "'%s' लाई भीपीएन जडान"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
@@ -3581,6 +3597,8 @@ msgstr "तारसहित सञ्जाल जडान"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 #, fuzzy
 msgid "Default"
 msgstr "पूर्वनिर्धारित राउट:"
@@ -3800,37 +3818,37 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 #, fuzzy
 msgid "CHAP"
 msgstr "MSCHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 #, fuzzy
 msgid "MSCHAPv2"
 msgstr "MSCHAPV2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3983,11 +4001,13 @@ msgid "Wi-Fi connection %d"
 msgstr "'%s' लाई भीपीएन जडान"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 64/128-bit ASCII"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit पासफ्रेज"
 
@@ -3997,16 +4017,19 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "गतिशील WEP"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "WPA & WPA2 Personal"
 msgstr "WPA2 व्यक्तिगत"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 #, fuzzy
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA2 उद्यमशिलता"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA व्यक्तिगत"
@@ -4080,6 +4103,467 @@ msgstr "जडान जानकारी"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "सीए प्रमाणपत्र फाइल:"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "निजी कुञ्जी फाइल:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "निजी कुञ्जी पासवर्ड:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "सीए प्रमाणपत्र फाइल:"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "सीए प्रमाणपत्र फाइल:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr ""
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr ""
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "कुनै पनि होइन"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "सीए प्रमाणपत्र फाइल:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "सीए प्रमाणपत्र फाइल:"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "सीए प्रमाणपत्र फाइल:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "जडान जानकारी प्रदर्शन गर्दा त्रुटि:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "पासवर्ड देखाउनुहोस्"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "निजी कुञ्जी पासवर्ड:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "गौण डीएनएस:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+#, fuzzy
+msgid "_Password:"
+msgstr "पासवर्ड:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "तारसहित सञ्जाल जडान"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "कुनै पनि होइन"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "गतिशील WEP"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "ताररहित सञ्जाल कुञ्जी चाहियो"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "तपाईँले जडान गर्न चाहनुभएको ताररहित सञ्जालको नाम प्रविष्ट गर्नुहोस् ।"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "अन्य ताररहित सञ्जालमा जडान गर्नुहोस्"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"तपाईँले सिर्जना गर्न चाहनुभएको ताररहित सञ्जालको नाम र सुरक्षा सेटिङ प्रविष्ट गर्नुहोस् ।"
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "ताररहित सुरक्षा:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "जडान गर्नुहोस्"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "ताररहित एडप्टर:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "ताररहित सुरक्षा:"
+
+#: src/libnm-gtk/wifi.ui:129
+#, fuzzy
+msgid "_Network name:"
+msgstr "सञ्जाल नाम:"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "जडान गर्नुहोस्"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "ताररहित एडप्टर:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr ""
@@ -4228,25 +4712,25 @@ msgstr "सीए प्रमाणपत्र फाइल:"
 msgid "selected CA certificate file does not exist"
 msgstr "सीए प्रमाणपत्र फाइल चयन गर्नुहोस्"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4286,16 +4770,16 @@ msgstr "प्रमाणीकरण:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr ""
@@ -4331,15 +4815,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4353,24 +4837,24 @@ msgstr "WEP 128-bit पासफ्रेज"
 msgid "Sh_ow passphrase"
 msgstr "पासफ्रेज देखाउनुहोस्"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4379,7 +4863,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "पहिचान:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPV2"
@@ -4419,15 +4903,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "प्रमाणीकरण:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "निजी कुञ्जी पासवर्ड:"
@@ -4437,33 +4921,33 @@ msgstr "निजी कुञ्जी पासवर्ड:"
 msgid "_Type"
 msgstr "प्रकार:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4494,137 +4978,17 @@ msgstr "कुञ्जी देखाउनुहोस्"
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "सीए प्रमाणपत्र फाइल:"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "निजी कुञ्जी फाइल:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "निजी कुञ्जी पासवर्ड:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "सीए प्रमाणपत्र फाइल:"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "सीए प्रमाणपत्र फाइल:"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "कुनै पनि होइन"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "सीए प्रमाणपत्र फाइल:"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "सीए प्रमाणपत्र फाइल:"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "सीए प्रमाणपत्र फाइल:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "जडान जानकारी प्रदर्शन गर्दा त्रुटि:"
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "पासवर्ड देखाउनुहोस्"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "निजी कुञ्जी पासवर्ड:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "गौण डीएनएस:"
-
-#, fuzzy
-#~ msgid "_Password:"
-#~ msgstr "पासवर्ड:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "तारसहित सञ्जाल जडान"
-
-#, fuzzy
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "कुनै पनि होइन"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "गतिशील WEP"
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "ताररहित सञ्जाल कुञ्जी चाहियो"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "तपाईँले जडान गर्न चाहनुभएको ताररहित सञ्जालको नाम प्रविष्ट गर्नुहोस् ।"
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "अन्य ताररहित सञ्जालमा जडान गर्नुहोस्"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "तपाईँले सिर्जना गर्न चाहनुभएको ताररहित सञ्जालको नाम र सुरक्षा सेटिङ प्रविष्ट गर्नुहोस् ।"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "ताररहित सुरक्षा:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "जडान गर्नुहोस्"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "ताररहित एडप्टर:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "ताररहित सुरक्षा:"
-
-#, fuzzy
-#~ msgid "_Network name:"
-#~ msgstr "सञ्जाल नाम:"
-
-#, fuzzy
-#~ msgid "C_onnection:"
-#~ msgstr "जडान गर्नुहोस्"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "ताररहित एडप्टर:"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "कुनै पनि होइन (पूर्वानिर्धारित)"
diff --git a/po/nl.po b/po/nl.po
index 4da5c86e..3bc55e0a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2019-03-04 16:37+0100\n"
 "Last-Translator: Nathan Follens <nthn unseen is>\n"
 "Language-Team: Dutch <gnome-nl-list gnome org>\n"
@@ -28,6 +28,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Netwerk"
 
@@ -234,15 +235,19 @@ msgstr "802.1X-authenticatie"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Netwerknaam"
 
@@ -607,7 +612,7 @@ msgstr "Mobiel breedband (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobiel breedband"
 
@@ -738,7 +743,9 @@ msgstr "DSL-authenticatie"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_Oké"
 
@@ -850,6 +857,7 @@ msgid "Error displaying connection information:"
 msgstr "Fout bij weergeven van verbindingsinformatie:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -999,7 +1007,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Hotspot"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Wachtwoord:"
@@ -1024,7 +1032,8 @@ msgstr "VPN-banier"
 msgid "Base Connection"
 msgstr "Basisverbinding"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -1795,6 +1804,7 @@ msgid "_Service"
 msgstr "_Dienst"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2472,6 +2482,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Sta _roaming (gastgebruik) toe indien thuisnetwerk niet beschikbaar is"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Wachtwoorden _tonen"
 
@@ -2889,13 +2900,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3225,12 +3237,12 @@ msgstr ""
 "kunt u proberen de ondersteuning voor bepaalde methodes uit te schakelen."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wifi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3240,22 +3252,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Gebundeld"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Team"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Bridge"
 
@@ -3546,6 +3561,7 @@ msgid "Select a connection to delete"
 msgstr "Een te verwijderen verbinding selecteren"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Naam"
 
@@ -3762,6 +3778,8 @@ msgstr "Ethernetverbinding %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Standaard"
 
@@ -3992,35 +4010,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Mijn provider gebruikt C_DMA-technologie (bijv. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4181,10 +4199,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wifi-verbinding %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit sleutel (Hex or ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit wachtwoordzin"
 
@@ -4193,14 +4213,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamisch WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 persoonlijk"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 zakelijk"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 persoonlijk"
@@ -4280,6 +4303,479 @@ msgstr "Verbindingsinformatie"
 msgid "_Close"
 msgstr "_Sluiten"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Geen certificaat ingesteld"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Geen sleutel ingesteld"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Kies een sleutel voor certificaat %s"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "%s privé_sleutel"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "Wa _chtwoord %s sleutel"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Kies een %s certificaat"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "%s _certificaat"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Mijn land komt niet in de lijst voor"
+
+# komt niet in de lijst voor/onbekend/niet in de lijst
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Niet in de lijst"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Mijn abonnement komt niet in de lijst voor…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Provider"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "GSM-apparaat geïnstalleerd"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "CDMA-apparaat geïnstalleerd"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Elk apparaat"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nieuwe mobiele breedbandverbinding"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Deze assistent helpt u bij het opzetten van een mobiele breedbandverbinding "
+"via een mobiel (3G) netwerk."
+
+# informatie/gegevens
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "U heeft de volgende gegevens nodig:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "De naam van uw breedband-provider"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "De naam van uw breedband-abonnement"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(in sommige gevallen) De naam van het APN (Access Point Name) voor uw "
+"abonnement"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Een verbinding _aanmaken voor dit mobiele breedbandapparaat:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Een mobiele breedbandverbinding instellen"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land of regio"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Kies het land of de regio van uw provider"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Selecteer uw provider uit de _lijst:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"Ik kan mijn provider niet vinden en wil de verbinding hand_matig invoeren:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Mijn provider gebruikt GSM-technologie (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Mijn provider gebruikt CDMA-technologie (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Kies uw provider"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Selecteer uw abonnement:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Geselecteerd abonnement _APN (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Let op: selecteren van het verkeerde abonnement kan resulteren in "
+"betalingsproblemen voor uw breedbandaccount of kan het maken van een "
+"verbinding verhinderen.\n"
+"\n"
+"Indien u niet zeker weet welk abonnement u heeft, neem dan contact op met uw "
+"internetaanbieder en vraag naar de APN (naam van Access Point) van uw "
+"abonnement."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Kies uw abonnement"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Uw mobiele breedbandverbinding is geconfigureerd met de volgende "
+"instellingen:"
+
+# dienst/service
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Uw apparaat:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Uw provider:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Uw abonnement:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Er wordt nu een verbinding gemaakt met het mobiele breedbandnetwerk van uw "
+"provider, gebruikmakend van de door u geselecteerde instellingen. Als er "
+"geen verbinding gemaakt kan worden, controleer uw instellingen dan nogmaals. "
+"Om uw instellingen te wijzigen kiest u ‘Netwerkverbindingen’ in het menu."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Mobiele breedbandinstellingen bevestigen"
+
+# niets/geen
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Geen)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Sleutel in %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificaat in %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Onbekend)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Selecteren"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Uit bestand selecteren…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Kies een %s certificaat"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "Wa_chtwoord %s certificaat"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Fout bij het aanmelden: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Fout bij het openen van een sessie: "
+
+# openen/ontgrendelen
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "Token _ontgrendelen"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Uitgegeven door"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Voer pincode in voor %s"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Aanmelden"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "Pincode _onthouden"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Wachtwoord alleen voor deze gebruiker opslaan"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Wachtwoord alleen voor alle gebruikers opslaan"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Elke keer naar dit wachtwoord vragen"
+
+# om een verbinding te maken met/voor het verbinden met
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Het wachtwoord is niet vereist"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Wachtwoorden _tonen"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Derde wachtwoord:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Tweede wachtwoord:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Wachtwoord:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Klikken om te verbinden"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Nieuw…"
+
+# zonder/geen
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Geen"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamisch WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Aanmaken"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Wachtwoorden of encryptiesleutels zijn vereist om toegang te krijgen tot het "
+"wifi-netwerk ‘%s’."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Authenticatie wifi-netwerk vereist"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Het wifi-netwerk vereist authenticatie"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Nieuw wifi-netwerk aanmaken"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nieuw wifi-netwerk"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+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/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Verbinden met verborgen wifi-netwerk"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Verborgen wifi-netwerk"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Voer de naam en de beveiligingsgegevens in van het verborgen wifi-netwerk "
+"waarmee u wilt verbinden."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Wifi-_beveiliging"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "_Verbinding"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Wifi-_adapter"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Ik kan mijn provider niet vinden en wil het hand_matig invoeren:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Provider:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Lijst voor land of regio:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Land of regio"
+
+# kabeldraad/bekabeld/bedraad/draad
+# dit is de titel van het tabblad:
+# wired/wireless/VPN/GSM
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Kabel"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC-mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Of er ontbreekt een wachtwoord, of de verbinding is ongeldig. In het laatste "
+"geval dient u eerst de verbinding te bewerken met nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wifi-_beveiliging:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Netwerknaam:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Verbinding:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wifi-_adapter:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Gebruik:"
@@ -4431,25 +4927,25 @@ msgstr "geen CA-certificaat geselecteerd"
 msgid "selected CA certificate file does not exist"
 msgstr "het geselecteerde CA-certificaatbestand bestaat niet"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "ontbrekend EAP-FAST PAC-bestand"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Kies een PAC-bestand"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-bestanden (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Alle bestanden"
 
@@ -4485,16 +4981,16 @@ msgstr "_Interne authenticatie"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Automatische PAC-aanlevering _toestaan"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "ontbrekende EAP-LEAP-gebruikersnaam"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "ontbrekend EAP-LEAP-wachtwoord"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4529,15 +5025,15 @@ msgstr "Suffix van de naam van het servercertificaat."
 msgid "_Domain"
 msgstr "_Domein"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "ontbrekende EAP-gebruikersnaam"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "ontbrekend EAP-wachtwoord"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "wachtwoord voor privésleutel van EAP-cliënt ontbreekt"
 
@@ -4549,23 +5045,23 @@ msgstr "Wachtwoord van privésleutel"
 msgid "Sh_ow passphrase"
 msgstr "Wachtwoord _tonen"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "ontbrekende EAP-TLS-identiteit"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "geen gebruikerscertificaat geselecteerd"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "geselecteerd gebruikerscertificaatbestand bestaat niet"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "geen sleutel geselecteerd"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "geselecteerde sleutelbestand bestaat niet"
 
@@ -4573,7 +5069,7 @@ msgstr "geselecteerde sleutelbestand bestaat niet"
 msgid "I_dentity"
 msgstr "I_dentiteit"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (geen EAP)"
 
@@ -4611,15 +5107,15 @@ msgstr "Extern ingesteld"
 msgid "Au_thentication"
 msgstr "Au_thenticatie"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "ontbrekende leap-gebruikersnaam"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "ontbrekend leap-wachtwoord"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "ontbrekend EAP-wachtwoord"
@@ -4628,18 +5124,18 @@ msgstr "ontbrekend EAP-wachtwoord"
 msgid "_Type"
 msgstr "_Type"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "ontbrekende wep-sleutel"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4647,7 +5143,7 @@ msgstr ""
 "ongeldige wep-sleutel: sleutel met een lengte van %zu mag alleen ascii-"
 "tekens bevatten"
 
-#: src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4656,11 +5152,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "ongeldige wep-sleutel: wachtwoordzin moet minder dan 64 tekens ziijn"
 
@@ -4688,7 +5184,7 @@ msgstr "Sleutel _tonen"
 msgid "WEP inde_x"
 msgstr "WEP-inde_x"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4697,369 +5193,12 @@ msgstr ""
 "ongeldige wpa-psk: ongeldige sleutellengte %zu. Moet [8,63] bytes of 64 hex-"
 "cijfers zijn"
 
-#: src/wireless-security/ws-wpa-psk.c:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
 
-#~ msgid "No certificate set"
-#~ msgstr "Geen certificaat ingesteld"
-
-#~ msgid "No key set"
-#~ msgstr "Geen sleutel ingesteld"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Kies een sleutel voor certificaat %s"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "%s privé_sleutel"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Wa _chtwoord %s sleutel"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Kies een %s certificaat"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s _certificaat"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Mijn land komt niet in de lijst voor"
-
-# komt niet in de lijst voor/onbekend/niet in de lijst
-#~ msgid "Unlisted"
-#~ msgstr "Niet in de lijst"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Mijn abonnement komt niet in de lijst voor…"
-
-#~ msgid "Provider"
-#~ msgstr "Provider"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "GSM-apparaat geïnstalleerd"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "CDMA-apparaat geïnstalleerd"
-
-#~ msgid "Any device"
-#~ msgstr "Elk apparaat"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nieuwe mobiele breedbandverbinding"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Deze assistent helpt u bij het opzetten van een mobiele "
-#~ "breedbandverbinding via een mobiel (3G) netwerk."
-
-# informatie/gegevens
-#~ msgid "You will need the following information:"
-#~ msgstr "U heeft de volgende gegevens nodig:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "De naam van uw breedband-provider"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "De naam van uw breedband-abonnement"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(in sommige gevallen) De naam van het APN (Access Point Name) voor uw "
-#~ "abonnement"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Een verbinding _aanmaken voor dit mobiele breedbandapparaat:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Een mobiele breedbandverbinding instellen"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Land of regio"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Kies het land of de regio van uw provider"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Selecteer uw provider uit de _lijst:"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "Ik kan mijn provider niet vinden en wil de verbinding hand_matig invoeren:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Mijn provider gebruikt GSM-technologie (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Mijn provider gebruikt CDMA-technologie (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Kies uw provider"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Selecteer uw abonnement:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Geselecteerd abonnement _APN (Access Point Name):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Let op: selecteren van het verkeerde abonnement kan resulteren in "
-#~ "betalingsproblemen voor uw breedbandaccount of kan het maken van een "
-#~ "verbinding verhinderen.\n"
-#~ "\n"
-#~ "Indien u niet zeker weet welk abonnement u heeft, neem dan contact op met "
-#~ "uw internetaanbieder en vraag naar de APN (naam van Access Point) van uw "
-#~ "abonnement."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Kies uw abonnement"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Uw mobiele breedbandverbinding is geconfigureerd met de volgende "
-#~ "instellingen:"
-
-# dienst/service
-#~ msgid "Your Device:"
-#~ msgstr "Uw apparaat:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Uw provider:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Uw abonnement:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Er wordt nu een verbinding gemaakt met het mobiele breedbandnetwerk van "
-#~ "uw provider, gebruikmakend van de door u geselecteerde instellingen. Als "
-#~ "er geen verbinding gemaakt kan worden, controleer uw instellingen dan "
-#~ "nogmaals. Om uw instellingen te wijzigen kiest u ‘Netwerkverbindingen’ in "
-#~ "het menu."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Mobiele breedbandinstellingen bevestigen"
-
-# niets/geen
-#~ msgid "(None)"
-#~ msgstr "(Geen)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Sleutel in %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certificaat in %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Onbekend)"
-
-#~ msgid "Select"
-#~ msgstr "Selecteren"
-
-#~ msgid "Cancel"
-#~ msgstr "Annuleren"
-
-#~ msgid "Select from file…"
-#~ msgstr "Uit bestand selecteren…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Kies een %s certificaat"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Wa_chtwoord %s certificaat"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Fout bij het aanmelden: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Fout bij het openen van een sessie: "
-
-# openen/ontgrendelen
-#~ msgid "_Unlock token"
-#~ msgstr "Token _ontgrendelen"
-
-#~ msgid "Issued By"
-#~ msgstr "Uitgegeven door"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Voer pincode in voor %s"
-
-#~ msgid "_Login"
-#~ msgstr "_Aanmelden"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "Pincode _onthouden"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Wachtwoord alleen voor deze gebruiker opslaan"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Wachtwoord alleen voor alle gebruikers opslaan"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Elke keer naar dit wachtwoord vragen"
-
-# om een verbinding te maken met/voor het verbinden met
-#~ msgid "The password is not required"
-#~ msgstr "Het wachtwoord is niet vereist"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Wachtwoorden _tonen"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Derde wachtwoord:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Tweede wachtwoord:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Wachtwoord:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Klikken om te verbinden"
-
-#~ msgid "New…"
-#~ msgstr "Nieuw…"
-
-# zonder/geen
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Geen"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynamisch WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Aanmaken"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Wachtwoorden of encryptiesleutels zijn vereist om toegang te krijgen tot "
-#~ "het wifi-netwerk ‘%s’."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Authenticatie wifi-netwerk vereist"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Het wifi-netwerk vereist authenticatie"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Nieuw wifi-netwerk aanmaken"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nieuw wifi-netwerk"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Verbinden met verborgen wifi-netwerk"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Verborgen wifi-netwerk"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Voer de naam en de beveiligingsgegevens in van het verborgen wifi-netwerk "
-#~ "waarmee u wilt verbinden."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wifi-_beveiliging"
-
-#~ msgid "C_onnection"
-#~ msgstr "_Verbinding"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wifi-_adapter"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Ik kan mijn provider niet vinden en wil het hand_matig invoeren:"
-
-#~ msgid "Provider:"
-#~ msgstr "Provider:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Lijst voor land of regio:"
-
-#~ msgid "Country or region"
-#~ msgstr "Land of regio"
-
-# kabeldraad/bekabeld/bedraad/draad
-# dit is de titel van het tabblad:
-# wired/wireless/VPN/GSM
-#~ msgid "Wired"
-#~ msgstr "Kabel"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC-mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Of er ontbreekt een wachtwoord, of de verbinding is ongeldig. In het "
-#~ "laatste geval dient u eerst de verbinding te bewerken met nm-connection-"
-#~ "editor"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wifi-_beveiliging:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Netwerknaam:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "_Verbinding:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wifi-_adapter:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/nn.po b/po/nn.po
index b2292b94..1baab923 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager 0.1.x\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2012-05-08 10:24+0200\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds ulrik uio no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-no lister ping uio no>\n"
@@ -23,6 +23,7 @@ msgstr ""
 "X-Generator: Lokalize 1.4\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Nettverk"
 
@@ -216,15 +217,19 @@ msgstr "Kabla 802.1X-autentisering"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "K_oble til"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Nettverksnamn:"
@@ -580,7 +585,7 @@ msgstr "Mobilt breiband (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobilt breiband"
 
@@ -708,7 +713,9 @@ msgstr "DSL autentisering"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -819,6 +826,7 @@ msgid "Error displaying connection information:"
 msgstr "Feil under vising av tilkoplingsinformasjon:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -970,7 +978,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Passord:"
@@ -995,7 +1003,8 @@ msgstr "VPN-topptekst"
 msgid "Base Connection"
 msgstr "Grunntilkopling"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Ukjend"
 
@@ -1748,6 +1757,7 @@ msgid "_Service"
 msgstr "Tene_ste:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2404,6 +2414,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Tillat _vandring dersom heimenettverk ikkje er tilgjengeleg"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Vis passord"
 
@@ -2800,14 +2811,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "Automatisk lokalnett"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3131,12 +3143,12 @@ msgstr ""
 "for nokre metodar."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3146,22 +3158,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3461,6 +3476,7 @@ msgid "Select a connection to delete"
 msgstr "Kabla tilkopling %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Namn"
 
@@ -3689,6 +3705,8 @@ msgstr "Kabla tilkopling %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Standard"
 
@@ -3915,35 +3933,35 @@ msgstr "Min tilbydar brukar _GSM-basert teknologi (GPRS, EDGE, UMTS, HSDPA)"
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Min tilbydar brukar C_DMA-basert teknologi (1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4110,10 +4128,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Kabla tilkopling %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-nøkkel (Heksadesimal eller ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit passfrase"
 
@@ -4122,14 +4142,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamisk WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 personleg"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 personleg"
@@ -4209,6 +4232,495 @@ msgstr "Tilkoplingsinformasjon"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "C_A-sertifikat:"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Vel ditt personlege sertifikat …"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Privat nø_kkel:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_Passord for privat nøkkel:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Vel ditt personlege sertifikat …"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Br_ukarsertifikat:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Mitt land er ikkje oppgjeve"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Ikkje lista"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Min plan er ikkje oppgjeven …"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Tilbydar"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Innstallert GSM-eining"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Installert CDMA-eining"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Eikvar eining"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Ny mobil breibandstilkopling"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Denne vegvisaren hjelper deg å setja opp ei mobil breibandstilkopling til "
+"eit 3G-nettverk."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Du treng følgjande informasjon:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Namnet på breibandtilbydaren din"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Namnet på betalingsplanen til breibandet ditt"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(i nokre tilfelle) APN-en (namnet på tilgangspunkt) til breibandet ditt sin "
+"betalingsplan"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Lag ei tilkopling for _denne mobile breibandseininga"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Set opp ei mobil breibandstilkopling"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land eller region"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Vel landet eller regionen for leverandøren din"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Vel tilbydaren din frå ei _liste:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Eg kan ikkje finna tilbydaren min og eg vil oppgje han manuelt:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Min tilbydar brukar GSM-teknologi (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Min tilbydar brukar CDMA-teknologi (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Vel tilbydaren din"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Vel planen din:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Vald plan-_APN (namn til tilgangspunkt):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Åtvaring: Å velja feil betalingsplan kan føra til at du vert trekt for feile "
+"beløp eller at du ikkje får kopla deg til.\n"
+"\n"
+"Kontakt tilbydaren din om du er usikker på kva for plan du har."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Vel betalingsplanen din"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Den mobile breibandstilkoplinga er set opp med følgjande innstillingar:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Di eining:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Din tilbydar:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Din plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Vil no kopla til ditt mobile breiband med dei innstillingane du vel. "
+"Dobbelsjekk innstillingane dine om tilkoplinga feilar eller du ikkje får "
+"tilgang til nettverksressursar. Vel «Nettverkstilkoplingar» frå «System → "
+"Nettverkstilkoplingar» for å endra innstillingane til den mobile "
+"breibandstilkoplinga di."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Stadfest innstillingar for mobilt breiband"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ingen)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A-sertifikat:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Ukjend"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Vel ditt personlege sertifikat …"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Br_ukarsertifikat:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Feil under redigering av tilkopling"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Lås opp"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "S_pør etter dette passordet kvar gong"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Passord krevst for å kopla til «%s»."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "_Vis passord"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Passord:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Passord:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Passord:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Kopla frå"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ingen"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamisk WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "L_ag"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Passord eller krypteringsnøklar er nødvendig for å kopla til det trådlause "
+"nettverket «%s»."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Autentisering for trådlaust nettverk påkravd"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "Autentisering er påkravd av det trådlause nettverket"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "Opprett nytt trådlaust nettverk"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Nytt trådlaust nettverk"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Oppgje eit namn på det trådlause nettverket du ønskjer å oppretta."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Kopla til eit gøymt trådlaust nettverk"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "Gøymt trådlaust nettverk"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Oppgje namnet og tryggleiksdetaljane til det gøymde trådlause nettverket du "
+"ynskjer å kopla til."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Tr_ådlaus tryggleik:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Tilkopli_ng:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Trådlaust _kort:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Eg kan ikkje finna tilbydaren min og eg vil oppgje han manuelt:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Tilbydar:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Liste over land eller regionar:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Land eller region"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Kabla"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "Tr_ådlaus tryggleik:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nettverksnamn:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Tilkopli_ng:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Trådlaust _kort:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Bruk:"
@@ -4361,26 +4873,26 @@ msgstr "C_A-sertifikat:"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Vel PAC-fil …"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Alle filer"
 
@@ -4419,16 +4931,16 @@ msgstr "I_ndre autentisering:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillat automatisk PAC-_tildeling"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4465,15 +4977,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4487,24 +4999,24 @@ msgstr "WEP 128-bit passfrase"
 msgid "Sh_ow passphrase"
 msgstr "_Vis passord"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "C_A-sertifikat:"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4513,7 +5025,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_dentitet:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4553,15 +5065,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Au_tentisering:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_Passord for privat nøkkel:"
@@ -4571,33 +5083,33 @@ msgstr "_Passord for privat nøkkel:"
 msgid "_Type"
 msgstr "_Type:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4627,325 +5139,17 @@ msgstr "_Vis nøkkel"
 msgid "WEP inde_x"
 msgstr "WEP-indek_s:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "C_A-sertifikat:"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Vel ditt personlege sertifikat …"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Privat nø_kkel:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Passord for privat nøkkel:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Vel ditt personlege sertifikat …"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Br_ukarsertifikat:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Mitt land er ikkje oppgjeve"
-
-#~ msgid "Unlisted"
-#~ msgstr "Ikkje lista"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Min plan er ikkje oppgjeven …"
-
-#~ msgid "Provider"
-#~ msgstr "Tilbydar"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Innstallert GSM-eining"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Installert CDMA-eining"
-
-#~ msgid "Any device"
-#~ msgstr "Eikvar eining"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Ny mobil breibandstilkopling"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Denne vegvisaren hjelper deg å setja opp ei mobil breibandstilkopling til "
-#~ "eit 3G-nettverk."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Du treng følgjande informasjon:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Namnet på breibandtilbydaren din"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Namnet på betalingsplanen til breibandet ditt"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(i nokre tilfelle) APN-en (namnet på tilgangspunkt) til breibandet ditt "
-#~ "sin betalingsplan"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Lag ei tilkopling for _denne mobile breibandseininga"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Set opp ei mobil breibandstilkopling"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Land eller region"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Vel landet eller regionen for leverandøren din"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Vel tilbydaren din frå ei _liste:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Eg kan ikkje finna tilbydaren min og eg vil oppgje han manuelt:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Min tilbydar brukar GSM-teknologi (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Min tilbydar brukar CDMA-teknologi (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Vel tilbydaren din"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Vel planen din:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Vald plan-_APN (namn til tilgangspunkt):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Åtvaring: Å velja feil betalingsplan kan føra til at du vert trekt for "
-#~ "feile beløp eller at du ikkje får kopla deg til.\n"
-#~ "\n"
-#~ "Kontakt tilbydaren din om du er usikker på kva for plan du har."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Vel betalingsplanen din"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Den mobile breibandstilkoplinga er set opp med følgjande innstillingar:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Di eining:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Din tilbydar:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Din plan:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Vil no kopla til ditt mobile breiband med dei innstillingane du vel. "
-#~ "Dobbelsjekk innstillingane dine om tilkoplinga feilar eller du ikkje får "
-#~ "tilgang til nettverksressursar. Vel «Nettverkstilkoplingar» frå «System → "
-#~ "Nettverkstilkoplingar» for å endra innstillingane til den mobile "
-#~ "breibandstilkoplinga di."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Stadfest innstillingar for mobilt breiband"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(ingen)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "C_A-sertifikat:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Ukjend"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Vel ditt personlege sertifikat …"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Br_ukarsertifikat:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Feil under redigering av tilkopling"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Lås opp"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "S_pør etter dette passordet kvar gong"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Passord krevst for å kopla til «%s»."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "_Vis passord"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Passord:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Passord:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Passord:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Kopla frå"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Ingen"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynamisk WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "L_ag"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Passord eller krypteringsnøklar er nødvendig for å kopla til det "
-#~ "trådlause nettverket «%s»."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Autentisering for trådlaust nettverk påkravd"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Autentisering er påkravd av det trådlause nettverket"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Opprett nytt trådlaust nettverk"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nytt trådlaust nettverk"
-
-#, 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."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Kopla til eit gøymt trådlaust nettverk"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Gøymt trådlaust nettverk"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Oppgje namnet og tryggleiksdetaljane til det gøymde trådlause nettverket "
-#~ "du ynskjer å kopla til."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Tr_ådlaus tryggleik:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Tilkopli_ng:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Trådlaust _kort:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Eg kan ikkje finna tilbydaren min og eg vil oppgje han manuelt:"
-
-#~ msgid "Provider:"
-#~ msgstr "Tilbydar:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Liste over land eller regionar:"
-
-#~ msgid "Country or region"
-#~ msgstr "Land eller region"
-
-#~ msgid "Wired"
-#~ msgstr "Kabla"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Tr_ådlaus tryggleik:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nettverksnamn:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Tilkopli_ng:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Trådlaust _kort:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (forvald)"
 
diff --git a/po/oc.po b/po/oc.po
index bca6fb32..74d9745d 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: oc\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2016-03-10 21:49+0200\n"
 "Last-Translator: Cédric Valmary (totenoc.eu) <cvalmary yahoo fr>\n"
 "Language-Team: Tot En Òc\n"
@@ -23,6 +23,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Ret"
 
@@ -221,15 +222,19 @@ msgstr "Autentificacion 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "C_onnectat"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Nom de la ret :"
@@ -588,7 +593,7 @@ msgstr "Connexion mobila de benda larga (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Connexion mobila de benda larga"
 
@@ -713,7 +718,9 @@ msgstr "Autentificacion DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -820,6 +827,7 @@ msgid "Error displaying connection information:"
 msgstr "Error al moment de l'afichatge de las informacions de connexion :"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -971,7 +979,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Mot de pas :"
@@ -996,7 +1004,8 @@ msgstr "Bandièra pel VPN "
 msgid "Base Connection"
 msgstr "Connexion de basa "
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Desconegut"
 
@@ -1778,6 +1787,7 @@ msgid "_Service"
 msgstr "_Servici :"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2437,6 +2447,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Autorizar l'itine_rança se la ret domestica es indisponibla"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "A_fichar los senhals"
 
@@ -2842,13 +2853,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3174,12 +3186,12 @@ msgstr ""
 "fracassa, ensajatz de ne desactivar d'unas."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3189,22 +3201,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Ligam"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "En equipa"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Pont"
 
@@ -3505,6 +3520,7 @@ msgid "Select a connection to delete"
 msgstr "Connexion en equipa %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nom"
 
@@ -3719,6 +3735,8 @@ msgstr "Connexion Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Per defaut"
 
@@ -3950,35 +3968,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Mon provesidor utiliza una tecnologia de tipe C_DMA (1xRTT, EVOD, etc.)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4139,10 +4157,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Connexion Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clau WEP 40/128-bit (Hex o ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Frasa secreta WEP 128-bit"
 
@@ -4151,14 +4171,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinamic (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA e WPA2 personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA e WPA2 entrepresa"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA e WPA2 personal"
@@ -4235,6 +4258,482 @@ msgstr "Entresenhas sus la connexion"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Aucun certificat de CA n'est _requis"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Causissètz lo certificat de CA :"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "_Clau privada :"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_Senhal de la clau privada :"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Causissètz lo certificat de CA :"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Certificat de l'_utilizaire :"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Mon país es pas dins la lista"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Pas dins la lista"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Mon plan figura pas dins la lista..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Provesidor"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Periferic GSM installat"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Periferic CDMA installat"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Un aparelh quin que siá"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Connexion novèla mobila de benda larga"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Aqueste assistent vos ajuda a configurar aisidament una connexion mobila de "
+"benda larga a una ret cellulara (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Vos cal dispausar de las informacions seguentas :"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Lo nom de vòstre provesidor benda larga"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Lo nom de vòstre plan de facturacion benda largac"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"Lo nom del punt d'accès (APN) de vòstre plan de facturacion benda larga "
+"(dins d'unes cases)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Crear una connexion per aqueste aparelh _mobil de benda larga :"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Configuracion d'una connexion mobila de benda larga"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "País o region"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Causissètz lo país o la region de vòstre provesidor"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Seleccionatz vòstre provesidor dins la _lista :"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Tròbi pas mon provesidor e lo vòli picar  _manualament :"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Mon provesidor utiliza la tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Mon provesidor utiliza la tecnologia CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Causissètz vòstre provesidor"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Causissètz vòstre plan :"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Nom del punt d'accès (_APN) causit :"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Avertiment : la causida d'un marrit plan pòt aver de consequéncias sus la "
+"facturacion de vòstre compte benda larga o pòt empachar la connexion.\n"
+"\n"
+"S'avètz de dobtes sul bon plan, interrogatz vòstre provesidor a prepaus del "
+"nom del punt d'accès (APN)."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Causissètz vòstre plan de facturacion"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Vòstra connexion mobila de benda larga es configurada amb los paramètres "
+"seguents :"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Vòstre periferic :"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Vòstre provesidor :"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Vòstre plan :"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Ara, una connexion va èsser efectuada cap a vòstre provesidor de connexion "
+"mobila de benda larga amb los paramètres qu'avètz indicats. Se la connexion "
+"fracassa o qu'avètz pas accès a las ressorsas de la ret, verificatz una còp "
+"de mai los paramètres. Per los modificar, causissètz « Connexions ret » dins "
+"lo menú Sistèma > Preferéncias."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmacion dels paramètres de connexion mobila de benda larga"
+
+#
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(pas cap)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Certificat del C_A :"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Desconegut"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Causissètz lo certificat de CA :"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Certificat de l'_utilizaire :"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Error al moment de la modificacion de la connexion"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Desverrolhar"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Enregistrar lo senhal seulement per aqueste _utilizaire"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Enregistrar lo senhal per _totes los utilizaires"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "De_mandar aqueste senhal a cada còp"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Un senhal es requesit per vos connectar a « %s »."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "A_fichar los senhals"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "Senhal _terciari :"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "Senhal _segondari :"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "Sen_hal :"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Clicar per se connectar"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Pas cap"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinamic (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_rear"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"De senhals o de claus de chiframent son necessaris per l'accès a la ret Wi-"
+"Fi « %s »."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Autentificacion necessària per la ret Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Autentificacion demandada per la ret Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Creacion d'una novèla ret Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Novèla ret Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Picatz lo nom de la ret Wi-Fi que volètz crear."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Connexion a la ret Wi-Fi invisibla"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Ret Wi-Fi amagada"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Picatz lo nom e los detalhs de seguretat de la ret Wi-Fi invisibla a la "
+"quala vos volètz connectar."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Seguretat Wi-Fi :"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Co_nnexion :"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Ad_aptador Wi-Fi :"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Tròbi pas mon provesidor e lo vòli picar  _manualament :"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Provesidor :"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Lista dels païses o de las regions :"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "País o region"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Filara"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "Malhum OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Seguretat Wi-Fi :"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nom de la ret :"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nnexion :"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Ad_aptador Wi-Fi :"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Usatge :"
@@ -4385,26 +4884,26 @@ msgstr "Aucun certificat de CA n'est _requis"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Causir un fichièr PAC..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Fichièr PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Totes los fichièrs"
 
@@ -4443,16 +4942,16 @@ msgstr "Autentificacion i_ntèrna :"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "P_ermetre lo provisionament PAC automatic"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4488,15 +4987,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4510,24 +5009,24 @@ msgstr "Frasa secreta WEP 128-bit"
 msgid "Sh_ow passphrase"
 msgstr "A_fichar los senhals"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Aucun certificat de CA n'est _requis"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4536,7 +5035,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_dentitat :"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4576,15 +5075,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Au_tentificacion :"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_Senhal de la clau privada :"
@@ -4594,33 +5093,33 @@ msgstr "_Senhal de la clau privada :"
 msgid "_Type"
 msgstr "_Tipe :"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4650,335 +5149,17 @@ msgstr "A_fichar la clau"
 msgid "WEP inde_x"
 msgstr "Indè_x WEP :"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Aucun certificat de CA n'est _requis"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Causissètz lo certificat de CA :"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "_Clau privada :"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Senhal de la clau privada :"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Causissètz lo certificat de CA :"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Certificat de l'_utilizaire :"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Mon país es pas dins la lista"
-
-#~ msgid "Unlisted"
-#~ msgstr "Pas dins la lista"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Mon plan figura pas dins la lista..."
-
-#~ msgid "Provider"
-#~ msgstr "Provesidor"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Periferic GSM installat"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Periferic CDMA installat"
-
-#~ msgid "Any device"
-#~ msgstr "Un aparelh quin que siá"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Connexion novèla mobila de benda larga"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Aqueste assistent vos ajuda a configurar aisidament una connexion mobila "
-#~ "de benda larga a una ret cellulara (3G)."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Vos cal dispausar de las informacions seguentas :"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Lo nom de vòstre provesidor benda larga"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Lo nom de vòstre plan de facturacion benda largac"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "Lo nom del punt d'accès (APN) de vòstre plan de facturacion benda larga "
-#~ "(dins d'unes cases)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Crear una connexion per aqueste aparelh _mobil de benda larga :"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Configuracion d'una connexion mobila de benda larga"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "País o region"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Causissètz lo país o la region de vòstre provesidor"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Seleccionatz vòstre provesidor dins la _lista :"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Tròbi pas mon provesidor e lo vòli picar  _manualament :"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Mon provesidor utiliza la tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Mon provesidor utiliza la tecnologia CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Causissètz vòstre provesidor"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Causissètz vòstre plan :"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Nom del punt d'accès (_APN) causit :"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Avertiment : la causida d'un marrit plan pòt aver de consequéncias sus la "
-#~ "facturacion de vòstre compte benda larga o pòt empachar la connexion.\n"
-#~ "\n"
-#~ "S'avètz de dobtes sul bon plan, interrogatz vòstre provesidor a prepaus "
-#~ "del nom del punt d'accès (APN)."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Causissètz vòstre plan de facturacion"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Vòstra connexion mobila de benda larga es configurada amb los paramètres "
-#~ "seguents :"
-
-#~ msgid "Your Device:"
-#~ msgstr "Vòstre periferic :"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Vòstre provesidor :"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Vòstre plan :"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Ara, una connexion va èsser efectuada cap a vòstre provesidor de "
-#~ "connexion mobila de benda larga amb los paramètres qu'avètz indicats. Se "
-#~ "la connexion fracassa o qu'avètz pas accès a las ressorsas de la ret, "
-#~ "verificatz una còp de mai los paramètres. Per los modificar, causissètz « "
-#~ "Connexions ret » dins lo menú Sistèma > Preferéncias."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Confirmacion dels paramètres de connexion mobila de benda larga"
-
-#
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(pas cap)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certificat del C_A :"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Desconegut"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Causissètz lo certificat de CA :"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Certificat de l'_utilizaire :"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Error al moment de la modificacion de la connexion"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Desverrolhar"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Enregistrar lo senhal seulement per aqueste _utilizaire"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Enregistrar lo senhal per _totes los utilizaires"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "De_mandar aqueste senhal a cada còp"
-
-#~ msgid "The password is not required"
-#~ msgstr "Un senhal es requesit per vos connectar a « %s »."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "A_fichar los senhals"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Senhal _terciari :"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "Senhal _segondari :"
-
-#~ msgid "_Password:"
-#~ msgstr "Sen_hal :"
-
-#~ msgid "Click to connect"
-#~ msgstr "Clicar per se connectar"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Pas cap"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP dinamic (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "C_rear"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "De senhals o de claus de chiframent son necessaris per l'accès a la ret "
-#~ "Wi-Fi « %s »."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Autentificacion necessària per la ret Wi-Fi"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Autentificacion demandada per la ret Wi-Fi"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Creacion d'una novèla ret Wi-Fi"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Novèla ret Wi-Fi"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Connexion a la ret Wi-Fi invisibla"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Ret Wi-Fi amagada"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Picatz lo nom e los detalhs de seguretat de la ret Wi-Fi invisibla a la "
-#~ "quala vos volètz connectar."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Seguretat Wi-Fi :"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Co_nnexion :"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Ad_aptador Wi-Fi :"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Tròbi pas mon provesidor e lo vòli picar  _manualament :"
-
-#~ msgid "Provider:"
-#~ msgstr "Provesidor :"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Lista dels païses o de las regions :"
-
-#~ msgid "Country or region"
-#~ msgstr "País o region"
-
-#~ msgid "Wired"
-#~ msgstr "Filara"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "Malhum OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Seguretat Wi-Fi :"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nom de la ret :"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Co_nnexion :"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Ad_aptador Wi-Fi :"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (per defaut)"
 
diff --git a/po/or.po b/po/or.po
index 115e3e3c..5afee333 100644
--- a/po/or.po
+++ b/po/or.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2014-12-02 05:43-0500\n"
 "Last-Translator: mgiri <mgiri redhat com>\n"
 "Language-Team: Oriya <Translation-team-or lists sourceforge net>\n"
@@ -22,6 +22,7 @@ msgstr ""
 "X-Generator: Zanata 3.5.1\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 #, fuzzy
 msgid "Network"
 msgstr "%s ନେଟୱର୍କ"
@@ -217,15 +218,19 @@ msgstr "ତାରଯୁକ୍ତ 802.1X ବୈଧିକରଣ"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "ସଂଯୋଗ କରନ୍ତୁ (_o)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "ନେଟୱର୍କ ନାମ (_N):"
@@ -581,7 +586,7 @@ msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ"
 
@@ -710,7 +715,9 @@ msgstr "DSL ବୈଧିକରଣ"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -822,6 +829,7 @@ msgid "Error displaying connection information:"
 msgstr "ସଂଯୋଗ ସୂଚନା ଦର୍ଶାଇବାରେ ତ୍ରୁଟି:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -975,7 +983,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ:"
@@ -1004,7 +1012,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "ସଂଯୋଗ (_n):"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "ଅଜଣା"
 
@@ -1764,6 +1773,7 @@ msgid "_Service"
 msgstr "ସର୍ଭିସ (_S):"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2425,6 +2435,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "ସ୍ଥାନୀୟ ନେଟୱର୍କ ଉପଲବ୍ଧ ନହେଲେ ରୋମିଙ୍ଗକୁ ଅନୁମତି ଦିଅନ୍ତୁ"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "ପ୍ରବେଶ ସଂକେତ ଦର୍ଶାନ୍ତୁ (_w)"
 
@@ -2830,14 +2841,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "ସ୍ୱୟଂଚାଳିତ ଇଥରନେଟ"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3163,12 +3175,12 @@ msgstr ""
 "ବିଫଳ ହୁଏ, ତେବେ କିଛି ପଦ୍ଧତିର ସମର୍ଥନକୁ ନିଷ୍କ୍ରିୟ କରି ଚେଷ୍ଟା କରନ୍ତୁ।</i>"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3178,22 +3190,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "ଇନଫିନିବ୍ୟାଣ୍ଡ"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "ବନ୍ଧନ"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "ବ୍ରିଜ"
 
@@ -3486,6 +3501,7 @@ msgid "Select a connection to delete"
 msgstr "ତାରଯୁକ୍ତ ସଂଯୋଗ %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "ନାମ"
 
@@ -3718,6 +3734,8 @@ msgstr "ତାରଯୁକ୍ତ ସଂଯୋଗ %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ"
 
@@ -3946,35 +3964,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ମୋର ପ୍ରଦାତା CDMA-ଆଧାରିତ ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବାହର କରନ୍ତି (ଯେପରିକି, 1xRTT, EVDO) ( _C)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4140,10 +4158,12 @@ msgid "Wi-Fi connection %d"
 msgstr "ତାରଯୁକ୍ତ ସଂଯୋଗ %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-ବିଟ କି (Hex ଅଥବା ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-ବିଟ ପ୍ରବେଶ ସଂକେତ"
 
@@ -4152,14 +4172,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "ଗତିଜ WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ବ୍ୟକ୍ତିଗତ"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ଉଦ୍ଦୋଗ"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 ବ୍ୟକ୍ତିଗତ"
@@ -4237,6 +4260,495 @@ msgstr "ସଂଯୋଗ ସୂଚନା"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "ବ୍ୟକ୍ତିଗତ କି (_k):"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ (_P):"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "ଚାଳକ ପ୍ରମାଣପତ୍ର (_U):"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "ମୋର ଦେଶ ତାଲିକାଭୁକ୍ତ ହୋଇନାହିଁ"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "ତାଲିକାଭୁକ୍ତ ହୋଇନଥିବା"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "ମୋର ଯୋଜନା ତାଲିକାଭୁକ୍ତ ହୋଇନାହିଁ..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "ପ୍ରଦାତା"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "ସ୍ଥାପିତ GSM ଉପକରଣ"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "ସ୍ଥାପିତ CDMA ଉପକରଣ"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "କୌଣସି ଉପଦେଶ ଅଛି କି"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "ନୂତନ ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"ସହାୟକ ଆପଣଙ୍କୁ ସହଜରେ ଗୋଟିଏ ସେଲ୍ୟୁଲାର (3G) ନେଟୱର୍କ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସ୍ଥାପନ "
+"କରିବାରେ ସାହାଯ୍ୟ କରିବେ।"
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "ଆପଣ ନିମ୍ନଲିଖିତ ସୂଚନା ଆବଶ୍ୟକ କରିବେ:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "ଆପଣଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ପ୍ରଦାତାଙ୍କ ନାମ"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "ଆପଣଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ବିଲିଙ୍ଗ ଯୋଜନା ନାମ"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(କିଛି ପରିସ୍ଥିତିରେ) ଆପଣଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ବିଲିଙ୍ଗ ଯୋଜନା APN (ଅଭିଗମ୍ୟତା ବିନ୍ଦୁ ନାମ)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "ଏହି ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ଉପକରଣ ପାଇଁ ଗୋଟିଏ ସଂଯୋଗ ନିର୍ମାଣ କରନ୍ତୁ (_t)"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସ୍ଥାପନ କରନ୍ତୁ"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "ଦେଶ ତାଲିକା:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କ ଦେଶକୁ ବାଛନ୍ତୁ"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "ତାଲିକାରୁ ଆପଣଙ୍କର ପ୍ରଦାତା ବାଛନ୍ତୁ (_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "ମୁଁ ମୋର ପ୍ରଦାତାଙ୍କୁ ପାଇଲି ନାହିଁ ଏବଂ ମୁ ଏହାକୁ ହସ୍ତକୃତ ଭାବରେ ଭରଣ କରିବାକୁ ଚାହୁଁଛି (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "ମୋର ପ୍ରଦାତା GSM ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବହାର କରିଥାଏ (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "ମୋର ପ୍ରଦାତା CDMA ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବହାର କରିଥାଏ (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କୁ ବାଛନ୍ତୁ"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "ଆପଣଙ୍କର ଯୋଜନାକୁ ବାଛନ୍ତୁ (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "ବଚ୍ଛିତ ଯୋଜନା APN (ଅଭିଗମ୍ୟତା ବିନ୍ଦୁ ନାମ) (_A):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"ଚେତାବନୀ: ଗୋଟିଏ ଭୁଲ ଯୋଜନା ବାଛିବା ଦ୍ୱାରା ଆପମଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ପାଇଁ ବିଲିଙ୍ଗ ସମସ୍ୟା "
+"ଦେଖାଦେଇପାରେ କିମ୍ବା ସଂଯୋଗକୁ ବାରଣ କରିପାରେ।\n"
+"\n"
+"ଯଦି ଆପଣ ଆପଣଙ୍କ ଯୋଜନା ବିଷୟରେ ନିଶ୍ଚିତ ନୁହଁନ୍ତି ତେବେ ଦୟାକରି ଆପଣଙ୍କ ପ୍ରଦାତାଙ୍କୁ ଆପଣଙ୍କ ଯୋଜନାର "
+"APN ବିଷୟରେ ପଚାରନ୍ତୁ।"
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "ଆପଣଙ୍କର ବିଲିଙ୍ଗ ଯୋଜନା ବାଛନ୍ତୁ"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ନିମ୍ନଲିଖିତ ସଂରଚନା ଦ୍ୱାରା ବିନ୍ୟାସ କରାଯାଇଛି:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "ଆପଣଙ୍କର ଉପକରଣ:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "ଆପଣଙ୍କର ପ୍ରଦାତା:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "ଆପଣଙ୍କର ଯୋଜନା:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"ଆପଣ ବାଛିଥିବା ସଂରଚନାକୁ ବ୍ୟବହାର କରି ଗୋଟିଏ ସଂଯୋଗକୁ ବର୍ତ୍ତମାନ ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ "
+"ପ୍ରଦାତାଙ୍କ ସହିତ ସ୍ଥାପନ କରାଯିବ।  ଯଦି ସେହି ସଂଯୋଗଟି ବିଫଳ ହୁଏ କିମ୍ବା ଯଦି ଆପଣ ନେଟୱର୍କ ଉତ୍ସଗୁଡ଼ିକୁ "
+"ଅଭିଗମ୍ୟ କରିନପାରନ୍ତି, ତେବେ ଆପଣଙ୍କ ସଂରଚନାକୁ ପୁଣିଥରେ ଯାଞ୍ଚ କରନ୍ତୁ।  ଆପମଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ "
+"ସଂଯୋଗ ସଂରଚନାକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ, \"Network Connections\" କୁ ତନ୍ତ୍ର >> ପସନ୍ଦ "
+"ତାଲିକାରୁ ବାଛନ୍ତୁ।"
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂରଚନାକୁ ନିଶ୍ଚିତ କରନ୍ତୁ"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(କିଛି ନାହିଁ)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA ପ୍ରମାଣ ପତ୍ର (_A):"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "ଅଜଣା"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "ଚାଳକ ପ୍ରମାଣପତ୍ର (_U):"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "ସଂଯୋଗକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "ଖୋଲନ୍ତୁ (_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "ପ୍ରତ୍ୟେକ ଥର ଏହି ପ୍ରବେଶ ସଂକେତକୁ ପଚାରନ୍ତୁ (_k)"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "'%s' ସହିତ ସଂଯୁକ୍ତ ହେବା ପାଇଁ ଗୋଟିଏ ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ।"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "ପ୍ରବେଶ ସଂକେତ ଦର୍ଶାନ୍ତୁ (_w)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "କିଛି ନୁହେଁ"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "ଗତିଜ WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "ସୃଷ୍ଟି କରନ୍ତୁ (_r)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "ବେତାର ନେଟୱର୍କ '%s' କୁ ଅଭିଗମ୍ୟ କରିବା ପାଇଁ ପ୍ରବେଶ ସଂକେତ କିମ୍ବା ସଂଗୁପ୍ତ କିଗୁଡ଼ିକ ଆବଶ୍ୟକ।"
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "ବେତାର ନେଟୱର୍କ ବୈଧିକରଣ ଆବଶ୍ୟକ"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "ବେତାର ନେଟୱର୍କ ପାଇଁ ପ୍ରାଧିକରଣ ଆବଶ୍ୟକ"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "ନୂତନ ବେତାର ନେଟୱର୍କ ନିର୍ମାଣ କରନ୍ତୁ"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "ନୂତନ ବେତାର ନେଟୱର୍କ"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "ଆପଣ ନିର୍ମାଣ କରିବାକୁ ଚାହୁଁଥିବା ବେତାର ନେଟୱର୍କ ପାଇଁ ଗୋଟିଏ ନାମ ଭରଣ କରନ୍ତୁ।"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "ଲୁକ୍କାଇତ ବେତାର ନେଟୱର୍କ ସହିତ ସଂଯୋଗ କରନ୍ତୁ"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "ଲୁକ୍କାଇତ ବେତାର ନେଟୱର୍କ"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"ଆପଣ ସଂଯୋଗ ସ୍ଥାପନ କରିବାକୁ ଚାହୁଁଥିବା ଲୁକ୍କାୟିତ ବେତାର ନେଟୱର୍କର ନାମ ଏବଂ ସୁରକ୍ଷା ବିବରଣୀଗୁଡ଼ିକୁ ଭରଣ "
+"କରନ୍ତୁ।"
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "ସୁରକ୍ଷା (_S):"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "ସଂଯୋଗ (_n):"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "ବେତାର ଏଡପ୍ଟର (_a):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "ମୁଁ ମୋର ପ୍ରଦାତାଙ୍କୁ ପାଇଲି ନାହିଁ ଏବଂ ମୁ ଏହାକୁ ହସ୍ତକୃତ ଭାବରେ ଭରଣ କରିବାକୁ ଚାହୁଁଛି (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "ପ୍ରଦାତା:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+#, fuzzy
+msgid "Country or Region List:"
+msgstr "ଦେଶ ତାଲିକା:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+#, fuzzy
+msgid "Country or region"
+msgstr "ଦେଶ ତାଲିକା:"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "ତାରଯୁକ୍ତ"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "ସୁରକ୍ଷା (_S):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "ନେଟୱର୍କ ନାମ (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "ସଂଯୋଗ (_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "ବେତାର ଏଡପ୍ଟର (_a):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "ବ୍ୟବହାର ବିଧି:"
@@ -4390,26 +4902,26 @@ msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ 
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ଗୋଟିଏ PAC ଫାଇଲ ଚୟନ କରନ୍ତୁ..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ଫାଇଲଗୁଡ଼ିକ (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "ସମସ୍ତ ଫାଇଲଗୁଡ଼ିକ"
 
@@ -4451,16 +4963,16 @@ msgstr "ଆଭ୍ୟନ୍ତରୀଣ ବୈଧିକରଣ (_n):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ସ୍ୱୟଂଚାଳିତ PAC ସୁବିଧାକୁ ଅନୁମତି ଦିଅନ୍ତୁ (_A)"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4496,15 +5008,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4518,24 +5030,24 @@ msgstr "WEP 128-ବିଟ ପ୍ରବେଶ ସଂକେତ"
 msgid "Sh_ow passphrase"
 msgstr "ପ୍ରବେଶ ସଂକେତ ଦର୍ଶାନ୍ତୁ (_w)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4544,7 +5056,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "ପରିଚୟ (_d):"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4584,15 +5096,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "ବୈଧିକରଣ (_A):"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ (_P):"
@@ -4602,33 +5114,33 @@ msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ (_
 msgid "_Type"
 msgstr "ପ୍ରକାର (_T):"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4669,326 +5181,17 @@ msgstr "କି ଦର୍ଶାନ୍ତୁ (_w)"
 msgid "WEP inde_x"
 msgstr "WEP ଅନୁକ୍ରମଣିକା (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "ବ୍ୟକ୍ତିଗତ କି (_k):"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ (_P):"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "ଚାଳକ ପ୍ରମାଣପତ୍ର (_U):"
-
-#~ msgid "My country is not listed"
-#~ msgstr "ମୋର ଦେଶ ତାଲିକାଭୁକ୍ତ ହୋଇନାହିଁ"
-
-#~ msgid "Unlisted"
-#~ msgstr "ତାଲିକାଭୁକ୍ତ ହୋଇନଥିବା"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "ମୋର ଯୋଜନା ତାଲିକାଭୁକ୍ତ ହୋଇନାହିଁ..."
-
-#~ msgid "Provider"
-#~ msgstr "ପ୍ରଦାତା"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "ସ୍ଥାପିତ GSM ଉପକରଣ"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "ସ୍ଥାପିତ CDMA ଉପକରଣ"
-
-#~ msgid "Any device"
-#~ msgstr "କୌଣସି ଉପଦେଶ ଅଛି କି"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "ନୂତନ ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "ସହାୟକ ଆପଣଙ୍କୁ ସହଜରେ ଗୋଟିଏ ସେଲ୍ୟୁଲାର (3G) ନେଟୱର୍କ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସ୍ଥାପନ "
-#~ "କରିବାରେ ସାହାଯ୍ୟ କରିବେ।"
-
-#~ msgid "You will need the following information:"
-#~ msgstr "ଆପଣ ନିମ୍ନଲିଖିତ ସୂଚନା ଆବଶ୍ୟକ କରିବେ:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "ଆପଣଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ପ୍ରଦାତାଙ୍କ ନାମ"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "ଆପଣଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ବିଲିଙ୍ଗ ଯୋଜନା ନାମ"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(କିଛି ପରିସ୍ଥିତିରେ) ଆପଣଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ବିଲିଙ୍ଗ ଯୋଜନା APN (ଅଭିଗମ୍ୟତା ବିନ୍ଦୁ ନାମ)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "ଏହି ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ଉପକରଣ ପାଇଁ ଗୋଟିଏ ସଂଯୋଗ ନିର୍ମାଣ କରନ୍ତୁ (_t)"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସ୍ଥାପନ କରନ୍ତୁ"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "ଦେଶ ତାଲିକା:"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କ ଦେଶକୁ ବାଛନ୍ତୁ"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "ତାଲିକାରୁ ଆପଣଙ୍କର ପ୍ରଦାତା ବାଛନ୍ତୁ (_l):"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "ମୁଁ ମୋର ପ୍ରଦାତାଙ୍କୁ ପାଇଲି ନାହିଁ ଏବଂ ମୁ ଏହାକୁ ହସ୍ତକୃତ ଭାବରେ ଭରଣ କରିବାକୁ ଚାହୁଁଛି (_m):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "ମୋର ପ୍ରଦାତା GSM ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବହାର କରିଥାଏ (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "ମୋର ପ୍ରଦାତା CDMA ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବହାର କରିଥାଏ (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କୁ ବାଛନ୍ତୁ"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "ଆପଣଙ୍କର ଯୋଜନାକୁ ବାଛନ୍ତୁ (_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "ବଚ୍ଛିତ ଯୋଜନା APN (ଅଭିଗମ୍ୟତା ବିନ୍ଦୁ ନାମ) (_A):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "ଚେତାବନୀ: ଗୋଟିଏ ଭୁଲ ଯୋଜନା ବାଛିବା ଦ୍ୱାରା ଆପମଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ପାଇଁ ବିଲିଙ୍ଗ ସମସ୍ୟା "
-#~ "ଦେଖାଦେଇପାରେ କିମ୍ବା ସଂଯୋଗକୁ ବାରଣ କରିପାରେ।\n"
-#~ "\n"
-#~ "ଯଦି ଆପଣ ଆପଣଙ୍କ ଯୋଜନା ବିଷୟରେ ନିଶ୍ଚିତ ନୁହଁନ୍ତି ତେବେ ଦୟାକରି ଆପଣଙ୍କ ପ୍ରଦାତାଙ୍କୁ ଆପଣଙ୍କ ଯୋଜନାର "
-#~ "APN ବିଷୟରେ ପଚାରନ୍ତୁ।"
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "ଆପଣଙ୍କର ବିଲିଙ୍ଗ ଯୋଜନା ବାଛନ୍ତୁ"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ନିମ୍ନଲିଖିତ ସଂରଚନା ଦ୍ୱାରା ବିନ୍ୟାସ କରାଯାଇଛି:"
-
-#~ msgid "Your Device:"
-#~ msgstr "ଆପଣଙ୍କର ଉପକରଣ:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "ଆପଣଙ୍କର ପ୍ରଦାତା:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "ଆପଣଙ୍କର ଯୋଜନା:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "ଆପଣ ବାଛିଥିବା ସଂରଚନାକୁ ବ୍ୟବହାର କରି ଗୋଟିଏ ସଂଯୋଗକୁ ବର୍ତ୍ତମାନ ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ "
-#~ "ପ୍ରଦାତାଙ୍କ ସହିତ ସ୍ଥାପନ କରାଯିବ।  ଯଦି ସେହି ସଂଯୋଗଟି ବିଫଳ ହୁଏ କିମ୍ବା ଯଦି ଆପଣ ନେଟୱର୍କ ଉତ୍ସଗୁଡ଼ିକୁ "
-#~ "ଅଭିଗମ୍ୟ କରିନପାରନ୍ତି, ତେବେ ଆପଣଙ୍କ ସଂରଚନାକୁ ପୁଣିଥରେ ଯାଞ୍ଚ କରନ୍ତୁ।  ଆପମଙ୍କର ମୋବାଇଲ "
-#~ "ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସଂରଚନାକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ, \"Network Connections\" କୁ ତନ୍ତ୍ର "
-#~ ">> ପସନ୍ଦ ତାଲିକାରୁ ବାଛନ୍ତୁ।"
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂରଚନାକୁ ନିଶ୍ଚିତ କରନ୍ତୁ"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(କିଛି ନାହିଁ)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "CA ପ୍ରମାଣ ପତ୍ର (_A):"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "ଅଜଣା"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "ଚାଳକ ପ୍ରମାଣପତ୍ର (_U):"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "ସଂଯୋଗକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "ଖୋଲନ୍ତୁ (_U)"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "ପ୍ରତ୍ୟେକ ଥର ଏହି ପ୍ରବେଶ ସଂକେତକୁ ପଚାରନ୍ତୁ (_k)"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "'%s' ସହିତ ସଂଯୁକ୍ତ ହେବା ପାଇଁ ଗୋଟିଏ ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ।"
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "ପ୍ରବେଶ ସଂକେତ ଦର୍ଶାନ୍ତୁ (_w)"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
-
-#~ msgid "_Password:"
-#~ msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
-
-#, fuzzy
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "କିଛି ନୁହେଁ"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "ଗତିଜ WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "ସୃଷ୍ଟି କରନ୍ତୁ (_r)"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "ବେତାର ନେଟୱର୍କ '%s' କୁ ଅଭିଗମ୍ୟ କରିବା ପାଇଁ ପ୍ରବେଶ ସଂକେତ କିମ୍ବା ସଂଗୁପ୍ତ କିଗୁଡ଼ିକ ଆବଶ୍ୟକ।"
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "ବେତାର ନେଟୱର୍କ ବୈଧିକରଣ ଆବଶ୍ୟକ"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "ବେତାର ନେଟୱର୍କ ପାଇଁ ପ୍ରାଧିକରଣ ଆବଶ୍ୟକ"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "ନୂତନ ବେତାର ନେଟୱର୍କ ନିର୍ମାଣ କରନ୍ତୁ"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "ନୂତନ ବେତାର ନେଟୱର୍କ"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "ଆପଣ ନିର୍ମାଣ କରିବାକୁ ଚାହୁଁଥିବା ବେତାର ନେଟୱର୍କ ପାଇଁ ଗୋଟିଏ ନାମ ଭରଣ କରନ୍ତୁ।"
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "ଲୁକ୍କାଇତ ବେତାର ନେଟୱର୍କ ସହିତ ସଂଯୋଗ କରନ୍ତୁ"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "ଲୁକ୍କାଇତ ବେତାର ନେଟୱର୍କ"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "ଆପଣ ସଂଯୋଗ ସ୍ଥାପନ କରିବାକୁ ଚାହୁଁଥିବା ଲୁକ୍କାୟିତ ବେତାର ନେଟୱର୍କର ନାମ ଏବଂ ସୁରକ୍ଷା ବିବରଣୀଗୁଡ଼ିକୁ "
-#~ "ଭରଣ କରନ୍ତୁ।"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "ସୁରକ୍ଷା (_S):"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "ସଂଯୋଗ (_n):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "ବେତାର ଏଡପ୍ଟର (_a):"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "ମୁଁ ମୋର ପ୍ରଦାତାଙ୍କୁ ପାଇଲି ନାହିଁ ଏବଂ ମୁ ଏହାକୁ ହସ୍ତକୃତ ଭାବରେ ଭରଣ କରିବାକୁ ଚାହୁଁଛି (_m):"
-
-#~ msgid "Provider:"
-#~ msgstr "ପ୍ରଦାତା:"
-
-#, fuzzy
-#~ msgid "Country or Region List:"
-#~ msgstr "ଦେଶ ତାଲିକା:"
-
-#, fuzzy
-#~ msgid "Country or region"
-#~ msgstr "ଦେଶ ତାଲିକା:"
-
-#~ msgid "Wired"
-#~ msgstr "ତାରଯୁକ୍ତ"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "ସୁରକ୍ଷା (_S):"
-
-#~ msgid "_Network name:"
-#~ msgstr "ନେଟୱର୍କ ନାମ (_N):"
-
-#, fuzzy
-#~ msgid "C_onnection:"
-#~ msgstr "ସଂଯୋଗ (_n):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "ବେତାର ଏଡପ୍ଟର (_a):"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ"
diff --git a/po/pa.po b/po/pa.po
index 6ff7a999..7892ce2b 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2017-07-23 11:57-0600\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi <punjabi-users lists sf net>\n"
@@ -20,6 +20,7 @@ msgstr ""
 "X-Generator: Lokalize 2.0\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "ਨੈੱਟਵਰਕ"
 
@@ -204,15 +205,19 @@ msgstr "802.1X ਪਰਮਾਣਕਿਤਾ"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "ਰੱਦ ਕਰੋ(_C)"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "ਕਨੈਕਸ਼ਨ(_o)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "ਨੈੱਟਵਰਕ ਨਾਂ(_N):"
@@ -556,7 +561,7 @@ msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ"
 
@@ -677,7 +682,9 @@ msgstr "DSL ਪਰਮਾਣਕਿਤਾ"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "ਠੀਕ ਹੈ(_O)"
 
@@ -781,6 +788,7 @@ msgid "Error displaying connection information:"
 msgstr "ਕਨੈਕਸ਼ਨ ਜਾਣਕਾਰੀ ਵੇਖਾਉਣ ਲਈ ਗਲਤੀ:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -930,7 +938,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "ਹਾਟਸਪਾਟ"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "ਪਾਸਵਰਡ:"
@@ -955,7 +963,8 @@ msgstr "VPN ਬੈਨਰ"
 msgid "Base Connection"
 msgstr "ਬੇਸ ਕਨੈਕਸ਼ਨ"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
@@ -1711,6 +1720,7 @@ msgid "_Service"
 msgstr "ਸਰਵਿਸ(_S):"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2368,6 +2378,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "ਜੇ ਘਰ (ਹੋਮ) ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ ਨਾ ਹੋਵੇ ਤਾਂ ਰੋਮਿੰਗ ਮਨਜ਼ੂਰ(_r)"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_w)"
 
@@ -2767,13 +2778,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "ਈਥਰਨੈੱਟ"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3097,12 +3109,12 @@ msgstr ""
 "ਫੇਲ੍ਹ ਹੋਵੇ ਤਾਂ ਕੁਝ ਢੰਗ ਅਸਮਰੱਥ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ।"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "ਬਲਿਊਟੁੱਥ"
 
@@ -3112,22 +3124,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "ਇੰਫੀਬੈਂਡ"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "ਬੌਂਡ"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "ਟੀਮ"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "ਬਰਿੱਜ਼"
 
@@ -3410,6 +3425,7 @@ msgid "Select a connection to delete"
 msgstr "ਹਟਾਉਣ ਲਈ ਕਨੈਕਸ਼ਨ ਚੁਣੋ"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "ਨਾਂ"
 
@@ -3623,6 +3639,8 @@ msgstr "ਈਥਰਨੈੱਟ ਕਨੈਕਸ਼ਨ %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "ਡਿਫਾਲਟ"
 
@@ -3848,35 +3866,35 @@ msgstr "ਮੇਰਾ ਪਰੋਵਾਇਡਰ _GSM ਅਧਾਰਿਤ ਤਕਨ
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ਮੇਰਾ ਪਰੋਵਾਇਡਰ C_DMA ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ 1xRTT, EVDO) ਵਰਤਦਾ ਹੈ।"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4032,10 +4050,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi ਕਨੈਕਸ਼ਨ %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-ਬਿੱਟ ਕੁੰਜੀ (Hex ਜਾਂ ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-ਬਿੱਟ ਸ਼ਬਦ"
 
@@ -4044,14 +4064,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "ਡਾਇਨੈਮਿਕ WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ਨਿੱਜੀ"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ਇੰਟਰਪ੍ਰਾਈਜ"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 ਨਿੱਜੀ"
@@ -4125,6 +4148,457 @@ msgstr "ਕਨੈਕਸ਼ਨ ਜਾਣਕਾਰੀ"
 msgid "_Close"
 msgstr "ਬੰਦ ਕਰੋ(_C)"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "ਕੋਈ CA ਸਰਟੀਫਿਕੇਟ ਸੈੱਟ ਨਹੀਂ"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "ਕੋਈ ਕੁੰਜੀ ਸੈੱਟ ਨਹੀਂ ਹੈ"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "%s ਸਰਟੀਫਿਕੇਟ ਲਈ ਕੁੰਜੀ ਚੁਣੋ"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "%s ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ(_k):"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "%s ਕੁੰਜੀ ਪਾਸਵਰਡ(_p):"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "%s ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "%s ਸਰਟੀਫਿਕੇਟ(_c):"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "ਮੇਰਾ ਦੇਸ਼ ਲਿਸਟ ਵਿੱਚ ਨਹੀਂ ਹੈ"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "ਬਿਨ-ਲਿਸਟ"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "ਮੇਰਾ ਪਲੈਨ ਲਿਸਟ 'ਚ ਨਹੀਂ ਹੈ…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "ਪਰੋਵਾਇਡਰ"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "ਇੰਸਟਾਲ ਕੀਤਾ GSM ਜੰਤਰ"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "ਇੰਸਟਾਲ ਕੀਤਾ CDMA ਜੰਤਰ"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "ਕੋਈ ਵੀ ਜੰਤਰ"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "ਨਵਾਂ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"ਇਹ ਸਹਾਇਕ ਤੁਹਾਨੂੰ ਸੈਲੁਲਰ (3G) ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਸੈੱਟ ਕਰਨ ਲਈ ਮੱਦਦ ਕਰਦਾ ਹੈ।"
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "ਤੁਹਾਨੂੰ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਚਾਹੀਦੀ ਹੈ:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "ਤੁਹਾਡੇ ਬਰਾਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਦਾ ਨਾਂ"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "ਤੁਹਾਡਾ ਬਰਾਡਬੈਂਡ ਬਿੱਲ ਪਲੈਨ ਨਾਂ"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(ਕੁਝ ਹਾਲਤਾਂ ਵਿੱਚ) ਤੁਹਾਡਾ ਬਰਾਡਬੈਂਡ ਬਿੱਲ ਪਲੈਨ APN (ਅਸੈੱਸ ਪੁਆਇੰਟ ਨਾਂ)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "ਇਸ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਲਈ ਇੱਕ ਕਨੈਕਸ਼ਨ ਬਣਾਓ(_t):"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬਾਂਡ ਕਨੈਕਸ਼ਨ ਸੈੱਟਅੱਪ"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "ਦੇਸ਼ ਜਾਂ ਖੇਤਰ"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "ਆਪਣੇ ਪਰੋਵਾਇਡਰ ਦਾ ਦੇਸ਼ ਜਾਂ ਖੇਤਰ ਚੁਣੋ"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "ਲਿਸਟ ਤੋਂ ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਚੁਣੋ(_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "ਮੈਨੂੰ ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਨਹੀਂ ਮਿਲਿਆ ਅਤੇ ਮੈਂ ਖੁਦ ਦੇਣਾ ਚਾਹੁੰਦਾ ਹਾਂ(_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "ਮੇਰਾ ਪਰੋਵਾਇਡਰ GSM ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ GPRS, EDGE, UMTS, HSDPA) ਵਰਤਦਾ ਹੈ।"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "ਮੇਰਾ ਪਰੋਵਾਇਡਰ CDMA ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ 1xRTT, EVDO) ਵਰਤਦਾ ਹੈ"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਚੁਣੋ"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "ਆਪਣਾ ਪਲੈਨ ਚੁਣੋ(_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "ਚੁਣਿਆ ਪਲੈਨ _APN (ਅਸੈੱਸ ਪੁਆਇੰਟ ਨੇਮ):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"ਸਾਵਧਾਨ: ਗਲਤ ਪਲੈਨ ਚੁਣਨ ਨਾਲ ਤੁਹਾਡੇ ਬਰਾਡਬੈਂਡ ਅਕਾਊਂਟ ਲਈ ਬਿੱਲ ਦਾ ਮੁੱਦਾ ਹੋ ਸਕਦਾ ਹੈ ਜਾਂ ਕਨੈਕਟਵਿਟੀ "
+"ਰੁਕ ਸਕਦੀ ਹੈ।\n"
+"\n"
+"ਜੇ ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਲੈਨ ਬਾਰੇ ਪੱਕਾ ਪਤਾ ਨਾ ਹੋਵੇ ਤਾਂ ਆਪਣੇ ਪਰੋਵਾਇਡਰ ਨੂੰ ਆਪਣੇ ਪਲੈਨ ਦੇ APN ਬਾਰੇ ਪਤਾ ਕਰੋ।"
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "ਆਪਣਾ ਬਿੱਲ ਪਲੈਨ ਚੁਣੋ"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "ਤੁਹਾਡਾ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਦੀ ਹੇਠ ਦਿੱਤੀ ਸੈਟਿੰਗ ਨਾਲ ਸੰਰਚਨਾ ਕੀਤੀ ਗਈ ਹੈ।"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "ਤੁਹਾਡਾ ਜੰਤਰ:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "ਤੁਹਾਡਾ ਪਰੋਵਾਇਡਰ:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "ਤੁਹਾਡਾ ਪਲੈਨ:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"ਤੁਹਾਡੇ ਵਲੋਂ ਚੁਣੀ ਸੈਟਿੰਗਾਂ ਨਾਲ ਤੁਹਾਡੇ ਮੋਬਾਇਲ ਬਰਾਂਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਨਾਲ ਕਨੈਕਸ਼ਨ ਬਣਾਇਆ ਜਾਵੇਗਾ। ਜੇ "
+"ਕਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ ਜਾਂ ਤੁਸੀਂ ਨੈੱਟਵਰਕ ਸਰੋਤਾਂ ਨੂੰ ਨਾ ਅਸੈੱਸ ਕਰ ਸਕੇ ਤਾਂ ਆਪਣੀ ਸੈਟਿੰਗਾਂ ਫੇਰ ਚੈੱਕ ਕਰੋ। ਆਪਣੀ "
+"ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਸੈਟਿੰਗ ਨੂੰ ਸੋਧਣ ਲਈ, ਸਿਸਟਮ → ਪਸੰਦ ਮੇਨੂ ਤੋਂ ”ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ” ਚੁਣੋ। "
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਸੈਟਿੰਗ ਪੁਸ਼ਟੀ"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(ਕੋਈ ਨਹੀਂ)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "%s ਵਿੱਚ ਕੁੰਜੀ"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "%s ਵਿੱਚ ਸਰਟੀਫਿਕੇਟ"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(ਅਣਪਛਾਤਾ)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "ਚੁਣੋ"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "ਰੱਦ ਕਰੋ"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "ਫਾਇਲ ਤੋਂ ਚੁਣੋ…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "%s ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "%s ਸਰਟੀਫਿਕੇਟ ਪਾਸਵਰਡ(_p):"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "ਸ਼ੈਸ਼ਨ ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "ਅਣ-ਲਾਕ ਟੋਕਨ(_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "ਜਾਰੀ ਕੀਤਾ ਵਲੋਂ"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "%s ਪਿੰਨ ਦਿਓ"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "ਲਾਗਇਨ(_L)"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "ਪਿੰਨ ਯਾਦ ਰੱਖੋ(_R)"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "ਸਿਰਫ਼ ਇਹ ਵਰਤੋਂਕਾਰ ਲਈ ਹੀ ਪਾਸਵਰਡ ਸੰਭਾਲੋ"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "ਸਭ ਵਰਤੋਂਕਾਰਾਂ ਲਈ ਹੀ ਪਾਸਵਰਡ ਸੰਭਾਲੋ"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "ਹਰ ਵਾਰ ਇਹ ਪਾਸਵਰਡ ਲਈ ਪੁੱਛੋ"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "ਪਾਸਵਰਡ ਨਹੀਂ ਚਾਹੀਦਾ ਹੈ"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_o)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "ਤੀਜੇ ਪੱਧਰ ਦਾ ਪਾਸਵਰਡ(_T):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "ਸੈਕੰਡਰੀ ਪਾਸਵਰਡ(_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "ਪਾਸਵਰਡ(_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "ਕਨੈਕਟ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "ਨਵਾਂ…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "ਕੋਈ ਨਹੀਂ"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "ਡਾਇਨੈਮਿਕ WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "ਬਣਾਓ(_r)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "Wi-Fi ਨੈੱਟਵਰਕ “%s“ ਵਰਤਣ ਲਈ ਪਾਸਵਰਡ ਜਾਂ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ ਦੀ ਲੋੜ ਹੈ।"
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi ਨੈੱਟਵਰਕ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi ਨੈੱਟਵਰਕ ਵਲੋਂ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "ਨਵਾਂ Wi-Fi ਨੈੱਟਵਰਕ ਬਣਾਓ"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "ਨਵਾਂ Wi-Fi ਨੈੱਟਵਰਕ"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Wi-Fi ਨੈੱਟਵਰਕ, ਜੋ ਤੁਸੀਂ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਲਈ ਨਾਂ ਦਿਓ।"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "ਲੁਕਵੇਂ Wi-Fi ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "ਲੁਕਵਾਂ Wi-Fi ਨੈੱਟਵਰਕ"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "ਲੁਕਵੇਂ Wi-Fi ਨੈੱਟਵਰਕ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਕਨੈਕਟ ਹੋਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਲਈ ਨਾਂ ਅਤੇ ਸੁਰੱਖਿਆ ਵੇਰਵਾ ਦਿਓ।"
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi ਸੁਰੱਖਿਆ(_s):"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "ਕਨੈਕਸ਼ਨ(_n):"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi ਅਡੈਪਟਰ(_a):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "ਮੈਨੂੰ ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਨਹੀਂ ਮਿਲਿਆ ਅਤੇ ਮੈਂ ਖੁਦ ਦੇਣਾ ਚਾਹੁੰਦਾ ਹਾਂ(_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "ਪਰੋਵਾਇਡਰ:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "ਦੇਸ਼ ਜਾਂ ਖੇਤਰ ਲਿਸਟ:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "ਦੇਸ਼ ਜਾਂ ਖੇਤਰ"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "ਤਾਰ"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC ਮਿਸ਼"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi ਸੁਰੱਖਿਆ(_s):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "ਨੈੱਟਵਰਕ ਨਾਂ(_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "ਕਨੈਕਸ਼ਨ(_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi ਅਡੈਪਟਰ(_a):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "ਵਰਤੋਂ:"
@@ -4272,25 +4746,25 @@ msgstr "ਕੋਈ CA ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਚੁਣਿਆ"
 msgid "selected CA certificate file does not exist"
 msgstr "ਚੁਣੀ ਗਈ CA ਸਰਟੀਫਿਕੇਟ ਫਾਇਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "ਗੁੰਮ EAP-FAST PAC ਫਾਇਲ"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "PAC ਫਾਇਲ ਚੁਣੋ"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ਫਾਇਲਾਂ (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
@@ -4329,16 +4803,16 @@ msgstr "_Inner ਪਰਮਾਣਕਿਤਾ:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ਆਟੋਮੈਟਿਕ PAC ਪਰੋਵਿਜ਼ਨਿੰਗ ਮਨਜ਼ੂਰ(_v)"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "ਗੁੰਮ EAP-LEAP ਵਰਤੋਂਕਾਰ-ਨਾਂ"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "ਗੁੰਮ EAP-LEAP ਪਾਸਵਰਡ"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4375,15 +4849,15 @@ msgstr ""
 msgid "_Domain"
 msgstr "ਡੋਮੇਨ(_D):"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "ਗੁੰਮ EAP ਵਰਤੋਂਕਾਰ-ਨਾਂ"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "ਗਲਤ EAP ਪਾਸਵਰਡ"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4397,23 +4871,23 @@ msgstr "WEP 128-ਬਿੱਟ ਸ਼ਬਦ"
 msgid "Sh_ow passphrase"
 msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_o)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "ਗੁੰਮ EAP-TLS ਪਛਾਣ"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "ਕੋਈ ਵਰਤੋਂਕਾਰ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਚੁਣਿਆ"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "ਚੁਣੀ ਗਈ ਵਰਤੋਂਕਾਰ ਸਰਟੀਫਿਕੇਟ ਫਾਇਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "ਕੋਈ ਕੁੰਜੀ ਨਹੀਂ ਚੁਣੀ"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "ਚੁਣੀ ਗਈ ਕੁੰਜੀ ਫਾਇਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
@@ -4422,7 +4896,7 @@ msgstr "ਚੁਣੀ ਗਈ ਕੁੰਜੀ ਫਾਇਲ ਮੌਜੂਦ ਨਹ
 msgid "I_dentity"
 msgstr "ਪਛਾਣ(_d):"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (EAP ਨਹੀਂ)"
 
@@ -4461,15 +4935,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "ਪਰਮਾਣਕਿਤਾ(_t):"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "leap-ਵਰਤੋਂਕਾਰ ਗੁੰਮ"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "ਗੁੰਮ ਲੀਪ-ਪਾਸਵਰਡ"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "ਗਲਤ EAP ਪਾਸਵਰਡ"
@@ -4479,22 +4953,22 @@ msgstr "ਗਲਤ EAP ਪਾਸਵਰਡ"
 msgid "_Type"
 msgstr "ਟਾਈਪ(_T):"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "wep-key ਗੁੰਮ"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4503,11 +4977,11 @@ msgstr ""
 "ਅਢੁੱਕਵੀਂ wep-key: ਗ਼ਲਤ %zu ਕੁੰਜੀ ਲੰਬਾਈ। ਕੁੰਜੀ ਦੀ ਲੰਬਾਈ ਜਾਂ ਤਾਂ 5/13 (ascii) ਜਾਂ 10/26 "
 "(ਹੈਕਸਾ) ਹੋ ਸਕਦੇ ਹਨ"
 
-#: src/wireless-security/ws-wep-key.c:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "ਅਢੁੱਕਵੀਂ wep-key: ਵਾਕ ਖਾਲੀ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "ਅਢੁੱਕਵੀਂ wep-key: ਵਾਕ 64-ਅੱਖਰਾਂ ਤੋਂ ਛੋਟਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
 
@@ -4537,7 +5011,7 @@ msgstr "ਕੁੰਜੀ ਵੇਖੋ(_w)"
 msgid "WEP inde_x"
 msgstr "WEP ਇੰਡੈਕਸ(_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4546,341 +5020,10 @@ msgstr ""
 "ਅਢੁੱਕਵੀਂ wpa-psk: ਕੁੰਜੀ-ਲੰਬਾਈ %zu ਅਵੈਧ ਹੈ। ਜਾਂ ਤਾਂ [8,63] ਬਾਈਟ ਜਾਂ 64 ਹੈਕਸਾ-ਅੰਕ ਹੋਣੀ "
 "ਚਾਹੀਦੀ ਹੈ।"
 
-#: src/wireless-security/ws-wpa-psk.c:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "ਅਢੁੱਕਵੀਂ wpa-psk: 64 ਬਾਈਟਾਂ ਨੂੰ ਹੈਕਸਾ ਨਾਲ ਅਰਥ ਕੱਢੇ ਨਹੀਂ ਜਾ ਸਕਦੇ"
 
-#~ msgid "No certificate set"
-#~ msgstr "ਕੋਈ CA ਸਰਟੀਫਿਕੇਟ ਸੈੱਟ ਨਹੀਂ"
-
-#~ msgid "No key set"
-#~ msgstr "ਕੋਈ ਕੁੰਜੀ ਸੈੱਟ ਨਹੀਂ ਹੈ"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "%s ਸਰਟੀਫਿਕੇਟ ਲਈ ਕੁੰਜੀ ਚੁਣੋ"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "%s ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ(_k):"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "%s ਕੁੰਜੀ ਪਾਸਵਰਡ(_p):"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "%s ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s ਸਰਟੀਫਿਕੇਟ(_c):"
-
-#~ msgid "My country is not listed"
-#~ msgstr "ਮੇਰਾ ਦੇਸ਼ ਲਿਸਟ ਵਿੱਚ ਨਹੀਂ ਹੈ"
-
-#~ msgid "Unlisted"
-#~ msgstr "ਬਿਨ-ਲਿਸਟ"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "ਮੇਰਾ ਪਲੈਨ ਲਿਸਟ 'ਚ ਨਹੀਂ ਹੈ…"
-
-#~ msgid "Provider"
-#~ msgstr "ਪਰੋਵਾਇਡਰ"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "ਇੰਸਟਾਲ ਕੀਤਾ GSM ਜੰਤਰ"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "ਇੰਸਟਾਲ ਕੀਤਾ CDMA ਜੰਤਰ"
-
-#~ msgid "Any device"
-#~ msgstr "ਕੋਈ ਵੀ ਜੰਤਰ"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "ਨਵਾਂ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "ਇਹ ਸਹਾਇਕ ਤੁਹਾਨੂੰ ਸੈਲੁਲਰ (3G) ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਸੈੱਟ ਕਰਨ ਲਈ ਮੱਦਦ ਕਰਦਾ ਹੈ।"
-
-#~ msgid "You will need the following information:"
-#~ msgstr "ਤੁਹਾਨੂੰ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਚਾਹੀਦੀ ਹੈ:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "ਤੁਹਾਡੇ ਬਰਾਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਦਾ ਨਾਂ"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "ਤੁਹਾਡਾ ਬਰਾਡਬੈਂਡ ਬਿੱਲ ਪਲੈਨ ਨਾਂ"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(ਕੁਝ ਹਾਲਤਾਂ ਵਿੱਚ) ਤੁਹਾਡਾ ਬਰਾਡਬੈਂਡ ਬਿੱਲ ਪਲੈਨ APN (ਅਸੈੱਸ ਪੁਆਇੰਟ ਨਾਂ)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "ਇਸ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਲਈ ਇੱਕ ਕਨੈਕਸ਼ਨ ਬਣਾਓ(_t):"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬਾਂਡ ਕਨੈਕਸ਼ਨ ਸੈੱਟਅੱਪ"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "ਦੇਸ਼ ਜਾਂ ਖੇਤਰ"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "ਆਪਣੇ ਪਰੋਵਾਇਡਰ ਦਾ ਦੇਸ਼ ਜਾਂ ਖੇਤਰ ਚੁਣੋ"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "ਲਿਸਟ ਤੋਂ ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਚੁਣੋ(_l):"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "ਮੈਨੂੰ ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਨਹੀਂ ਮਿਲਿਆ ਅਤੇ ਮੈਂ ਖੁਦ ਦੇਣਾ ਚਾਹੁੰਦਾ ਹਾਂ(_m):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr ""
-#~ "ਮੇਰਾ ਪਰੋਵਾਇਡਰ GSM ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ GPRS, EDGE, UMTS, HSDPA) ਵਰਤਦਾ ਹੈ।"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "ਮੇਰਾ ਪਰੋਵਾਇਡਰ CDMA ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ 1xRTT, EVDO) ਵਰਤਦਾ ਹੈ"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਚੁਣੋ"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "ਆਪਣਾ ਪਲੈਨ ਚੁਣੋ(_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "ਚੁਣਿਆ ਪਲੈਨ _APN (ਅਸੈੱਸ ਪੁਆਇੰਟ ਨੇਮ):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "ਸਾਵਧਾਨ: ਗਲਤ ਪਲੈਨ ਚੁਣਨ ਨਾਲ ਤੁਹਾਡੇ ਬਰਾਡਬੈਂਡ ਅਕਾਊਂਟ ਲਈ ਬਿੱਲ ਦਾ ਮੁੱਦਾ ਹੋ ਸਕਦਾ ਹੈ ਜਾਂ "
-#~ "ਕਨੈਕਟਵਿਟੀ ਰੁਕ ਸਕਦੀ ਹੈ।\n"
-#~ "\n"
-#~ "ਜੇ ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਲੈਨ ਬਾਰੇ ਪੱਕਾ ਪਤਾ ਨਾ ਹੋਵੇ ਤਾਂ ਆਪਣੇ ਪਰੋਵਾਇਡਰ ਨੂੰ ਆਪਣੇ ਪਲੈਨ ਦੇ APN ਬਾਰੇ ਪਤਾ "
-#~ "ਕਰੋ।"
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "ਆਪਣਾ ਬਿੱਲ ਪਲੈਨ ਚੁਣੋ"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "ਤੁਹਾਡਾ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਦੀ ਹੇਠ ਦਿੱਤੀ ਸੈਟਿੰਗ ਨਾਲ ਸੰਰਚਨਾ ਕੀਤੀ ਗਈ ਹੈ।"
-
-#~ msgid "Your Device:"
-#~ msgstr "ਤੁਹਾਡਾ ਜੰਤਰ:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "ਤੁਹਾਡਾ ਪਰੋਵਾਇਡਰ:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "ਤੁਹਾਡਾ ਪਲੈਨ:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "ਤੁਹਾਡੇ ਵਲੋਂ ਚੁਣੀ ਸੈਟਿੰਗਾਂ ਨਾਲ ਤੁਹਾਡੇ ਮੋਬਾਇਲ ਬਰਾਂਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਨਾਲ ਕਨੈਕਸ਼ਨ ਬਣਾਇਆ ਜਾਵੇਗਾ। ਜੇ "
-#~ "ਕਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ ਜਾਂ ਤੁਸੀਂ ਨੈੱਟਵਰਕ ਸਰੋਤਾਂ ਨੂੰ ਨਾ ਅਸੈੱਸ ਕਰ ਸਕੇ ਤਾਂ ਆਪਣੀ ਸੈਟਿੰਗਾਂ ਫੇਰ ਚੈੱਕ ਕਰੋ। "
-#~ "ਆਪਣੀ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਸੈਟਿੰਗ ਨੂੰ ਸੋਧਣ ਲਈ, ਸਿਸਟਮ → ਪਸੰਦ ਮੇਨੂ ਤੋਂ ”ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ” ਚੁਣੋ। "
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਸੈਟਿੰਗ ਪੁਸ਼ਟੀ"
-
-#~ msgid "(None)"
-#~ msgstr "(ਕੋਈ ਨਹੀਂ)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "%s ਵਿੱਚ ਕੁੰਜੀ"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "%s ਵਿੱਚ ਸਰਟੀਫਿਕੇਟ"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(ਅਣਪਛਾਤਾ)"
-
-#~ msgid "Select"
-#~ msgstr "ਚੁਣੋ"
-
-#~ msgid "Cancel"
-#~ msgstr "ਰੱਦ ਕਰੋ"
-
-#~ msgid "Select from file…"
-#~ msgstr "ਫਾਇਲ ਤੋਂ ਚੁਣੋ…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "%s ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "%s ਸਰਟੀਫਿਕੇਟ ਪਾਸਵਰਡ(_p):"
-
-#~ msgid "Error logging in: "
-#~ msgstr "ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "ਸ਼ੈਸ਼ਨ ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#~ msgid "_Unlock token"
-#~ msgstr "ਅਣ-ਲਾਕ ਟੋਕਨ(_U)"
-
-#~ msgid "Issued By"
-#~ msgstr "ਜਾਰੀ ਕੀਤਾ ਵਲੋਂ"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "%s ਪਿੰਨ ਦਿਓ"
-
-#~ msgid "_Login"
-#~ msgstr "ਲਾਗਇਨ(_L)"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "ਪਿੰਨ ਯਾਦ ਰੱਖੋ(_R)"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "ਸਿਰਫ਼ ਇਹ ਵਰਤੋਂਕਾਰ ਲਈ ਹੀ ਪਾਸਵਰਡ ਸੰਭਾਲੋ"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "ਸਭ ਵਰਤੋਂਕਾਰਾਂ ਲਈ ਹੀ ਪਾਸਵਰਡ ਸੰਭਾਲੋ"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "ਹਰ ਵਾਰ ਇਹ ਪਾਸਵਰਡ ਲਈ ਪੁੱਛੋ"
-
-#~ msgid "The password is not required"
-#~ msgstr "ਪਾਸਵਰਡ ਨਹੀਂ ਚਾਹੀਦਾ ਹੈ"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_o)"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "ਤੀਜੇ ਪੱਧਰ ਦਾ ਪਾਸਵਰਡ(_T):"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "ਸੈਕੰਡਰੀ ਪਾਸਵਰਡ(_S):"
-
-#~ msgid "_Password:"
-#~ msgstr "ਪਾਸਵਰਡ(_P):"
-
-#~ msgid "Click to connect"
-#~ msgstr "ਕਨੈਕਟ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
-
-#~ msgid "New…"
-#~ msgstr "ਨਵਾਂ…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "ਕੋਈ ਨਹੀਂ"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "ਡਾਇਨੈਮਿਕ WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "ਬਣਾਓ(_r)"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr "Wi-Fi ਨੈੱਟਵਰਕ “%s“ ਵਰਤਣ ਲਈ ਪਾਸਵਰਡ ਜਾਂ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ ਦੀ ਲੋੜ ਹੈ।"
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wi-Fi ਨੈੱਟਵਰਕ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Wi-Fi ਨੈੱਟਵਰਕ ਵਲੋਂ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "ਨਵਾਂ Wi-Fi ਨੈੱਟਵਰਕ ਬਣਾਓ"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "ਨਵਾਂ Wi-Fi ਨੈੱਟਵਰਕ"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Wi-Fi ਨੈੱਟਵਰਕ, ਜੋ ਤੁਸੀਂ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਲਈ ਨਾਂ ਦਿਓ।"
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "ਲੁਕਵੇਂ Wi-Fi ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "ਲੁਕਵਾਂ Wi-Fi ਨੈੱਟਵਰਕ"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "ਲੁਕਵੇਂ Wi-Fi ਨੈੱਟਵਰਕ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਕਨੈਕਟ ਹੋਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਲਈ ਨਾਂ ਅਤੇ ਸੁਰੱਖਿਆ ਵੇਰਵਾ ਦਿਓ।"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wi-Fi ਸੁਰੱਖਿਆ(_s):"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "ਕਨੈਕਸ਼ਨ(_n):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-Fi ਅਡੈਪਟਰ(_a):"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "ਮੈਨੂੰ ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਨਹੀਂ ਮਿਲਿਆ ਅਤੇ ਮੈਂ ਖੁਦ ਦੇਣਾ ਚਾਹੁੰਦਾ ਹਾਂ(_m):"
-
-#~ msgid "Provider:"
-#~ msgstr "ਪਰੋਵਾਇਡਰ:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "ਦੇਸ਼ ਜਾਂ ਖੇਤਰ ਲਿਸਟ:"
-
-#~ msgid "Country or region"
-#~ msgstr "ਦੇਸ਼ ਜਾਂ ਖੇਤਰ"
-
-#~ msgid "Wired"
-#~ msgstr "ਤਾਰ"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC ਮਿਸ਼"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wi-Fi ਸੁਰੱਖਿਆ(_s):"
-
-#~ msgid "_Network name:"
-#~ msgstr "ਨੈੱਟਵਰਕ ਨਾਂ(_N):"
-
-#~ msgid "C_onnection:"
-#~ msgstr "ਕਨੈਕਸ਼ਨ(_n):"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-Fi ਅਡੈਪਟਰ(_a):"
-
 #, fuzzy
 #~ msgid "CKN"
 #~ msgstr "CKN:"
diff --git a/po/pl.po b/po/pl.po
index 6521f931..510dc103 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2019-06-30 15:42+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag gmail com>\n"
 "Language-Team: Polish <community-poland mozilla org>\n"
@@ -24,6 +24,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Sieć"
 
@@ -221,15 +222,19 @@ msgstr "Uwierzytelnianie 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "P_ołącz"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Nazwa sieci"
 
@@ -580,7 +585,7 @@ msgstr "Komórkowe (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Komórkowe"
 
@@ -702,7 +707,9 @@ msgstr "Uwierzytelnianie DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_OK"
 
@@ -807,6 +814,7 @@ msgid "Error displaying connection information:"
 msgstr "Błąd podczas wyświetlania informacji o połączeniu:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -952,7 +960,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Hotspot"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "Hasło"
 
@@ -976,7 +984,8 @@ msgstr "Baner VPN"
 msgid "Base Connection"
 msgstr "Podstawowe połączenie"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Nieznane"
 
@@ -1742,6 +1751,7 @@ msgstr "U_sługa"
 
 # checkbox
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2394,6 +2404,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Zezwolenie na _roaming, jeśli sieć domowa nie jest dostępna"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Wyświetlanie haseł"
 
@@ -2806,13 +2817,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3133,12 +3145,12 @@ msgstr ""
 "obsługę niektórych metod."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3148,22 +3160,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Łączenie"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Zespołowe"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Mostek"
 
@@ -3458,6 +3473,7 @@ msgid "Select a connection to delete"
 msgstr "Wybierz połączenie do usunięcia"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nazwa"
 
@@ -3668,6 +3684,8 @@ msgstr "Połączenie ethernetowe %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Domyślne"
 
@@ -3894,35 +3912,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Dostawca używa technologii opartej na C_DMA (np. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4080,10 +4098,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Połączenie Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "40/128-bitowy klucz WEP (szesnastkowy lub ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "128-bitowe hasło WEP"
 
@@ -4092,14 +4112,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamiczny WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA i WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA i WPA2 Personal"
@@ -4174,6 +4197,461 @@ msgstr "Informacje o połączeniu"
 msgid "_Close"
 msgstr "Za_mknij"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+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/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Nie ustawiono certyfikatu"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Nie ustawiono klucza"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Wybór klucza dla certyfikatu %s"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "_Klucz prywatny %s"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "_Hasło klucza %s"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Wybór certyfikatu %s"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "_Certyfikat %s"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Kraju nie ma na liście"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Nie na liście"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Planu nie ma na liście…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Dostawca"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Zainstalowane urządzenie GSM"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Zainstalowane urządzenie CDMA"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Dowolne urządzenie"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nowe połączenie komórkowe"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Ten asystent pomaga w łatwym ustawieniu połączenia komórkowego z siecią 3G."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Wymagane są następujące informacje:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Nazwa dostawcy połączenia komórkowego"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Nazwa planu taryfowego"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(w niektórych przypadkach) nazwa punktu dostępowego (APN) planu taryfowego"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Utworzenie połączenia dla _tego urządzenia komórkowego:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Ustawienie połączenia komórkowego"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "Kraj lub region:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Wybór kraju lub regionu dostawcy"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "P_roszę wybrać dostawcę z listy:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Dostawcy nie _ma na liście, należy ustawić połączenie ręcznie:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Dostawca używa technologii GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Dostawca używa technologii CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Wybór dostawcy"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "Pro_szę wybrać plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "N_azwa punktu dostępowego (APN) wybranego planu:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Ostrzeżenie: wybranie niepoprawnego planu może spowodować problemy taryfowe "
+"dla konta komórkowego lub zakłócić łączność.\n"
+"\n"
+"W razie wątpliwości dotyczących planu należy zapytać dostawcę o APN planu."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Proszę wybrać plan taryfowy"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Połączenie komórkowe zostało skonfigurowane za pomocą poniższych ustawień:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Urządzenie:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Dostawca:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Zostanie utworzone połączenie do dostawcy Internetu za pomocą wybranych "
+"ustawień. Jeśli połączenie nie powiedzie się lub nie będzie można uzyskać "
+"dostępu do zasobów sieciowych, należy powtórnie sprawdzić ustawienia. Aby je "
+"zmodyfikować, należy wybrać „Połączenia sieciowe” z menu System → "
+"Preferencje."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Potwierdzenie ustawień połączenia komórkowego"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Brak)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Klucz w %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certyfikat w %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Nieznane)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Wybierz"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Wybierz z pliku…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Wybór certyfikatu %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Hasło certyfikatu %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Błąd podczas logowania: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Błąd podczas otwierania sesji: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Odblokuj token"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Wystawiony przez"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Kod PIN %s"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Zaloguj"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "Zapamiętanie kodu _PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Przechowywanie hasła tylko dla tego użytkownika"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Przechowywanie hasła dla wszystkich użytkowników"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Pytanie o hasło za każdym razem"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Hasło nie jest wymagane"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "_Wyświetlanie haseł"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Trzecie hasło:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Drugie hasło:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Hasło:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Kliknięcie połączy"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Nowe…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Brak"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamiczny WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Utwórz"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Do połączenia z siecią Wi-Fi „%s” wymagane są hasła lub klucze szyfrujące."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wymagane uwierzytelnienie w sieci Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wymagane uwierzytelnienie w sieci Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Tworzenie nowej sieci Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nowa sieć Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Proszę wprowadzić nazwę sieci Wi-Fi, jaka ma zostać utworzona."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Połączenie z ukrytą siecią Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Ukryta sieć Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+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/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Zabezpieczenia sieci _Wi-Fi"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "Połącze_nie"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adapter Wi-Fi"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Dostawcy nie _ma na liście, należy wprowadzić go ręcznie:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Dostawca:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Lista krajów lub regionów:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Kraj lub region"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Przewodowe"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "Kratowe OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%2$s (%1$s)"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Brak hasła lub połączenie jest nieprawidłowe. W tym drugim przypadku należy "
+"najpierw zmodyfikować połączenie za pomocą programu nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Zabezpieczenia sieci _Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nazwa sieci:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Połącze_nie:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adapter Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Użycie:"
@@ -4323,25 +4801,25 @@ msgstr "nie wybrano certyfikatu CA"
 msgid "selected CA certificate file does not exist"
 msgstr "wybrany plik certyfikatu CA nie istnieje"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "brak pliku PAC EAP-FAST"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Wybór pliku PAC"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Pliki PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Wszystkie pliki"
 
@@ -4377,16 +4855,16 @@ msgstr "Wewnętrzne uw_ierzytelnianie"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Automatyczne za_bezpieczanie PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "brak nazwy użytkownika EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "brak hasła EAP-LEAP"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4421,15 +4899,15 @@ msgstr "Przyrostek nazwy certyfikatu serwera."
 msgid "_Domain"
 msgstr "_Domena"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "brak nazwy użytkownika EAP"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "brak hasła EAP"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "brak hasła klucza prywatnego klienta EAP"
 
@@ -4441,23 +4919,23 @@ msgstr "Hasło klucza p_rywatnego"
 msgid "Sh_ow passphrase"
 msgstr "_Wyświetlanie hasła"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "brak tożsamości EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "nie wybrano certyfikatu użytkownika"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "wybrany plik certyfikatu użytkownika nie istnieje"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "nie wybrano klucza"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "wybrany plik klucza nie istnieje"
 
@@ -4465,7 +4943,7 @@ msgstr "wybrany plik klucza nie istnieje"
 msgid "I_dentity"
 msgstr "_Tożsamość"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP)"
 
@@ -4503,15 +4981,15 @@ msgstr "Skonfigurowane zewnętrznie"
 msgid "Au_thentication"
 msgstr "Uwierzy_telnianie"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "brak „leap-username”"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "brak „leap-password”"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "brak hasła EAP"
@@ -4520,25 +4998,25 @@ msgstr "brak hasła EAP"
 msgid "_Type"
 msgstr "_Typ"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "brak „wep-key”"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4547,11 +5025,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 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"
 
@@ -4580,7 +5058,7 @@ msgstr "_Wyświetlanie klucza"
 msgid "WEP inde_x"
 msgstr "Inde_ks WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4589,351 +5067,8 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
-
-#~ 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>"
-
-#~ msgid "No certificate set"
-#~ msgstr "Nie ustawiono certyfikatu"
-
-#~ msgid "No key set"
-#~ msgstr "Nie ustawiono klucza"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Wybór klucza dla certyfikatu %s"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "_Klucz prywatny %s"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Hasło klucza %s"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Wybór certyfikatu %s"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Certyfikat %s"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Kraju nie ma na liście"
-
-#~ msgid "Unlisted"
-#~ msgstr "Nie na liście"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Planu nie ma na liście…"
-
-#~ msgid "Provider"
-#~ msgstr "Dostawca"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Zainstalowane urządzenie GSM"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Zainstalowane urządzenie CDMA"
-
-#~ msgid "Any device"
-#~ msgstr "Dowolne urządzenie"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nowe połączenie komórkowe"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Ten asystent pomaga w łatwym ustawieniu połączenia komórkowego z siecią "
-#~ "3G."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Wymagane są następujące informacje:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Nazwa dostawcy połączenia komórkowego"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Nazwa planu taryfowego"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(w niektórych przypadkach) nazwa punktu dostępowego (APN) planu taryfowego"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Utworzenie połączenia dla _tego urządzenia komórkowego:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Ustawienie połączenia komórkowego"
-
-#~ msgid "Country or region:"
-#~ msgstr "Kraj lub region:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Wybór kraju lub regionu dostawcy"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "P_roszę wybrać dostawcę z listy:"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Dostawcy nie _ma na liście, należy ustawić połączenie ręcznie:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Dostawca używa technologii GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Dostawca używa technologii CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Wybór dostawcy"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "Pro_szę wybrać plan:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "N_azwa punktu dostępowego (APN) wybranego planu:"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Ostrzeżenie: wybranie niepoprawnego planu może spowodować problemy "
-#~ "taryfowe dla konta komórkowego lub zakłócić łączność.\n"
-#~ "\n"
-#~ "W razie wątpliwości dotyczących planu należy zapytać dostawcę o APN planu."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Proszę wybrać plan taryfowy"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Połączenie komórkowe zostało skonfigurowane za pomocą poniższych ustawień:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Urządzenie:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Dostawca:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Plan:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Zostanie utworzone połączenie do dostawcy Internetu za pomocą wybranych "
-#~ "ustawień. Jeśli połączenie nie powiedzie się lub nie będzie można uzyskać "
-#~ "dostępu do zasobów sieciowych, należy powtórnie sprawdzić ustawienia. Aby "
-#~ "je zmodyfikować, należy wybrać „Połączenia sieciowe” z menu System → "
-#~ "Preferencje."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Potwierdzenie ustawień połączenia komórkowego"
-
-#~ msgid "(None)"
-#~ msgstr "(Brak)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Klucz w %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certyfikat w %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Nieznane)"
-
-#~ msgid "Select"
-#~ msgstr "Wybierz"
-
-#~ msgid "Cancel"
-#~ msgstr "Anuluj"
-
-#~ msgid "Select from file…"
-#~ msgstr "Wybierz z pliku…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Wybór certyfikatu %s"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Hasło certyfikatu %s"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Błąd podczas logowania: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Błąd podczas otwierania sesji: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Odblokuj token"
-
-#~ msgid "Issued By"
-#~ msgstr "Wystawiony przez"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Kod PIN %s"
-
-#~ msgid "_Login"
-#~ msgstr "_Zaloguj"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "Zapamiętanie kodu _PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Przechowywanie hasła tylko dla tego użytkownika"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Przechowywanie hasła dla wszystkich użytkowników"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Pytanie o hasło za każdym razem"
-
-#~ msgid "The password is not required"
-#~ msgstr "Hasło nie jest wymagane"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "_Wyświetlanie haseł"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Trzecie hasło:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Drugie hasło:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Hasło:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Kliknięcie połączy"
-
-#~ msgid "New…"
-#~ msgstr "Nowe…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Brak"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynamiczny WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Utwórz"
-
-#, 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."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wymagane uwierzytelnienie w sieci Wi-Fi"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Wymagane uwierzytelnienie w sieci Wi-Fi"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Tworzenie nowej sieci Wi-Fi"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nowa sieć Wi-Fi"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Proszę wprowadzić nazwę sieci Wi-Fi, jaka ma zostać utworzona."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Połączenie z ukrytą siecią Wi-Fi"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Ukryta sieć Wi-Fi"
-
-#~ 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."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Zabezpieczenia sieci _Wi-Fi"
-
-#~ msgid "C_onnection"
-#~ msgstr "Połącze_nie"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Adapter Wi-Fi"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Dostawcy nie _ma na liście, należy wprowadzić go ręcznie:"
-
-#~ msgid "Provider:"
-#~ msgstr "Dostawca:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Lista krajów lub regionów:"
-
-#~ msgid "Country or region"
-#~ msgstr "Kraj lub region"
-
-#~ msgid "Wired"
-#~ msgstr "Przewodowe"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "Kratowe OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%2$s (%1$s)"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Brak hasła lub połączenie jest nieprawidłowe. W tym drugim przypadku "
-#~ "należy najpierw zmodyfikować połączenie za pomocą programu nm-connection-"
-#~ "editor"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Zabezpieczenia sieci _Wi-Fi:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nazwa sieci:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Połącze_nie:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Adapter Wi-Fi:"
diff --git a/po/pt.po b/po/pt.po
index 18950e9a..299b79d3 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: 3.8\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2015-12-19 08:19+0000\n"
 "Last-Translator: Pedro Albuquerque <palbuquerque73 gmail com>\n"
 "Language-Team: Português <palbuquerque73 gmail com>\n"
@@ -22,6 +22,7 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.6\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Rede"
 
@@ -222,15 +223,19 @@ msgstr "Autenticação 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Ligar"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Nome da rede:"
@@ -582,7 +587,7 @@ msgstr "Banda larga móvel (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Banda larga móvel"
 
@@ -706,7 +711,9 @@ msgstr "Autenticação DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_Aceitar"
 
@@ -812,6 +819,7 @@ msgid "Error displaying connection information:"
 msgstr "Erro ao mostrar informação de ligação:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -961,7 +969,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Hotspot"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Senha:"
@@ -986,7 +994,8 @@ msgstr "Anúncio VPN"
 msgid "Base Connection"
 msgstr "Ligação base"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -1765,6 +1774,7 @@ msgid "_Service"
 msgstr "_Serviço:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2427,6 +2437,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Permitir _Roaming se a rede doméstica não estiver disponível"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Mostrar senhas"
 
@@ -2832,13 +2843,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3164,12 +3176,12 @@ msgstr ""
 "métodos."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3179,22 +3191,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Associar"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Equipa"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Ponte"
 
@@ -3494,6 +3509,7 @@ msgid "Select a connection to delete"
 msgstr "Ligação de equipa %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nome"
 
@@ -3711,6 +3727,8 @@ msgstr "Ligação ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Predefinição"
 
@@ -3945,35 +3963,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "O meu fornecedor utiliza tecnologia baseada em C_DMA (ex: 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4138,10 +4156,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Ligação Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Chave WEP 40/128-bit (Hex ou ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase-passe WEP 128-bit"
 
@@ -4150,14 +4170,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP Dinâmico (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 pessoal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 empresarial"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 pessoal"
@@ -4234,6 +4257,488 @@ msgstr "Informação de ligação"
 msgid "_Close"
 msgstr "_Fechar"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Não é necessá_Rio um certificado CA"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Escolha o Certificado CA"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "_Chave privada:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Senha da chave _Privada:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Escolha o Certificado CA"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Certificado do _Utilizador:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "O meu país não está listado"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Não listado"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "O meu plano não está listado..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Fornecedor"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Dispositivo GSM instalado"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Dispositivo CDMA instalado"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Qualquer dispositivo"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nova ligação de banda larga móvel"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Este assistente ajuda-o a configurar facilmente uma ligação de banda larga "
+"móvel a uma rede de telemóvel (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Precisará da seguinte informação:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "O nome do seu fornecedor de banda larga"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "O nome do seu tarifário de banda larga"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(em alguns casos) O APN (Nome do Ponto de Acesso) do seu tarifário de banda "
+"larga"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Criar uma ligação para es_Te dispositivo de banda larga móvel:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Configurar uma ligação de banda larga móvel"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "País ou região"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Escolha o país ou região do seu fornecedor"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Selecione o seu fornecedor da _Lista:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"Não consigo encontrar o meu fornecedor e quero introduzi-lo _Manualmente:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "O meu fornecedor utiliza tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "O meu fornecedor utiliza tecnologia CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Escolha o seu fornecedor"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Selecione o seu plano:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Selecione o seu plano _APN (Nome do Ponto de Acesso):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Aviso: selecionar um plano incorreto pode resultar em problemas de faturação "
+"para a sua conta conta de banda larga ou pode impedir a ligação.\n"
+"\n"
+"Se não tem a certeza do seu plano por favor pergunte ao seu fornecedor o APN "
+"do seu plano."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Escolha o seu tarifário"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"A sua ligação de banda larga móvel está configurada com as seguintes "
+"definições:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "O seu dispositivo:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "O seu fornecedor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "O seu plano:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Uma ligação será agora estabelecida com o seu fornecedor de banda larga "
+"móvel utilizando as definições selecionadas. Se a ligação falhar ou não "
+"conseguir aceder aos recursos da rede, verifique novamente as definições. "
+"Para modificar as definições da sua ligação de banda larga móvel, escolha "
+"\"Novas ligações\" a partir do menu Sistema >> Preferências."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirme as definições da banda larga móvel"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(nenhum)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Certificado C_A:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Desconhecido"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Selecione Um Ficheiro"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+#, fuzzy
+msgid "Cancel"
+msgstr "_Cancelar"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Selecione Um Ficheiro"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Escolha o Certificado CA"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Certificado do _Utilizador:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Erro ao editar ligação"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Destrancar"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Armazenar a senha só para este utilizador"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Armazenar a senha para todos os utilizadores"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Pedir a senha todas as vezes"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "A senha não é necessária"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "M_Ostrar senhas"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Senha terciária:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Senha secundária:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Senha:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Clique para ligar"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Nenhum"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP Dinâmico (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_Riar"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Senhas ou chaves de encriptação são necessárias para aceder à rede Wi-Fi \"%s"
+"\"."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Autenticação de rede Wi-Fi necessária"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Autenticação pedida pela rede Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Criar uma nova rede Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nova rede Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Insira um nome para a rede Wi-Fi que deseja criar."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Ligar a uma rede Wi-Fi oculta"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Rede Wi-Fi oculta"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Insira o nome e detalhes de segurança da rede Wi-Fi oculta a que se quer "
+"ligar."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Segurança Wi-Fi:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Ligaçã_O:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Dispositivo de rede Wi-Fi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"Não consigo encontrar o meu fornecedor e quero introduzi-lo _Manualmente:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Fornecedor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Lista de países ou regiões:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "País ou região"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Com fios"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "Malha OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Ou está uma senha em falta ou a ligação é inválida. No último caso, tem de "
+"editar a ligação com o nm-connection-editor primeiro."
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Segurança Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nome da rede:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Ligaçã_O:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Dispositivo de rede Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Uso:"
@@ -4384,26 +4889,26 @@ msgstr "Não é necessá_Rio um certificado CA"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "ficheiro EAP-FAST PAC em falta"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Escolha um ficheiro PAC..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Ficheiros PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Todos os ficheiros"
 
@@ -4442,16 +4947,16 @@ msgstr "Autenticação _Interna:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir apro_Visionamento PAC automático"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "Utilizador EAP-LEAP em falta"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "Senha EAP-LEAP em falta"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4487,15 +4992,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "Utilizador EAP em falta"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "Senha EAP em falta"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4509,24 +5014,24 @@ msgstr "Frase-passe WEP 128-bit"
 msgid "Sh_ow passphrase"
 msgstr "Apresentar a frase-senha"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "Identidade EAP-TLS em falta"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Não é necessá_Rio um certificado CA"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4535,7 +5040,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_Dentidade:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4575,15 +5080,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Au_Tenticação:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "leap-username em falta"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "leap-password em falta"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Senha EAP em falta"
@@ -4593,18 +5098,18 @@ msgstr "Senha EAP em falta"
 msgid "_Type"
 msgstr "_Tipo:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "wep-key em falta"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4612,7 +5117,7 @@ msgstr ""
 "wep-key inválida: chave com comprimento de %zu só pode conter caracteres "
 "ascii"
 
-#: src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4621,11 +5126,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 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"
 
@@ -4655,7 +5160,7 @@ msgstr "Mos_Trar chave"
 msgid "WEP inde_x"
 msgstr "Índice _WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4664,351 +5169,12 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Não é necessá_Rio um certificado CA"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Escolha o Certificado CA"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "_Chave privada:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Senha da chave _Privada:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Escolha o Certificado CA"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Certificado do _Utilizador:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "O meu país não está listado"
-
-#~ msgid "Unlisted"
-#~ msgstr "Não listado"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "O meu plano não está listado..."
-
-#~ msgid "Provider"
-#~ msgstr "Fornecedor"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Dispositivo GSM instalado"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Dispositivo CDMA instalado"
-
-#~ msgid "Any device"
-#~ msgstr "Qualquer dispositivo"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nova ligação de banda larga móvel"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Este assistente ajuda-o a configurar facilmente uma ligação de banda "
-#~ "larga móvel a uma rede de telemóvel (3G)."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Precisará da seguinte informação:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "O nome do seu fornecedor de banda larga"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "O nome do seu tarifário de banda larga"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(em alguns casos) O APN (Nome do Ponto de Acesso) do seu tarifário de "
-#~ "banda larga"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Criar uma ligação para es_Te dispositivo de banda larga móvel:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Configurar uma ligação de banda larga móvel"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "País ou região"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Escolha o país ou região do seu fornecedor"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Selecione o seu fornecedor da _Lista:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "Não consigo encontrar o meu fornecedor e quero introduzi-lo _Manualmente:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "O meu fornecedor utiliza tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "O meu fornecedor utiliza tecnologia CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Escolha o seu fornecedor"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Selecione o seu plano:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Selecione o seu plano _APN (Nome do Ponto de Acesso):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Aviso: selecionar um plano incorreto pode resultar em problemas de "
-#~ "faturação para a sua conta conta de banda larga ou pode impedir a "
-#~ "ligação.\n"
-#~ "\n"
-#~ "Se não tem a certeza do seu plano por favor pergunte ao seu fornecedor o "
-#~ "APN do seu plano."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Escolha o seu tarifário"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "A sua ligação de banda larga móvel está configurada com as seguintes "
-#~ "definições:"
-
-#~ msgid "Your Device:"
-#~ msgstr "O seu dispositivo:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "O seu fornecedor:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "O seu plano:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Uma ligação será agora estabelecida com o seu fornecedor de banda larga "
-#~ "móvel utilizando as definições selecionadas. Se a ligação falhar ou não "
-#~ "conseguir aceder aos recursos da rede, verifique novamente as definições. "
-#~ "Para modificar as definições da sua ligação de banda larga móvel, escolha "
-#~ "\"Novas ligações\" a partir do menu Sistema >> Preferências."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Confirme as definições da banda larga móvel"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(nenhum)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certificado C_A:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Desconhecido"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "Selecione Um Ficheiro"
-
-#, fuzzy
-#~ msgid "Cancel"
-#~ msgstr "_Cancelar"
-
-#, fuzzy
-#~ msgid "Select from file…"
-#~ msgstr "Selecione Um Ficheiro"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Escolha o Certificado CA"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Certificado do _Utilizador:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Erro ao editar ligação"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Destrancar"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Armazenar a senha só para este utilizador"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Armazenar a senha para todos os utilizadores"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Pedir a senha todas as vezes"
-
-#~ msgid "The password is not required"
-#~ msgstr "A senha não é necessária"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "M_Ostrar senhas"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Senha terciária:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Senha secundária:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Senha:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Clique para ligar"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Nenhum"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP Dinâmico (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "C_Riar"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Senhas ou chaves de encriptação são necessárias para aceder à rede Wi-Fi "
-#~ "\"%s\"."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Autenticação de rede Wi-Fi necessária"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Autenticação pedida pela rede Wi-Fi"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Criar uma nova rede Wi-Fi"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nova rede Wi-Fi"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Ligar a uma rede Wi-Fi oculta"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Rede Wi-Fi oculta"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Insira o nome e detalhes de segurança da rede Wi-Fi oculta a que se quer "
-#~ "ligar."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Segurança Wi-Fi:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Ligaçã_O:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Dispositivo de rede Wi-Fi:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "Não consigo encontrar o meu fornecedor e quero introduzi-lo _Manualmente:"
-
-#~ msgid "Provider:"
-#~ msgstr "Fornecedor:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Lista de países ou regiões:"
-
-#~ msgid "Country or region"
-#~ msgstr "País ou região"
-
-#~ msgid "Wired"
-#~ msgstr "Com fios"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "Malha OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Ou está uma senha em falta ou a ligação é inválida. No último caso, tem "
-#~ "de editar a ligação com o nm-connection-editor primeiro."
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Segurança Wi-Fi:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nome da rede:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Ligaçã_O:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Dispositivo de rede Wi-Fi:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (predefinição)"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 27580539..3ef965b3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -24,7 +24,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\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"
@@ -37,6 +37,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Rede"
 
@@ -242,15 +243,19 @@ msgstr "Autenticação 802.1x"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Nome da rede"
 
@@ -594,7 +599,7 @@ msgstr "Banda larga móvel (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Banda larga móvel"
 
@@ -715,7 +720,9 @@ msgstr "Autenticação DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_OK"
 
@@ -819,6 +826,7 @@ msgid "Error displaying connection information:"
 msgstr "Erro ao exibir informações de conexão:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -964,7 +972,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Ponto de acesso"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "Senha"
 
@@ -988,7 +996,8 @@ msgstr "Mensagem VPN"
 msgid "Base Connection"
 msgstr "Conexão base"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -1756,6 +1765,7 @@ msgid "_Service"
 msgstr "_Serviço"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2421,6 +2431,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Permitir _roaming se a rede doméstica não estiver disponível"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Mostrar senhas"
 
@@ -2836,13 +2847,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3162,12 +3174,12 @@ msgstr ""
 "autenticação. Se a conexão falhar, tente desabilitar alguns métodos."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3177,23 +3189,26 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Agregação"
 
 # Link agreggation = Team Network
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Equipe"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Ponte"
 
@@ -3489,6 +3504,7 @@ msgid "Select a connection to delete"
 msgstr "Selecione uma conexão para excluir"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nome"
 
@@ -3700,6 +3716,8 @@ msgstr "Conexão Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Padrão"
 
@@ -3926,35 +3944,35 @@ msgstr "Meu provedor usa tecnologia _GSM (ex.: 3G, GPRS, EDGE, UMTS, HSDPA)"
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Meu provedor usa tecnologias baseadas em C_DMA (ex.: 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4112,10 +4130,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Conexão Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Chave WEP de 40/128 bits ASCII (Hexadecimal ou ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase secreta do WEP de 128 bits"
 
@@ -4124,14 +4144,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinâmico (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 pessoal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 empresas"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 pessoal"
@@ -4207,6 +4230,464 @@ msgstr "Informações da conexão"
 msgid "_Close"
 msgstr "_Fechar"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr "Leia com seu telefone ou <a href=\"nma:print\">imprima</a>"
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Nenhum certificado definido"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Nenhuma chave definida"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Escolha uma chave para certificado de %s"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "Chave _privada de %s"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "_Senha da chave de %s"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Escolha o certificado de %s"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "_Certificado de %s"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Meu país não está listado"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Não listado"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Meu plano não está listado…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Provedor"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Dispositivo GSM instalado"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Dispositivo CDMA instalado"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Qualquer dispositivo"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nova conexão de banda larga móvel"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Este assistente lhe ajudará a configurar uma conexão de banda larga móvel à "
+"uma rede de celular (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Você precisará das seguintes informações:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "O nome do seu provedor de banda larga"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "O nome do seu plano de banda larga"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(em alguns casos) O APN (Nome do Ponto de Acesso) do seu plano de banda larga"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "_Criar uma conexão para este dispositivo móvel:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Configurar uma conexão de banda larga móvel"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "País ou região:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Escolha o país ou região do seu provedor"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Escolha seu provedor a partir de uma _lista:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Não localizei _meu provedor e quero configurar a conexão manualmente:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Meu provedor usa tecnologia GSM (3G, GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Meu provedor usa tecnologia CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Escolha seu provedor"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Escolha seu plano:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Nome do ponto de acesso) do plano escolhido:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Aviso: Escolher um plano errado pode resultar em problemas tarifários na sua "
+"conta ou pode impedir a conectividade.\n"
+"\n"
+"Se você não sabe ao certo qual o seu plano, pergunte ao seu provedor pelo "
+"APN do seu plano."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Escolha seu plano"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Sua conexão de banda larga móvel está configurada da seguinte maneira:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Seu dispositivo:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Seu provedor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Seu plano:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Agora será feita uma conexão ao seu provedor de banda larga móvel usando as "
+"configurações que você selecionou. Se a conexão falhar ou você não conseguir "
+"acessar os recursos de rede, confira suas configurações. Para modificar as "
+"configurações da rede de banda larga móvel, escolha “Conexões de rede” de "
+"Sistema → Preferências."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmação das configurações de banda larga móvel"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Nenhum)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Chave em %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certificado em %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Desconhecido)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Selecionar"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Selecionar do arquivo…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Escolha um certificado de %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "_Senha de certificado de %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Erro ao autenticar: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Erro ao abrir uma sessão: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Desbloquear token"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Emitido por"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Digite PIN de %s"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "A_utenticar"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Lembrar do PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Armazenar a senha apenas para este usuário"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Armazenar a senha para todos os usuários"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Pedir esta senha todas as vezes"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "A senha não é necessária"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "M_ostrar senhas"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "Senha _terciária:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Senha secundária:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "Se_nha:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Clique para conectar"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Nova…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Nenhum"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinâmico (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_riar"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Senhas ou chaves de criptografia são necessárias para acessar a rede Wi-Fi "
+"“%s”."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Autenticação necessária na rede Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Autenticação necessária na rede Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Criar nova rede Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nova rede Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Digite um nome para a rede Wi-Fi que você deseja criar."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Conectar a rede Wi-Fi oculta"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Rede Wi-Fi oculta"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Digite o nome e os detalhes de segurança da rede Wi-Fi oculta a qual você "
+"deseja se conectar."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "_Segurança Wi-Fi"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "Co_nexão"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptador Wi-Fi"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Não localizei _meu provedor e quero digitá-lo manualmente:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Provedor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Lista de países ou regiões:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Países ou regiões"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Com fio"
+
+# Traduzido como Malha para deixar em conformidade com a tradução do aplicativo principal NetworkManager 
--Enrico
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "Malha OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Ou está faltando uma senha ou a conexão é inválida. No último caso, você tem "
+"que primeiro editar a conexão com nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Segurança Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nome da rede:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nexão:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptador Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Uso:"
@@ -4355,25 +4836,25 @@ msgstr "Nenhum certificado AC selecionado"
 msgid "selected CA certificate file does not exist"
 msgstr "arquivo de certificado AC selecionado não existe"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "faltando arquivo PAC EAP-FAST"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Escolha um arquivo PAC"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Arquivos PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Todos os arquivos"
 
@@ -4409,16 +4890,16 @@ msgstr "Autenticação _interna"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir pro_visionamento PAC automático"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "faltando nome de usuário EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "faltando senha EAP-LEAP"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4453,15 +4934,15 @@ msgstr "Sufixo do nome do certificado de servidor."
 msgid "_Domain"
 msgstr "_Domínio"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "faltando nome de usuário EAP"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "faltando senha EAP"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "faltando frase secreta de chave privada de cliente EAP"
 
@@ -4473,23 +4954,23 @@ msgstr "Frase secreta da chave pr_ivada"
 msgid "Sh_ow passphrase"
 msgstr "M_ostrar frase secreta"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "faltando identidade EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "nenhum certificado de usuário selecionado"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 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:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "nenhuma chave selecionada"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "arquivo de chave selecionado não existe"
 
@@ -4497,7 +4978,7 @@ msgstr "arquivo de chave selecionado não existe"
 msgid "I_dentity"
 msgstr "Id_entidade"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (não EAP)"
 
@@ -4535,15 +5016,15 @@ msgstr "Configurada externamente"
 msgid "Au_thentication"
 msgstr "Au_tenticação"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "faltando nome de usuário leap"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "faltando senha leap"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "faltando senha EAP"
@@ -4552,18 +5033,18 @@ msgstr "faltando senha EAP"
 msgid "_Type"
 msgstr "_Tipo"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "faltando chave wep"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4571,7 +5052,7 @@ msgstr ""
 "chave wep inválida: chave com um tamanho de %zu deve conter apenas "
 "caracteres ascii"
 
-#: src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4580,11 +5061,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "chave wep inválida: frase secreta deve ser menor que 64 caracteres"
 
@@ -4612,7 +5093,7 @@ msgstr "Mostrar c_have"
 msgid "WEP inde_x"
 msgstr "Índice _WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4621,358 +5102,12 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
 
-#~ msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
-#~ msgstr "Leia com seu telefone ou <a href=\"nma:print\">imprima</a>"
-
-#~ msgid "No certificate set"
-#~ msgstr "Nenhum certificado definido"
-
-#~ msgid "No key set"
-#~ msgstr "Nenhuma chave definida"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Escolha uma chave para certificado de %s"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Chave _privada de %s"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Senha da chave de %s"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Escolha o certificado de %s"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Certificado de %s"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Meu país não está listado"
-
-#~ msgid "Unlisted"
-#~ msgstr "Não listado"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Meu plano não está listado…"
-
-#~ msgid "Provider"
-#~ msgstr "Provedor"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Dispositivo GSM instalado"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Dispositivo CDMA instalado"
-
-#~ msgid "Any device"
-#~ msgstr "Qualquer dispositivo"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nova conexão de banda larga móvel"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Este assistente lhe ajudará a configurar uma conexão de banda larga móvel "
-#~ "à uma rede de celular (3G)."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Você precisará das seguintes informações:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "O nome do seu provedor de banda larga"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "O nome do seu plano de banda larga"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(em alguns casos) O APN (Nome do Ponto de Acesso) do seu plano de banda "
-#~ "larga"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "_Criar uma conexão para este dispositivo móvel:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Configurar uma conexão de banda larga móvel"
-
-#~ msgid "Country or region:"
-#~ msgstr "País ou região:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Escolha o país ou região do seu provedor"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Escolha seu provedor a partir de uma _lista:"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "Não localizei _meu provedor e quero configurar a conexão manualmente:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Meu provedor usa tecnologia GSM (3G, GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Meu provedor usa tecnologia CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Escolha seu provedor"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Escolha seu plano:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "_APN (Nome do ponto de acesso) do plano escolhido:"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Aviso: Escolher um plano errado pode resultar em problemas tarifários na "
-#~ "sua conta ou pode impedir a conectividade.\n"
-#~ "\n"
-#~ "Se você não sabe ao certo qual o seu plano, pergunte ao seu provedor pelo "
-#~ "APN do seu plano."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Escolha seu plano"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Sua conexão de banda larga móvel está configurada da seguinte maneira:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Seu dispositivo:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Seu provedor:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Seu plano:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Agora será feita uma conexão ao seu provedor de banda larga móvel usando "
-#~ "as configurações que você selecionou. Se a conexão falhar ou você não "
-#~ "conseguir acessar os recursos de rede, confira suas configurações. Para "
-#~ "modificar as configurações da rede de banda larga móvel, escolha "
-#~ "“Conexões de rede” de Sistema → Preferências."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Confirmação das configurações de banda larga móvel"
-
-#~ msgid "(None)"
-#~ msgstr "(Nenhum)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Chave em %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certificado em %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Desconhecido)"
-
-#~ msgid "Select"
-#~ msgstr "Selecionar"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid "Select from file…"
-#~ msgstr "Selecionar do arquivo…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Escolha um certificado de %s"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Senha de certificado de %s"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Erro ao autenticar: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Erro ao abrir uma sessão: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Desbloquear token"
-
-#~ msgid "Issued By"
-#~ msgstr "Emitido por"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Digite PIN de %s"
-
-#~ msgid "_Login"
-#~ msgstr "A_utenticar"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Lembrar do PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Armazenar a senha apenas para este usuário"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Armazenar a senha para todos os usuários"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Pedir esta senha todas as vezes"
-
-#~ msgid "The password is not required"
-#~ msgstr "A senha não é necessária"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "M_ostrar senhas"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Senha _terciária:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Senha secundária:"
-
-#~ msgid "_Password:"
-#~ msgstr "Se_nha:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Clique para conectar"
-
-#~ msgid "New…"
-#~ msgstr "Nova…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Nenhum"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP dinâmico (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "C_riar"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Senhas ou chaves de criptografia são necessárias para acessar a rede Wi-"
-#~ "Fi “%s”."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Autenticação necessária na rede Wi-Fi"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Autenticação necessária na rede Wi-Fi"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Criar nova rede Wi-Fi"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nova rede Wi-Fi"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Conectar a rede Wi-Fi oculta"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Rede Wi-Fi oculta"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Digite o nome e os detalhes de segurança da rede Wi-Fi oculta a qual você "
-#~ "deseja se conectar."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Segurança Wi-Fi"
-
-#~ msgid "C_onnection"
-#~ msgstr "Co_nexão"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Adaptador Wi-Fi"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Não localizei _meu provedor e quero digitá-lo manualmente:"
-
-#~ msgid "Provider:"
-#~ msgstr "Provedor:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Lista de países ou regiões:"
-
-#~ msgid "Country or region"
-#~ msgstr "Países ou regiões"
-
-#~ msgid "Wired"
-#~ msgstr "Com fio"
-
-# Traduzido como Malha para deixar em conformidade com a tradução do aplicativo principal NetworkManager 
--Enrico
-#~ msgid "OLPC Mesh"
-#~ msgstr "Malha OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Ou está faltando uma senha ou a conexão é inválida. No último caso, você "
-#~ "tem que primeiro editar a conexão com nm-connection-editor"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Segurança Wi-Fi:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nome da rede:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Co_nexão:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Adaptador Wi-Fi:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/ro.po b/po/ro.po
index 31888128..bd52c5a4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2016-05-04 21:50+0200\n"
 "Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
@@ -24,6 +24,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Rețea"
 
@@ -224,15 +225,19 @@ msgstr "Autentificare 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Anulează"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "C_onectare"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Nume rețea:"
@@ -586,7 +591,7 @@ msgstr "Internet mobil de bandă largă (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Internet mobil de bandă largă"
 
@@ -712,7 +717,9 @@ msgstr "Autentificare DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_OK"
 
@@ -820,6 +827,7 @@ msgid "Error displaying connection information:"
 msgstr "Eroare la afișarea informațiilor despre conexiune:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -969,7 +977,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Parolă:"
@@ -994,7 +1002,8 @@ msgstr "Baner VPN"
 msgid "Base Connection"
 msgstr "Conexiune de bază"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Necunoscută"
 
@@ -1761,6 +1770,7 @@ msgid "_Service"
 msgstr "_Serviciu:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2423,6 +2433,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Permite roamingul dacă rețeaua de domiciliu nu este disponibilă"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Afișea_ză parolele"
 
@@ -2817,14 +2828,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "Ethernet automat"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3147,12 +3159,12 @@ msgstr ""
 "suportului pentru unele metode."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3162,22 +3174,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3487,6 +3502,7 @@ msgid "Select a connection to delete"
 msgstr "Conexiune cu fir %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nume"
 
@@ -3722,6 +3738,8 @@ msgstr "Conexiune cu fir %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Implicit"
 
@@ -3953,35 +3971,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Furnizorul folosește tehnologie bazată pe C_DMA (de ex. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4152,10 +4170,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Conexiune cu fir %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Cheie WEP 40/128-biți (Hex sau ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Parolă WEP 128-bit"
 
@@ -4165,14 +4185,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinamic (802.1x)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA și WPA2 personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA și WPA2"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA și WPA2 personal"
@@ -4252,6 +4275,501 @@ msgstr "Detalii conexiune"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Certific_at de la o autoritate de certificare:"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Selectați certificatul personal..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "C_heie privată:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Parola pentru cheia _privată:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Selectați certificatul personal..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Certificat _utilizator:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Țara mea nu este în listă"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Nelistat"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Planul meu nu este listat..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Furnizor"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Dispozitive GSM instalate"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Dispozitive CDMA instalate"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Orice dispozitiv"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Conexiune nouă de Internet mobil de bandă largă"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Acest asistent vă ajută să configurați o conexiune la Internet mobil de "
+"bandă largă către o rețea celulară (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Aveți nevoie de următoarele informații:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Numele furnizorului"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Numele planului de facturare"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(în unele cazuri) APN-ul (Numele punctului de acces) al planului de facturare"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr ""
+"Creează o conexiune pentru aces_t dispozitiv de acces la Internet mobil de "
+"bandă largă:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Configurează o conexiune către Internet mobil de bandă largă"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Țară sau regiune"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Alegeți țara sau regiunea furnizorului"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Alegeți furnizorul din _listă:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Nu pot găsi furnizorul, dar doresc să îl introduc _manual:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Furnizorul meu folosește tehnologie GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Furnizorul meu folosește tehnologie CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Alegeți furnizorul"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Selectați planul:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Plan _APN (Nume punct de acces) selectat:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Avertisment: alegerea unui plan incorect poate duce la probleme de facturare "
+"a contului de rețea mobilă de bandă largă sau pot împiedica conectivitatea.\n"
+"\n"
+"Dacă sunteți nesigur de plan, întrebați furnizorul care este APN-ul planului "
+"dumneavoastră."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Alegeți planul de facturare"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Conexiunea la Internet mobil de bandă largă este configurată cu următoarele "
+"valori:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Dispozitiv:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Furnizor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Se va realiza o conexiune către furnizorul de Internet mobil de bandă largă "
+"folosind configurațiile pe care le-ați selectat. Dacă nu se poate realiza "
+"conexiunea sau nu puteți accesa resursele rețelei, verificați din nou aceste "
+"configurații. Pentru a modifica configurațiile conexiunii alegeți „Conexiuni "
+"de rețea” din meniul Sistem >> Preferințe."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmare configurații Internet mobil de bandă largă"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(nici una)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Certific_at de la o autoritate de certificare:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Necunoscută"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "Alegeți un fișier"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+#, fuzzy
+msgid "Cancel"
+msgstr "_Anulează"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "Alegeți un fișier"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Selectați certificatul personal..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Certificat _utilizator:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Eroare la editarea conexiunii"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Deblochează"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "Cere această parolă de _fiecare dată"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Este necesară o parolă pentru conectarea la „%s”."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "Afișea_ză parolele"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Parolă:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Parolă:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Parolă:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Deconectează"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Niciuna"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinamic (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "C_reează"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Este necesară parola sau cheia de criptare pentru a accesa rețeaua fără fir "
+"„%s”."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Se cere autentificarea în rețeaua fără fir"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "Autentificarea este necesară pentru rețeaua fără fir"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "Creează rețea fără fir nouă"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Rețea fără fir nouă"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr ""
+"Introduceți un nume pentru rețeaua fără fir pe care doriți să o creați."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Conectare la rețea fără fir ascunsă"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "Rețea fără fir ascunsă"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Introduceți numele și detaliile de securitate pentru rețeaua fără fir "
+"ascunsă la care doriți să vă conectați."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Secur_itatea rețelei fără fir:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Co_nexiune:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptor rețea fără fir:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Nu pot găsi furnizorul, dar doresc să îl introduc _manual:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Furnizor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Lista țărilor și a regiunilor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Țară sau regiune"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Cu fir"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "Secur_itatea rețelei fără fir:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nume rețea:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nexiune:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptor rețea fără fir:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Utilizare:"
@@ -4406,25 +4924,25 @@ msgstr "Certific_at de la o autoritate de certificare:"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4464,16 +4982,16 @@ msgstr "Aute_ntificare internă:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4510,15 +5028,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4532,24 +5050,24 @@ msgstr "Parola pentru cheia _privată:"
 msgid "Sh_ow passphrase"
 msgstr "Afișea_ză parolele"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Certific_at de la o autoritate de certificare:"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4558,7 +5076,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_dentitate:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4598,15 +5116,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Autentificare:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Parola pentru cheia _privată:"
@@ -4616,33 +5134,33 @@ msgstr "Parola pentru cheia _privată:"
 msgid "_Type"
 msgstr "_Tip:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4672,342 +5190,17 @@ msgstr "Afișea_ză cheia"
 msgid "WEP inde_x"
 msgstr "Inde_x WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Certific_at de la o autoritate de certificare:"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Selectați certificatul personal..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "C_heie privată:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Parola pentru cheia _privată:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Selectați certificatul personal..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Certificat _utilizator:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Țara mea nu este în listă"
-
-#~ msgid "Unlisted"
-#~ msgstr "Nelistat"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Planul meu nu este listat..."
-
-#~ msgid "Provider"
-#~ msgstr "Furnizor"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Dispozitive GSM instalate"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Dispozitive CDMA instalate"
-
-#~ msgid "Any device"
-#~ msgstr "Orice dispozitiv"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Conexiune nouă de Internet mobil de bandă largă"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Acest asistent vă ajută să configurați o conexiune la Internet mobil de "
-#~ "bandă largă către o rețea celulară (3G)."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Aveți nevoie de următoarele informații:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Numele furnizorului"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Numele planului de facturare"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(în unele cazuri) APN-ul (Numele punctului de acces) al planului de "
-#~ "facturare"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr ""
-#~ "Creează o conexiune pentru aces_t dispozitiv de acces la Internet mobil "
-#~ "de bandă largă:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Configurează o conexiune către Internet mobil de bandă largă"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Țară sau regiune"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Alegeți țara sau regiunea furnizorului"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Alegeți furnizorul din _listă:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Nu pot găsi furnizorul, dar doresc să îl introduc _manual:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Furnizorul meu folosește tehnologie GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Furnizorul meu folosește tehnologie CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Alegeți furnizorul"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Selectați planul:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Plan _APN (Nume punct de acces) selectat:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Avertisment: alegerea unui plan incorect poate duce la probleme de "
-#~ "facturare a contului de rețea mobilă de bandă largă sau pot împiedica "
-#~ "conectivitatea.\n"
-#~ "\n"
-#~ "Dacă sunteți nesigur de plan, întrebați furnizorul care este APN-ul "
-#~ "planului dumneavoastră."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Alegeți planul de facturare"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Conexiunea la Internet mobil de bandă largă este configurată cu "
-#~ "următoarele valori:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Dispozitiv:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Furnizor:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Plan:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Se va realiza o conexiune către furnizorul de Internet mobil de bandă "
-#~ "largă folosind configurațiile pe care le-ați selectat. Dacă nu se poate "
-#~ "realiza conexiunea sau nu puteți accesa resursele rețelei, verificați din "
-#~ "nou aceste configurații. Pentru a modifica configurațiile conexiunii "
-#~ "alegeți „Conexiuni de rețea” din meniul Sistem >> Preferințe."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Confirmare configurații Internet mobil de bandă largă"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(nici una)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certific_at de la o autoritate de certificare:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Necunoscută"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "Alegeți un fișier"
-
-#, fuzzy
-#~ msgid "Cancel"
-#~ msgstr "_Anulează"
-
-#, fuzzy
-#~ msgid "Select from file…"
-#~ msgstr "Alegeți un fișier"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Selectați certificatul personal..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Certificat _utilizator:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Eroare la editarea conexiunii"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Deblochează"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "Cere această parolă de _fiecare dată"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Este necesară o parolă pentru conectarea la „%s”."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Afișea_ză parolele"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Parolă:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Parolă:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Parolă:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Deconectează"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Niciuna"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP dinamic (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "C_reează"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Este necesară parola sau cheia de criptare pentru a accesa rețeaua fără "
-#~ "fir „%s”."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Se cere autentificarea în rețeaua fără fir"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Autentificarea este necesară pentru rețeaua fără fir"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Creează rețea fără fir nouă"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Rețea fără fir nouă"
-
-#, 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."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Conectare la rețea fără fir ascunsă"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Rețea fără fir ascunsă"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Introduceți numele și detaliile de securitate pentru rețeaua fără fir "
-#~ "ascunsă la care doriți să vă conectați."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Secur_itatea rețelei fără fir:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Co_nexiune:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Adaptor rețea fără fir:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Nu pot găsi furnizorul, dar doresc să îl introduc _manual:"
-
-#~ msgid "Provider:"
-#~ msgstr "Furnizor:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Lista țărilor și a regiunilor:"
-
-#~ msgid "Country or region"
-#~ msgstr "Țară sau regiune"
-
-#~ msgid "Wired"
-#~ msgstr "Cu fir"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Secur_itatea rețelei fără fir:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nume rețea:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Co_nexiune:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Adaptor rețea fără fir:"
-
 #~ msgid ""
 #~ "\n"
 #~ "The VPN connection '%s' disconnected because the VPN service stopped."
diff --git a/po/ru.po b/po/ru.po
index 385cee44..32b85c85 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2019-08-22 16:07MSK\n"
 "Last-Translator: Olesya Gerasimenko <gammaray basealt ru>\n"
 "Language-Team: Basealt Translation Team\n"
@@ -28,6 +28,7 @@ msgstr ""
 "X-Generator: Lokalize 2.0\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Сеть"
 
@@ -227,15 +228,19 @@ msgstr "Аутентификация 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "П_одключиться"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Имя сети"
 
@@ -584,7 +589,7 @@ msgstr "Мобильная связь (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Мобильная связь"
 
@@ -705,7 +710,9 @@ msgstr "Аутентификация DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_ОК"
 
@@ -810,6 +817,7 @@ msgid "Error displaying connection information:"
 msgstr "Ошибка показа сведений о соединении:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -955,7 +963,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Точка доступа"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "Пароль"
 
@@ -979,7 +987,8 @@ msgstr "Баннер VPN"
 msgid "Base Connection"
 msgstr "Основное соединение"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Неизвестно"
 
@@ -1734,6 +1743,7 @@ msgid "_Service"
 msgstr "С_лужба"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2398,6 +2408,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Включать _роуминг, если домашняя сеть недоступна"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "По_казывать пароли"
 
@@ -2808,13 +2819,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3138,12 +3150,12 @@ msgstr ""
 "поддержку некоторых методов."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3153,22 +3165,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bond"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Team"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Мост"
 
@@ -3461,6 +3476,7 @@ msgid "Select a connection to delete"
 msgstr "Выберите соединение для удаления"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Имя"
 
@@ -3674,6 +3690,8 @@ msgstr "Соединение Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -3900,35 +3918,35 @@ msgstr "Оператор использует технологию _GSM (GPRS, E
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Оператор использует технологию _CDMA (1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4089,10 +4107,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Соединение Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP (40/128-битный ключ (Hex или ASCII))"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP (128-битный ключ)"
 
@@ -4101,14 +4121,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Динамический WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA/WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA/WPA2 Personal"
@@ -4184,6 +4207,461 @@ msgstr "Сведения о текущем соединении"
 msgid "_Close"
 msgstr "_Закрыть"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+"Отсканировать с помощью телефона или <a href=\"nma:print\">Распечатать</a>"
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Сертификатов не установлено"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Нет установленного ключа"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Выбрать ключ для сертификата %s"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "Приватный _ключ %s"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "_Пароль приватного ключа %s"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Выбрать сертификат %s"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "_Сертификат %s"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Моей страны нет в списке"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Нет в списке"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Моего тарифного плана нет в списке…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Оператор"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Установленное GSM-устройство"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Установленное CDMA-устройство"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Любое устройство"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Новое соединение мобильной связи"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Мастер подключения поможет настроить соединение мобильной связи к сотовой "
+"сети 3G."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Необходимо знать следующие сведения:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Название оператора мобильной связи"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Название тарифного плана мобильной связи"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"Имя точки доступа (APN) тарифного плана мобильной связи (в некоторых случаях)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Создать соединение для _этого устройства мобильной связи:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Настройка соединения мобильной связи"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "Страна или регион:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Выберите страну или регион оператора"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Выбор оператора из _списка:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "_Указать параметры соединения вручную:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Оператор использует технологию GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Оператор использует технологию CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Выберите оператора"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Выберите тарифный план:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Выберите точку доступа (APN) этого тарифного плана:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Внимание! Выбор неверного тарифного плана может привести к применению "
+"неправильного тарифа для мобильной связи или невозможности доступа в сеть.\n"
+"\n"
+"Если не уверены, какой тарифный план выбрать, уточните APN у оператора "
+"мобильной связи."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Выберите тарифный план"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Соединение мобильной связи настроено со следующими параметрами:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Устройство:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Оператор:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Тарифный план:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Сейчас будет установлено соединение к оператору мобильной связи по указанным "
+"параметрам. Если произошла ошибка соединения или нет доступа к сетевым "
+"ресурсам, попробуйте изменить параметры. Чтобы изменить параметры соединения "
+"мобильной связи, выберите «Сеть» в Параметрах системы."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Подтвердить параметры мобильной связи"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Нет)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Ключ в %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Сертификат в %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Неизвестно)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Выбрать"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Отменить"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Выбрать из файла…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Выбрать сертификат %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "Пароль сертификата %s"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Ошибка авторизации: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Ошибка открытия сессии: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Разблокировать токен"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Используется"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Введите PIN %s"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Логин"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Запомнить PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Запомнить пароль только для этого пользователя"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Запомнить пароль для всех пользователей"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Запрашивать этот пароль каждый раз"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Пароль не требуется"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "По_казывать пароли"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Третий пароль:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Второй пароль:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Пароль:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Нажмите для подключения"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Создать…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Нет"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Динамический WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "С_оздать"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "Для подключения к сети Wi-Fi «%s» требуется указать ключ или пароль."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Для сети Wi-Fi требуется аутентификация"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Сеть Wi-Fi требует аутентификацию"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Создать новую сеть Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Новая сеть Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Введите имя для создаваемой сети Wi-Fi."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Подключение к скрытой сети Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Скрытая сеть Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Введите имя и параметры безопасности скрытой сети Wi-Fi, к которой "
+"необходимо подключиться."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "_Безопасность Wi-Fi"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "Сое_динение"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Адаптер Wi-Fi"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "_Указать оператора вручную:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Оператор:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Список стран и регионов:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Страна или регион"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Проводная"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Отсутствует пароль или соединение некорректно. В последнем случае сначала "
+"нужно отредактировать соединение с помощью nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Безопасность Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Имя сети:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Сое_динение:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Адаптер Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Использование:"
@@ -4332,25 +4810,25 @@ msgstr "не выбран сертификат УЦ"
 msgid "selected CA certificate file does not exist"
 msgstr "выбранный файл сертификата УЦ не существует"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "отсутствует файл EAP-FAST PAC"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Выбрать файл PAC"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Файлы PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Все файлы"
 
@@ -4386,16 +4864,16 @@ msgstr "_Внутренняя аутентификация"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Разрешить автоматическую инициализацию PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "отсутствует имя пользователя EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "отсутствует пароль EAP-LEAP"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4430,15 +4908,15 @@ msgstr "Суффикс имени сертификата сервера."
 msgid "_Domain"
 msgstr "_Домен"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "отсутствует имя пользователя EAP"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "отсутствует пароль EAP"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "отсутствует парольная фраза закрытого ключа клиента EAP"
 
@@ -4450,23 +4928,23 @@ msgstr "П_арольная фраза закрытого ключа"
 msgid "Sh_ow passphrase"
 msgstr "По_казывать парольную фразу"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "отсутствует идентичность EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "не выбран сертификат пользователя"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "выбранный файл сертификата пользователя не существует"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "ключи не выбраны"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "выбранный файл ключа не существует"
 
@@ -4474,7 +4952,7 @@ msgstr "выбранный файл ключа не существует"
 msgid "I_dentity"
 msgstr "_Подлинность"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (без EAP)"
 
@@ -4513,15 +4991,15 @@ msgstr "Внешняя конфигурация"
 msgid "Au_thentication"
 msgstr "А_утентификация"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "отсутствует leap-имя пользователя"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "отсутствует leap-пароль"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "отсутствует пароль EAP"
@@ -4530,18 +5008,18 @@ msgstr "отсутствует пароль EAP"
 msgid "_Type"
 msgstr "_Тип"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "отсутствует wep-ключ"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4549,7 +5027,7 @@ msgstr ""
 "недействительный wep-ключ: ключ с длиной %zu должен содержать только символы "
 "ASCII"
 
-#: src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4558,11 +5036,11 @@ msgstr ""
 "недействительный wep-ключ: ключ с неверной длиной %zu. Ключ должен быть "
 "длины 5/13 (ASCII) или 10/26 (HEX)"
 
-#: src/wireless-security/ws-wep-key.c:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "недействительный wep-ключ: парольная фраза не может быть пустой"
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "недействительный wep-ключ: парольная фраза должна быть короче 64 символов"
@@ -4591,7 +5069,7 @@ msgstr "Пока_зывать ключ"
 msgid "WEP inde_x"
 msgstr "_Индекс WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4600,355 +5078,12 @@ msgstr ""
 "недействительный wpa-psk: ключ неверной длины %zu. Должен быть [8,63] байт "
 "или 64 шестнадцатеричных цифр"
 
-#: src/wireless-security/ws-wpa-psk.c:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "недействительный wpa-psk: невозможно интерпретировать ключ с 64 байт как "
 "шестнадцатеричный"
 
-#~ msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
-#~ msgstr ""
-#~ "Отсканировать с помощью телефона или <a href=\"nma:print\">Распечатать</a>"
-
-#~ msgid "No certificate set"
-#~ msgstr "Сертификатов не установлено"
-
-#~ msgid "No key set"
-#~ msgstr "Нет установленного ключа"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Выбрать ключ для сертификата %s"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Приватный _ключ %s"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Пароль приватного ключа %s"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Выбрать сертификат %s"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Сертификат %s"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Моей страны нет в списке"
-
-#~ msgid "Unlisted"
-#~ msgstr "Нет в списке"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Моего тарифного плана нет в списке…"
-
-#~ msgid "Provider"
-#~ msgstr "Оператор"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Установленное GSM-устройство"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Установленное CDMA-устройство"
-
-#~ msgid "Any device"
-#~ msgstr "Любое устройство"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Новое соединение мобильной связи"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Мастер подключения поможет настроить соединение мобильной связи к сотовой "
-#~ "сети 3G."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Необходимо знать следующие сведения:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Название оператора мобильной связи"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Название тарифного плана мобильной связи"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "Имя точки доступа (APN) тарифного плана мобильной связи (в некоторых "
-#~ "случаях)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Создать соединение для _этого устройства мобильной связи:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Настройка соединения мобильной связи"
-
-#~ msgid "Country or region:"
-#~ msgstr "Страна или регион:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Выберите страну или регион оператора"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Выбор оператора из _списка:"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "_Указать параметры соединения вручную:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Оператор использует технологию GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Оператор использует технологию CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Выберите оператора"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Выберите тарифный план:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Выберите точку доступа (APN) этого тарифного плана:"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Внимание! Выбор неверного тарифного плана может привести к применению "
-#~ "неправильного тарифа для мобильной связи или невозможности доступа в "
-#~ "сеть.\n"
-#~ "\n"
-#~ "Если не уверены, какой тарифный план выбрать, уточните APN у оператора "
-#~ "мобильной связи."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Выберите тарифный план"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "Соединение мобильной связи настроено со следующими параметрами:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Устройство:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Оператор:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Тарифный план:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Сейчас будет установлено соединение к оператору мобильной связи по "
-#~ "указанным параметрам. Если произошла ошибка соединения или нет доступа к "
-#~ "сетевым ресурсам, попробуйте изменить параметры. Чтобы изменить параметры "
-#~ "соединения мобильной связи, выберите «Сеть» в Параметрах системы."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Подтвердить параметры мобильной связи"
-
-#~ msgid "(None)"
-#~ msgstr "(Нет)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Ключ в %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Сертификат в %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Неизвестно)"
-
-#~ msgid "Select"
-#~ msgstr "Выбрать"
-
-#~ msgid "Cancel"
-#~ msgstr "Отменить"
-
-#~ msgid "Select from file…"
-#~ msgstr "Выбрать из файла…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Выбрать сертификат %s"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Пароль сертификата %s"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Ошибка авторизации: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Ошибка открытия сессии: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Разблокировать токен"
-
-#~ msgid "Issued By"
-#~ msgstr "Используется"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Введите PIN %s"
-
-#~ msgid "_Login"
-#~ msgstr "_Логин"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Запомнить PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Запомнить пароль только для этого пользователя"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Запомнить пароль для всех пользователей"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Запрашивать этот пароль каждый раз"
-
-#~ msgid "The password is not required"
-#~ msgstr "Пароль не требуется"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "По_казывать пароли"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Третий пароль:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Второй пароль:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Пароль:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Нажмите для подключения"
-
-#~ msgid "New…"
-#~ msgstr "Создать…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Нет"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Динамический WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "С_оздать"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Для подключения к сети Wi-Fi «%s» требуется указать ключ или пароль."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Для сети Wi-Fi требуется аутентификация"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Сеть Wi-Fi требует аутентификацию"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Создать новую сеть Wi-Fi"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Новая сеть Wi-Fi"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Введите имя для создаваемой сети Wi-Fi."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Подключение к скрытой сети Wi-Fi"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Скрытая сеть Wi-Fi"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Введите имя и параметры безопасности скрытой сети Wi-Fi, к которой "
-#~ "необходимо подключиться."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Безопасность Wi-Fi"
-
-#~ msgid "C_onnection"
-#~ msgstr "Сое_динение"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Адаптер Wi-Fi"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "_Указать оператора вручную:"
-
-#~ msgid "Provider:"
-#~ msgstr "Оператор:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Список стран и регионов:"
-
-#~ msgid "Country or region"
-#~ msgstr "Страна или регион"
-
-#~ msgid "Wired"
-#~ msgstr "Проводная"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Отсутствует пароль или соединение некорректно. В последнем случае сначала "
-#~ "нужно отредактировать соединение с помощью nm-connection-editor"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Безопасность Wi-Fi:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Имя сети:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Сое_динение:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Адаптер Wi-Fi:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/rw.po b/po/rw.po
index fe85cbe3..86267455 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2005-03-31 20:55-0700\n"
 "Last-Translator: Steve Murphy <murf e-tools com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw lists sourceforge net>\n"
@@ -27,6 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr ""
 
@@ -208,16 +209,20 @@ msgstr ""
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 #, fuzzy
 msgid "C_onnect"
 msgstr "Kwihuza"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "ni OYA"
@@ -541,7 +546,7 @@ msgstr ""
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr ""
 
@@ -666,7 +671,9 @@ msgstr ""
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 #, fuzzy
 msgid "_OK"
 msgstr "YEGO"
@@ -777,6 +784,7 @@ msgid "Error displaying connection information:"
 msgstr ""
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr ""
@@ -922,7 +930,7 @@ msgstr ""
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr ""
 
@@ -951,7 +959,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr ""
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr ""
 
@@ -1667,6 +1676,7 @@ msgid "_Service"
 msgstr ""
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2272,6 +2282,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr ""
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr ""
 
@@ -2659,13 +2670,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -2968,12 +2980,12 @@ msgid ""
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -2983,22 +2995,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3287,6 +3302,7 @@ msgid "Select a connection to delete"
 msgstr "urusobe Ukwihuza"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
@@ -3504,6 +3520,8 @@ msgstr "urusobe Ukwihuza"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr ""
 
@@ -3718,35 +3736,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr ""
 
@@ -3897,10 +3915,12 @@ msgid "Wi-Fi connection %d"
 msgstr "urusobe Ukwihuza"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr ""
 
@@ -3909,14 +3929,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 msgid "WPA3 Personal"
 msgstr ""
 
@@ -3988,6 +4011,452 @@ msgstr ""
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr ""
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr ""
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr ""
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "urusobe Ukwihuza"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "urusobe Ukwihuza"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "Gishya"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "i Na Umutekano Amagenamiterere Bya i urusobe Kuri Kurema"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Kuri a urusobe"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "i Na Umutekano Amagenamiterere Bya i urusobe Kuri Kurema"
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr ""
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Kwihuza"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "Kwihuza"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr ""
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr ""
@@ -4134,25 +4603,25 @@ msgstr ""
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4189,16 +4658,16 @@ msgstr "Icyerekezo"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr ""
@@ -4233,15 +4702,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4253,23 +4722,23 @@ msgstr ""
 msgid "Sh_ow passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4277,7 +4746,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
@@ -4316,15 +4785,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Icyerekezo"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 msgid "missing password"
 msgstr ""
 
@@ -4337,33 +4806,33 @@ msgstr ""
 msgid "_Type"
 msgstr "Ubwoko bw'agakandisho"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4391,51 +4860,17 @@ msgstr ""
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "urusobe Ukwihuza"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "urusobe Ukwihuza"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Gishya"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "i Na Umutekano Amagenamiterere Bya i urusobe Kuri Kurema"
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Kuri a urusobe"
-
-#, 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"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Kwihuza"
-
-#, fuzzy
-#~ msgid "C_onnection:"
-#~ msgstr "Kwihuza"
-
 #, fuzzy
 #~ msgid "Connection _priority for auto-activation:"
 #~ msgstr "Na: Bishunzwe: Bikora"
diff --git a/po/sk.po b/po/sk.po
index 53e1e0e5..4c1a8ed1 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\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"
@@ -24,6 +24,7 @@ msgstr ""
 
 # desktop entry name
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Sieť"
 
@@ -234,16 +235,20 @@ msgstr "Overenie totožnosti protokolom 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "Prip_ojiť"
 
 # GtkLabel label
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Názov siete"
 
@@ -590,7 +595,7 @@ msgstr "Mobilné (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobilné"
 
@@ -715,7 +720,9 @@ msgstr "Overenie totožnosti k DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_OK"
 
@@ -823,6 +830,7 @@ msgid "Error displaying connection information:"
 msgstr "Chyba pri zobrazovaní informácií o pripojení:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -973,7 +981,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Aktívny bod"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Heslo:"
@@ -1000,7 +1008,8 @@ msgid "Base Connection"
 msgstr "Základné pripojenie"
 
 # base connection, device type
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Neznáme"
 
@@ -1766,6 +1775,7 @@ msgid "_Service"
 msgstr "_Služba"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2408,6 +2418,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Povoliť _roaming ak je domáca sieť nedostupná"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Z_obraziť heslá"
 
@@ -2801,13 +2812,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3118,12 +3130,12 @@ msgstr ""
 "zakázať."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3133,22 +3145,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Previazané"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Tím"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Premostené"
 
@@ -3451,6 +3466,7 @@ msgid "Select a connection to delete"
 msgstr "Tímové pripojenie č. %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Názov"
 
@@ -3673,6 +3689,8 @@ msgstr "Pripojenie k ethernetu č. %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Predvolené"
 
@@ -3909,35 +3927,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Môj poskytovateľ používa technológiu založenú na _CDMA (napr. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4099,10 +4117,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Pripojenie k Wi-Fi č. %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Kľúč pre WEP 40/128-bitový (šestnástkovo alebo ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Heslo pre WEP 128-bitové"
 
@@ -4111,14 +4131,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamické WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "Osobné WPA a WPA2"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "Podnikové WPA a WPA2"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Osobné WPA a WPA2"
@@ -4194,6 +4217,485 @@ msgstr "Informácie o pripojení"
 msgid "_Close"
 msgstr "_Zavrieť"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Nie je nastavený žiadny certifikát"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Zvoliť certifikát CA"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "%s súkromný _kľúč"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Heslo _súkromného kľúča:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Zvoliť certifikát CA"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Po_užívateľov certifikát:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Moja krajina nie je uvedená"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Neuvedené"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Môj program nie je uvedený…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Poskytovateľ"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Nainštalované zariadenie pre GSM"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Nainštalované zariadenie pre CDMA"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Akékoľvek zariadenie"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nové mobilné pripojenie"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Tento asistent vám pomôže poľahky nastaviť mobilné pripojenie do bunkovej "
+"(3G) siete."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Budete potrebovať nasledovné informácie:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Názov poskytovateľa vášho mobilného pripojenia"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Názov programu fakturácie vášho mobilného pripojenia"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(v niektorých prípadoch) APN (názov prípojného bodu) programu fakturácie "
+"vášho mobilného pripojenia"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Vytvoriť pripojenie pre _toto mobilné zariadenie:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Nastaviť mobilné pripojenie"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "Krajina alebo región:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Zvoľte si krajinu alebo región vášho poskytovateľa"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Zvoľte si poskytovateľa zo z_oznamu:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Nenašiel som môjho poskytovateľa, chcem ho zadať _ručne:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Môj poskytovateľ používa technológiu GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Môj poskytovateľ používa technológiu CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Zvoľte si poskytovateľa"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "Vyberte _svoj program:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (názov prípojného bodu) zvoleného programu:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Upozornenie: Zvolenie nesprávneho programu môže spôsobiť problémy pri "
+"fakturácii za váš mobilný účet, alebo znemožniť pripojenie.\n"
+"\n"
+"Ak si nie ste istý vaším programom, zistite si, prosím, APN vášho programu u "
+"vášho poskytovateľa."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Zvoľte si program fakturácie"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Vaše mobilné pripojenie je nakonfigurované pomocou nasledovných nastavení:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Vaše zariadenie:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Váš poskytovateľ:"
+
+# PM: bolo by dobré uviesť čo je to za program
+# PK: tipujem ze to je nieco ako tarif alebo zmluva (orange co ma programy)
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Váš program:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Teraz bude vytvorené pripojenie k vášmu poskytovateľovi mobilného pripojenia "
+"pomocou nastavení, ktoré ste si zvolili.  Ak pripojenie zlyhá, alebo sa "
+"nebudete môcť dostať k sieťovým prostriedkom, preverte vaše nastavenia. Keď "
+"chcete zmeniť nastavenia vášho mobilného pripojenia, tak zvoľte „Sieťové "
+"pripojenia“ z ponuky Systém >> Nastavenia."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Potvrďte nastavenia mobilného pripojenia"
+
+# ssid
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Žiadne)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certifikát v %s"
+
+# base connection, device type
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Neznáme)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Vybrať zo súboru…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Zvoliť certifikát CA"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Po_užívateľov certifikát:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Chyba počas prihlasovania"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Chyba pri úprave pripojenia"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Odomknúť"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Prihlásiť"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "Za_pamätať PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Uložiť heslo iba pre tohto používateľa"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Uložiť heslo pre všetkých používateľov"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Zakaždým si pýtať toto heslo"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Heslo nie je potrebné"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Z_obraziť heslá"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Treťoradé heslo:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Druhoradé heslo:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Heslo:"
+
+# tooltip
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Kliknutím pripojíte"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Nové…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Žiadne"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamické WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "Vy_tvoriť"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Na prístup do siete Wi-Fi „%s“ je vyžadované heslo alebo šifrovací kľúč."
+
+# window title
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Žiadosť o overenie totožnosti pre sieť Wi-Fi"
+
+# desc
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Vyžaduje sa overenie totožnosti pre sieť Wi-Fi"
+
+#  window title
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Vytvorenie novej siete Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nová sieť Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Zadajte názov siete Wi-Fi, ktorú chcete vytvoriť."
+
+# dialog title
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Pripojenie k skrytej sieti Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Skrytá sieť Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Zadajte názov a podrobnosti o zabezpečení skrytej siete W-Fi, ku ktorej sa "
+"chcete pripojiť."
+
+# GtkLabel label
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Zabezpečenie _Wi-Fi"
+
+# GtkLabel label
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "_Pripojenie"
+
+# GtkLabel label
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "_Adaptér Wi-Fi"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Nenašiel som môjho poskytovateľa, chcem ho zadať _ručne:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Poskytovateľ:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Zoznam krajín alebo regiónov:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Krajina alebo región"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Drôtové"
+
+# MČ: asi by som Mesh neprekladal. Podľa tohoto to vyzerá na špecialny typ bezdrôtovej siete: 
https://wiki.laptop.org/go/Mesh_Network_Details
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Buď chýba heslo, alebo je pripojenie neplatné. V poslednom rade budete "
+"musieť najskôr upraviť pripojenie pomocou editora nm-connection-editor"
+
+# GtkLabel label
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Zabezpečenie _Wi-Fi:"
+
+# GtkLabel label
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Názov siete:"
+
+# GtkLabel label
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Pripojenie:"
+
+# GtkLabel label
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptér Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Použitie:"
@@ -4347,25 +4849,25 @@ msgstr "N_ie je vyžadovaný žiadny certifikát CA"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-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:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Zvoľiť súbor PAC"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Súbory PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Všetky súbory"
 
@@ -4404,16 +4906,16 @@ msgstr "V_nútorné overenie totožnosti"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Umožniť automatické zao_bstarávanie súboru PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "chýba používateľské meno protokolu EAP-LEAP"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "chýba heslo protokolu EAP-LEAP"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4448,15 +4950,15 @@ msgstr ""
 msgid "_Domain"
 msgstr "_Doména"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "chýba používateľské meno protokolu EAP"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "chýba heslo protokolu EAP"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4468,23 +4970,23 @@ msgstr "Heslo súk_romného kľúča"
 msgid "Sh_ow passphrase"
 msgstr "Z_obraziť heslo"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "chýba identita protokolu EAP-TLS"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "nie je vybraný žiadny užívateľský certifikát"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "nie je vybraný žiadny kľúč"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4492,7 +4994,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "I_dentita"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP)"
 
@@ -4531,15 +5033,15 @@ msgstr "Nastavené externe"
 msgid "Au_thentication"
 msgstr "_Overenie totožnosti"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "chýba používateľské meno protokolu leap"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "chýba heslo protokolu leap"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "chýba heslo protokolu EAP"
@@ -4548,18 +5050,18 @@ msgstr "chýba heslo protokolu EAP"
 msgid "_Type"
 msgstr "_Typ"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "chýba kľúč zabezpečenia wep"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4567,7 +5069,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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4576,11 +5078,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 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"
 
@@ -4608,7 +5110,7 @@ msgstr "Zo_braziť kľúč"
 msgid "WEP inde_x"
 msgstr "Inde_x kľúča WEP"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4617,356 +5119,12 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
 
-#~ msgid "No certificate set"
-#~ msgstr "Nie je nastavený žiadny certifikát"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Zvoliť certifikát CA"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "%s súkromný _kľúč"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Heslo _súkromného kľúča:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Zvoliť certifikát CA"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Po_užívateľov certifikát:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Moja krajina nie je uvedená"
-
-#~ msgid "Unlisted"
-#~ msgstr "Neuvedené"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Môj program nie je uvedený…"
-
-#~ msgid "Provider"
-#~ msgstr "Poskytovateľ"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Nainštalované zariadenie pre GSM"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Nainštalované zariadenie pre CDMA"
-
-#~ msgid "Any device"
-#~ msgstr "Akékoľvek zariadenie"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nové mobilné pripojenie"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Tento asistent vám pomôže poľahky nastaviť mobilné pripojenie do bunkovej "
-#~ "(3G) siete."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Budete potrebovať nasledovné informácie:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Názov poskytovateľa vášho mobilného pripojenia"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Názov programu fakturácie vášho mobilného pripojenia"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(v niektorých prípadoch) APN (názov prípojného bodu) programu fakturácie "
-#~ "vášho mobilného pripojenia"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Vytvoriť pripojenie pre _toto mobilné zariadenie:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Nastaviť mobilné pripojenie"
-
-#~ msgid "Country or region:"
-#~ msgstr "Krajina alebo región:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Zvoľte si krajinu alebo región vášho poskytovateľa"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Zvoľte si poskytovateľa zo z_oznamu:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Nenašiel som môjho poskytovateľa, chcem ho zadať _ručne:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Môj poskytovateľ používa technológiu GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Môj poskytovateľ používa technológiu CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Zvoľte si poskytovateľa"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "Vyberte _svoj program:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "_APN (názov prípojného bodu) zvoleného programu:"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Upozornenie: Zvolenie nesprávneho programu môže spôsobiť problémy pri "
-#~ "fakturácii za váš mobilný účet, alebo znemožniť pripojenie.\n"
-#~ "\n"
-#~ "Ak si nie ste istý vaším programom, zistite si, prosím, APN vášho "
-#~ "programu u vášho poskytovateľa."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Zvoľte si program fakturácie"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Vaše mobilné pripojenie je nakonfigurované pomocou nasledovných nastavení:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Vaše zariadenie:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Váš poskytovateľ:"
-
-# PM: bolo by dobré uviesť čo je to za program
-# PK: tipujem ze to je nieco ako tarif alebo zmluva (orange co ma programy)
-#~ msgid "Your Plan:"
-#~ msgstr "Váš program:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Teraz bude vytvorené pripojenie k vášmu poskytovateľovi mobilného "
-#~ "pripojenia pomocou nastavení, ktoré ste si zvolili.  Ak pripojenie zlyhá, "
-#~ "alebo sa nebudete môcť dostať k sieťovým prostriedkom, preverte vaše "
-#~ "nastavenia. Keď chcete zmeniť nastavenia vášho mobilného pripojenia, tak "
-#~ "zvoľte „Sieťové pripojenia“ z ponuky Systém >> Nastavenia."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Potvrďte nastavenia mobilného pripojenia"
-
-# ssid
-#~ msgid "(None)"
-#~ msgstr "(Žiadne)"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certifikát v %s"
-
-# base connection, device type
-#~ msgid "(Unknown)"
-#~ msgstr "(Neznáme)"
-
-#~ msgid "Cancel"
-#~ msgstr "Zrušiť"
-
-#~ msgid "Select from file…"
-#~ msgstr "Vybrať zo súboru…"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Zvoliť certifikát CA"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Po_užívateľov certifikát:"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Chyba počas prihlasovania"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Chyba pri úprave pripojenia"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Odomknúť"
-
-#~ msgid "_Login"
-#~ msgstr "_Prihlásiť"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "Za_pamätať PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Uložiť heslo iba pre tohto používateľa"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Uložiť heslo pre všetkých používateľov"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Zakaždým si pýtať toto heslo"
-
-#~ msgid "The password is not required"
-#~ msgstr "Heslo nie je potrebné"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Z_obraziť heslá"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Treťoradé heslo:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Druhoradé heslo:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Heslo:"
-
-# tooltip
-#~ msgid "Click to connect"
-#~ msgstr "Kliknutím pripojíte"
-
-#~ msgid "New…"
-#~ msgstr "Nové…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Žiadne"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynamické WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "Vy_tvoriť"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Na prístup do siete Wi-Fi „%s“ je vyžadované heslo alebo šifrovací kľúč."
-
-# window title
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Žiadosť o overenie totožnosti pre sieť Wi-Fi"
-
-# desc
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Vyžaduje sa overenie totožnosti pre sieť Wi-Fi"
-
-#  window title
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Vytvorenie novej siete Wi-Fi"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nová sieť Wi-Fi"
-
-#~ 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
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Pripojenie k skrytej sieti Wi-Fi"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Skrytá sieť Wi-Fi"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Zadajte názov a podrobnosti o zabezpečení skrytej siete W-Fi, ku ktorej "
-#~ "sa chcete pripojiť."
-
-# GtkLabel label
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Zabezpečenie _Wi-Fi"
-
-# GtkLabel label
-#~ msgid "C_onnection"
-#~ msgstr "_Pripojenie"
-
-# GtkLabel label
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Adaptér Wi-Fi"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Nenašiel som môjho poskytovateľa, chcem ho zadať _ručne:"
-
-#~ msgid "Provider:"
-#~ msgstr "Poskytovateľ:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Zoznam krajín alebo regiónov:"
-
-#~ msgid "Country or region"
-#~ msgstr "Krajina alebo región"
-
-#~ msgid "Wired"
-#~ msgstr "Drôtové"
-
-# MČ: asi by som Mesh neprekladal. Podľa tohoto to vyzerá na špecialny typ bezdrôtovej siete: 
https://wiki.laptop.org/go/Mesh_Network_Details
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Buď chýba heslo, alebo je pripojenie neplatné. V poslednom rade budete "
-#~ "musieť najskôr upraviť pripojenie pomocou editora nm-connection-editor"
-
-# GtkLabel label
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Zabezpečenie _Wi-Fi:"
-
-# GtkLabel label
-#~ msgid "_Network name:"
-#~ msgstr "_Názov siete:"
-
-# GtkLabel label
-#~ msgid "C_onnection:"
-#~ msgstr "_Pripojenie:"
-
-# GtkLabel label
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Adaptér Wi-Fi:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/sl.po b/po/sl.po
index 710193b8..d79dbbc6 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2015-03-24 19:43+0100\n"
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
@@ -25,6 +25,7 @@ msgstr ""
 "X-Generator: Poedit 1.5.4\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Omrežje"
 
@@ -215,15 +216,19 @@ msgstr "Overitev 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "Po_veži se"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Ime omrežja:"
@@ -576,7 +581,7 @@ msgstr "Mobilni širokopasovni dostop (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobilni širokopasovni dostop"
 
@@ -699,7 +704,9 @@ msgstr "DSL overitev"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -807,6 +814,7 @@ msgid "Error displaying connection information:"
 msgstr "Napaka pri prikazovanju podrobnosti o povezavi:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -957,7 +965,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Geslo:"
@@ -982,7 +990,8 @@ msgstr "Pasica VPN"
 msgid "Base Connection"
 msgstr "Osnovna povezava"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Neznano"
 
@@ -1761,6 +1770,7 @@ msgid "_Service"
 msgstr "_Storitev:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2421,6 +2431,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Omogoči _prehajanje, če domače omrežje ni na voljo"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Pokaži _gesla"
 
@@ -2825,13 +2836,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Eternet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3157,12 +3169,12 @@ msgstr ""
 "načine."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3172,22 +3184,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Vez"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Skupina"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Premosti"
 
@@ -3492,6 +3507,7 @@ msgid "Select a connection to delete"
 msgstr "Povezava skupine %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Ime"
 
@@ -3714,6 +3730,8 @@ msgstr "Povezava eternet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Privzeto"
 
@@ -3947,35 +3965,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Moj ponudnik uporablja na _CDMA osnovano tehnologijo (npr. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4140,10 +4158,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Povezava Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Ključ WEP 40/128-bit (Šestnajstiški ali ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "128-bit šifrirno geslo WEP"
 
@@ -4152,14 +4172,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamični WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "Osebni WPA in WPA2"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "Podjetniški WPA in WPA2"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Osebni WPA in WPA2"
@@ -4238,6 +4261,487 @@ msgstr "Podatki o povezavi"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Ni _zahtevano nobeno potrdilo"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Izbor potrdila CA"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Osebni _ključ:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_Geslo osebnega ključa:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Izbor potrdila CA"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_Uporabniško potrdilo:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Moje države ni na seznamu"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Nenavedeno"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Moj načrt ni na seznamu ..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Ponudnik"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Nameščena naprava GSM"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Nameščena naprava CDMA"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Katerakoli naprava"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nova mobilna širokopasovna povezava"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Pomočnik pomaga pri hitrem nastavljanju mobilne širokopasovne povezavo v "
+"mobilno 3G omrežje."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Navesti je treba naslednje podatke:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Ime ponudnika širokopasovnih storitev"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Ime naročniškega paketa širokopasovnega dostopa"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(v nekaterih primerih) IPK (Ime PriKlopne točke) vašega širokopasovnega "
+"naročniškega paketa"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Ustvari povezavo za _to širokopasovno mobilno napravo:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Nastavite mobilno širokopasovno povezavo"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Država ali regija"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Izberite državo ali področje svojega ponudnika"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "S _seznama izberite svojega ponudnika:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Ponudnika ne morem najti, zato želim nastavitve vnesti _ročno:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Ponudnik uporablja tehnologijo GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Ponudnik uporablja tehnologijo CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Izbor ponudnika"
+
+# tukaj govorimo o načinu preklopa
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Izberite svoj naročniški paket:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Izbor _IPK (Imena PriKlopne točke) paketa:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Opozorilo: izbira napačne priklopne točke lahko neugodno vpliva na znesek "
+"računa vašega širokopasovnega dostopa ali prepreči povezovanje.\n"
+"\n"
+"Če ne veste, kaj izbrati, vprašajte svojega ponudnika za priklopno točko za "
+"vaš naročniški paket."
+
+# način je bolj smiselno kot načrt ..
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Izbor naročniškega paketa"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Vaša mobilna širokopasovna povezava ima naslednje nastavitve:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Vaša naprava:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Vaš ponudnik:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Vaš naročniški paket:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"S ponudnikom mobilnega širokopasovnega omrežja bo vzpostavljena povezava z "
+"izbranimi nastavitvami. V primeru, da povezava spodleti ali pa omrežnih "
+"sredstev ni mogoče uporabljati, preverite svoje nastavitve. Za spremembo "
+"nastavitev mobilne širokopasovne povezave izberite \"Omrežne povezave\" v "
+"meniju Sistem >> Možnosti. "
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Potrdite nastavitve mobilnega širokopasovnega omrežja"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(brez)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Potrdilo _CA:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Neznano"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Izbor potrdila CA"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Uporabniško potrdilo:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Napaka med urejanjem povezave"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Odkleni"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "Shrani gesla le za tega _uporabnika"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "Shrani gesla za _vse uporabnike"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "Vsakokrat _vprašaj za to geslo"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Za povezavo z '%s' je zahtevano geslo."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "_Pokaži gesla"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Drugotno geslo:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Drugotno geslo:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Geslo:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Prekini povezavo"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Brez"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dinamični WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "Ustva_ri"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Za povezavo v brezžično omrežje '%s' je zahtevana overitev ali nastavitev "
+"šifrirnega ključa."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Zahtevana je overitev za brezžično omrežje"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Brezžično omrežje zahteva overitev"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Ustvari novo brezžično omrežje"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Novo omrežje Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Vnesite ime brezžičnega omrežja, ki ga želite ustvariti."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Poveži se s skritim omrežjem Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Skrito omrežje Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Vnesite ime in varnostne podrobnosti skritega omrežja Wi-Fi, s katerim se "
+"želite povezati."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Varnost Wi-Fi:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "P_ovezava:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Vmeskin Wi-Fi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Ponudnika ne morem najti, zato želim nastavitve vnesti _ročno:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Ponudnik:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Seznama držav ali regij:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Država ali regija"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Žično"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "Mreža OLPC"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Varnost Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Ime omrežja:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "P_ovezava:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Vmeskin Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Uporaba:"
@@ -4386,26 +4890,26 @@ msgstr "Ni _zahtevano nobeno potrdilo"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Izbor datoteke PAC ..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Datoteke PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Vse datoteke"
 
@@ -4444,16 +4948,16 @@ msgstr "_Notranja overitev:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Dovoli samodejno odbiro PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4489,15 +4993,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4511,24 +5015,24 @@ msgstr "128-bit šifrirno geslo WEP"
 msgid "Sh_ow passphrase"
 msgstr "_Pokaži gesla"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ni _zahtevano nobeno potrdilo"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4537,7 +5041,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "_Istovetnost:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4577,15 +5081,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Overitev:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_Geslo osebnega ključa:"
@@ -4595,33 +5099,33 @@ msgstr "_Geslo osebnega ključa:"
 msgid "_Type"
 msgstr "Vrs_ta:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4651,340 +5155,17 @@ msgstr "_Pokaži ključ"
 msgid "WEP inde_x"
 msgstr "_Določilo WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Ni _zahtevano nobeno potrdilo"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Izbor potrdila CA"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Osebni _ključ:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Geslo osebnega ključa:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Izbor potrdila CA"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Uporabniško potrdilo:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Moje države ni na seznamu"
-
-#~ msgid "Unlisted"
-#~ msgstr "Nenavedeno"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Moj načrt ni na seznamu ..."
-
-#~ msgid "Provider"
-#~ msgstr "Ponudnik"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Nameščena naprava GSM"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Nameščena naprava CDMA"
-
-#~ msgid "Any device"
-#~ msgstr "Katerakoli naprava"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nova mobilna širokopasovna povezava"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Pomočnik pomaga pri hitrem nastavljanju mobilne širokopasovne povezavo v "
-#~ "mobilno 3G omrežje."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Navesti je treba naslednje podatke:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Ime ponudnika širokopasovnih storitev"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Ime naročniškega paketa širokopasovnega dostopa"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(v nekaterih primerih) IPK (Ime PriKlopne točke) vašega širokopasovnega "
-#~ "naročniškega paketa"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Ustvari povezavo za _to širokopasovno mobilno napravo:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Nastavite mobilno širokopasovno povezavo"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Država ali regija"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Izberite državo ali področje svojega ponudnika"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "S _seznama izberite svojega ponudnika:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Ponudnika ne morem najti, zato želim nastavitve vnesti _ročno:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Ponudnik uporablja tehnologijo GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Ponudnik uporablja tehnologijo CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Izbor ponudnika"
-
-# tukaj govorimo o načinu preklopa
-#~ msgid "_Select your plan:"
-#~ msgstr "_Izberite svoj naročniški paket:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Izbor _IPK (Imena PriKlopne točke) paketa:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Opozorilo: izbira napačne priklopne točke lahko neugodno vpliva na znesek "
-#~ "računa vašega širokopasovnega dostopa ali prepreči povezovanje.\n"
-#~ "\n"
-#~ "Če ne veste, kaj izbrati, vprašajte svojega ponudnika za priklopno točko "
-#~ "za vaš naročniški paket."
-
-# način je bolj smiselno kot načrt ..
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Izbor naročniškega paketa"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "Vaša mobilna širokopasovna povezava ima naslednje nastavitve:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Vaša naprava:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Vaš ponudnik:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Vaš naročniški paket:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "S ponudnikom mobilnega širokopasovnega omrežja bo vzpostavljena povezava "
-#~ "z izbranimi nastavitvami. V primeru, da povezava spodleti ali pa omrežnih "
-#~ "sredstev ni mogoče uporabljati, preverite svoje nastavitve. Za spremembo "
-#~ "nastavitev mobilne širokopasovne povezave izberite \"Omrežne povezave\" v "
-#~ "meniju Sistem >> Možnosti. "
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Potrdite nastavitve mobilnega širokopasovnega omrežja"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(brez)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Potrdilo _CA:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Neznano"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Izbor potrdila CA"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Uporabniško potrdilo:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Napaka med urejanjem povezave"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Odkleni"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "Shrani gesla le za tega _uporabnika"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "Shrani gesla za _vse uporabnike"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "Vsakokrat _vprašaj za to geslo"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Za povezavo z '%s' je zahtevano geslo."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "_Pokaži gesla"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Drugotno geslo:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Drugotno geslo:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Geslo:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Prekini povezavo"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Brez"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dinamični WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "Ustva_ri"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Za povezavo v brezžično omrežje '%s' je zahtevana overitev ali nastavitev "
-#~ "šifrirnega ključa."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Zahtevana je overitev za brezžično omrežje"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Brezžično omrežje zahteva overitev"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Ustvari novo brezžično omrežje"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Novo omrežje Wi-Fi"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Poveži se s skritim omrežjem Wi-Fi"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Skrito omrežje Wi-Fi"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Vnesite ime in varnostne podrobnosti skritega omrežja Wi-Fi, s katerim se "
-#~ "želite povezati."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Varnost Wi-Fi:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "P_ovezava:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Vmeskin Wi-Fi:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Ponudnika ne morem najti, zato želim nastavitve vnesti _ročno:"
-
-#~ msgid "Provider:"
-#~ msgstr "Ponudnik:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Seznama držav ali regij:"
-
-#~ msgid "Country or region"
-#~ msgstr "Država ali regija"
-
-#~ msgid "Wired"
-#~ msgstr "Žično"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "Mreža OLPC"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Varnost Wi-Fi:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Ime omrežja:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "P_ovezava:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Vmeskin Wi-Fi:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (privzeto)"
 
diff --git a/po/sq.po b/po/sq.po
index e754ed52..30c9b6d8 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2004-09-15 11:49+0200\n"
 "Last-Translator: Laurent Dhima <laurenti alblinux net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit lists sourceforge net>\n"
@@ -18,6 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 #, fuzzy
 msgid "Network"
 msgstr "Ndrysho Rrjetet Wireless"
@@ -200,15 +201,19 @@ msgstr ""
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr ""
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "Lidhjet e rrjetit"
@@ -531,7 +536,7 @@ msgstr ""
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr ""
 
@@ -655,7 +660,9 @@ msgstr ""
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -762,6 +769,7 @@ msgid "Error displaying connection information:"
 msgstr ""
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr ""
@@ -907,7 +915,7 @@ msgstr ""
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Fjalëkalimi:"
@@ -933,7 +941,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "Lidhjet e rrjetit"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr ""
 
@@ -1650,6 +1659,7 @@ msgid "_Service"
 msgstr ""
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2256,6 +2266,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr ""
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr ""
 
@@ -2642,13 +2653,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -2951,12 +2963,12 @@ msgid ""
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -2966,22 +2978,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3267,6 +3282,7 @@ msgid "Select a connection to delete"
 msgstr "Lidhjet e rrjetit"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
@@ -3479,6 +3495,8 @@ msgstr ""
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr ""
 
@@ -3693,35 +3711,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr ""
 
@@ -3872,10 +3890,12 @@ msgid "Wi-Fi connection %d"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 #, fuzzy
 msgid "WEP 128-bit Passphrase"
 msgstr "Fjalëkalimi:"
@@ -3885,14 +3905,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 msgid "WPA3 Personal"
 msgstr ""
 
@@ -3963,6 +3986,450 @@ msgstr ""
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Fjalëkalimi:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr ""
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+#, fuzzy
+msgid "New Mobile Broadband Connection"
+msgstr "Lidhjet e rrjetit"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr ""
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr ""
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Fjalëkalimi:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Nevoitet Kyçi i Rrjetit Wireless"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr ""
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Lidhjet e rrjetit"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:129
+#, fuzzy
+msgid "_Network name:"
+msgstr "Lidhjet e rrjetit"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "Lidhjet e rrjetit"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr ""
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr ""
@@ -4109,25 +4576,25 @@ msgstr ""
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4163,16 +4630,16 @@ msgstr ""
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr ""
@@ -4207,15 +4674,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4228,23 +4695,23 @@ msgstr "Fjalëkalimi:"
 msgid "Sh_ow passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4252,7 +4719,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
@@ -4290,15 +4757,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Fjalëkalimi:"
@@ -4307,33 +4774,33 @@ msgstr "Fjalëkalimi:"
 msgid "_Type"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4361,49 +4828,17 @@ msgstr ""
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Fjalëkalimi:"
-
-#, fuzzy
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Lidhjet e rrjetit"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Fjalëkalimi:"
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Nevoitet Kyçi i Rrjetit Wireless"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Ndrysho Rrjetet Wireless"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Lidhjet e rrjetit"
-
-#, fuzzy
-#~ msgid "_Network name:"
-#~ msgstr "Lidhjet e rrjetit"
-
-#, fuzzy
-#~ msgid "C_onnection:"
-#~ msgstr "Lidhjet e rrjetit"
-
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "NetworkManager nuk është duke punuar..."
diff --git a/po/sr.po b/po/sr.po
index 7e912668..29102350 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2018-02-24 19:43+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
 "Language-Team: српски <gnome-sr googlegroups org>\n"
@@ -25,6 +25,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Мрежа"
 
@@ -220,15 +221,19 @@ msgstr "Потврђивање идентитета за 802.1X везу"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Повежи"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Име мреже:"
@@ -574,7 +579,7 @@ msgstr "Мобилна веза (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Мобилна"
 
@@ -695,7 +700,9 @@ msgstr "Потврђивање идентитета ДСЛ-а"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "У _реду"
 
@@ -802,6 +809,7 @@ msgid "Error displaying connection information:"
 msgstr "Грешка при приказивању података о вези:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "ЛЕАП"
@@ -951,7 +959,7 @@ msgstr "ИПв6"
 msgid "Hotspot"
 msgstr "Врућа тачка"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Лозинка:"
@@ -976,7 +984,8 @@ msgstr "ВПН банер"
 msgid "Base Connection"
 msgstr "Веза основе"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Непознато"
 
@@ -1754,6 +1763,7 @@ msgid "_Service"
 msgstr "С_ервис:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2436,6 +2446,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Дозволи _роминг уколико нема домаће мреже"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Прикажи _лозинке"
 
@@ -2862,13 +2873,14 @@ msgstr "ЛАЦП"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Жичана веза"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "ВЛАН"
 
@@ -3218,12 +3230,12 @@ msgstr ""
 "идентитета. Ако веза не успе, покушајте да искључите подршку за неке начине."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Бежична"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Блутут"
 
@@ -3233,22 +3245,25 @@ msgid "DSL/PPPoE"
 msgstr "ДСЛ/ПППоЕ"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "Инфини банд"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Веза"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Тим"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Мост"
 
@@ -3549,6 +3564,7 @@ msgid "Select a connection to delete"
 msgstr "Изаберите везу за брисање"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Назив"
 
@@ -3762,6 +3778,8 @@ msgstr "Жичана веза %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Подразумевана"
 
@@ -3989,35 +4007,35 @@ msgstr "Мој издавач користи _ГСМ технологије (н
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Мој издавач користи Ц_ДМА технологије (нпр. 1xРТТ, ЕВДО)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "ЦДМА"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "ГСМ"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "ПАП"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "ЦХАП"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "МСЦХАПв2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "МСЦХАП"
 
@@ -4175,10 +4193,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Бежична веза %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "ВЕП 40/128-битни кључ (Хекс или АСКРИ)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "ВЕП 128-битна лозинка"
 
@@ -4187,14 +4207,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Динамички ВЕП (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "Лични ВПА & ВПА2"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "Пословни ВПА & ВПА2"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Лични ВПА & ВПА2"
@@ -4270,6 +4293,467 @@ msgstr "Подаци о вези"
 msgid "_Close"
 msgstr "_Затвори"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Није подешено уверење"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Није подешен кључ"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Изаберите кључ за „%s“ уверење"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "„%s“ приватни _кључ:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "„%s“ _лозинка кључа:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Изаберите „%s“ уверење"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "„%s“ _уверење:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Моја земља није на списку"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Неизлистано"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Мој план није на списку…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Достављач"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Инсталиран ГСМ уређај"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Инсталиран ЦДМС уређај"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Било који уређај"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Нова мобилна, широкопојасна веза"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Овај чаробњак ће вам помоћи да лако подесите мобилну широкопојасну везу са "
+"3Г мрежом."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Потребни су вам следећи подаци:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Име издавача широкопојасне услуге"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Име широкопојасног плана наплате"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(у неким случајевима) ваш план широкопојасне наплате за АПН (Назив тачке "
+"приступа)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Направи везу за _овај мобилни, широкопојасни уређај:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Подеси мобилну, широкопојасну везу"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Држава или регион"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Изаберите државу или регион вашег достављача услуга"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Изабери издавача Интернет услуга са _списка:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Не могу да нађем издавача и желим да га унесем _ручно:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Мој издавач користи ГСМ (ГПРС, ЕДГЕ, УМТС, ХСПА)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Мој издавач користи ЦДМА (1xРТТ, ЕВДО)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Изаберите издавача услуга"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Изабери мој план:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Изабрани _НТП план (Назив тачке приступа):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Упозорење: Избор неисправног плана може да утиче на начин плаћања "
+"широкопојасне мреже или да онемогући повезивање.\n"
+"\n"
+"Уколико нисте сигурни за начин плаћања затражите АПН план од издавача "
+"Интернет услуге."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Изаберите план наплате"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Ваша мобилна широкопојасна веза је подешена са следећим параметрима:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Ваш уређај:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Ваш повајдер:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Ваш план:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Сада ће бити направљена веза са вашим издавачем мобилних широкопојасних "
+"услуга на основу подешавања које сте унели. Уколико не успете да се повежете "
+"на мрежу, проверите поново унета подешавања. За измену подешавања, изаберите "
+"„Везе са мрежом“ из изборника Систем → Поставке."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Потврдите мобилну широкопојасну везу"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Ништа)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Кључ у „%s“"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Уверење у „%s“"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Непознато)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Изабери"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Откажи"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Изабери из датотеке…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Изаберите „%s“ уверење"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Лозинка „%s“ уверења:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Грешка пријављивања"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Грешка отварања сесије"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Откључај модул"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Издаје га"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Унесите „%s“ ПИН"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Пријави ме"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Запамти ПИН"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Сачувај лозинку само за овог корисника"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Сачувај лозинку за све кориснике"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Увек затражи ову лозинку"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Лозинка није потребна"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Прикажи _лозинке"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Трећа лозинка:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Друга лозинка:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Лозинка:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Притисните да се повежете"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Ново…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ништа"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Динамички ВЕП (802.1х)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Направи"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Потребне су лозинке или кључеви шифровања за приступ бежичној мрежи „%s“."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Потребно је потврђивање идентитета за бежичну мрежу"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Бежична мрежа захтева потврђивање идентитета"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Направи нову бежичну мрежу"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Нова бежична мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Унесите назив за нову бежичну мрежу."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Повежи се на скривену бежичну мрежу"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Скривена бежична мрежа"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Унесите назив и безбедносне податке за скривену бежичну мрежу на коју желите "
+"да се повежете."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Бежична _безбедност:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "_Веза:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Бежични _уређај:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Не могу да нађем издавача и желим да га унесем _ручно:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Издавач:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Списак држава или региона:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Држава или регион"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Жичана"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "ОЛПЦ мрежица"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "АДСЛ"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "ПЦИ"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "УСБ"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Или недостаје лозинка или је веза неисправна. У сваком случају, прво ћете "
+"морати да уредите везу у уређивачу веза"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Бежична _безбедност:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Име мреже:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Веза:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Бежични _уређај:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Употреба:"
@@ -4418,25 +4902,25 @@ msgstr "Није изабрано уверење"
 msgid "selected CA certificate file does not exist"
 msgstr "изабрана датотека уверења не постоји"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "недостаје ЕАП-ФАСТ ПАЦ датотека"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "ГТЦ"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Изабери ПАЦ датотеку"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "ПАЦ датотеке (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Све датотеке"
 
@@ -4476,16 +4960,16 @@ msgstr "_Унутрашња пријава:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Дозволи самостално ПАЦ _резервисање"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "недостаје ЕАП-ЛЕАП корисничко име"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "недостаје ЕАП-ЛЕАП лозинка"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "МД5"
@@ -4522,15 +5006,15 @@ msgstr "Суфикс назива уверења сервера."
 msgid "_Domain"
 msgstr "_Домен:"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "недостаје ЕАП корисничко име"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "недостаје ЕАП лозинка"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4544,23 +5028,23 @@ msgstr "ВЕП 128-битна лозинка"
 msgid "Sh_ow passphrase"
 msgstr "Прикажи _лозинке"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "недостаје ЕАП-ТЛС идентитет"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "није изабрано корисничко уверење"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "изабрана датотека корисничког уверења не постоји"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "није изабран кључ"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "изабрана датотека кључа не постоји"
 
@@ -4569,7 +5053,7 @@ msgstr "изабрана датотека кључа не постоји"
 msgid "I_dentity"
 msgstr "_Идентитет:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "МСЦХАПв2 (без ЕАП-а)"
 
@@ -4608,15 +5092,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "По_тврђивање идентитета:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "недостаје леап корисничко име"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "недостаје леап лозинка"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "недостаје ЕАП лозинка"
@@ -4626,22 +5110,22 @@ msgstr "недостаје ЕАП лозинка"
 msgid "_Type"
 msgstr "_Врста:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "недостаје веп кључ"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4650,11 +5134,11 @@ msgstr ""
 "неисправан веп кључ: погрешна дужина кључа %zu. Кључ мора бити или дужине "
 "5/13 (аскри) или 10/26 (хекс)"
 
-#: src/wireless-security/ws-wep-key.c:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "неисправан веп-кључ: лозинка не сме бити празна"
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "неисправан веп-кључ: лозинка мора бити краћа од 64 знака"
 
@@ -4684,7 +5168,7 @@ msgstr "П_рикажи кључ"
 msgid "WEP inde_x"
 msgstr "ВЕП _индекс:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4693,356 +5177,12 @@ msgstr ""
 "неисправна впа лозинка: неисправна дужина кључа %zu. Мора бити [8,63] бајта "
 "или 64 хекса-броја"
 
-#: src/wireless-security/ws-wpa-psk.c:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "неисправна впа лозинка: не могу да растумачим кључ од 64 бајта као "
 "хексадецимални"
 
-#~ msgid "No certificate set"
-#~ msgstr "Није подешено уверење"
-
-#~ msgid "No key set"
-#~ msgstr "Није подешен кључ"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Изаберите кључ за „%s“ уверење"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "„%s“ приватни _кључ:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "„%s“ _лозинка кључа:"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Изаберите „%s“ уверење"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "„%s“ _уверење:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Моја земља није на списку"
-
-#~ msgid "Unlisted"
-#~ msgstr "Неизлистано"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Мој план није на списку…"
-
-#~ msgid "Provider"
-#~ msgstr "Достављач"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Инсталиран ГСМ уређај"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Инсталиран ЦДМС уређај"
-
-#~ msgid "Any device"
-#~ msgstr "Било који уређај"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Нова мобилна, широкопојасна веза"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Овај чаробњак ће вам помоћи да лако подесите мобилну широкопојасну везу "
-#~ "са 3Г мрежом."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Потребни су вам следећи подаци:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Име издавача широкопојасне услуге"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Име широкопојасног плана наплате"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(у неким случајевима) ваш план широкопојасне наплате за АПН (Назив тачке "
-#~ "приступа)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Направи везу за _овај мобилни, широкопојасни уређај:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Подеси мобилну, широкопојасну везу"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Држава или регион"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Изаберите државу или регион вашег достављача услуга"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Изабери издавача Интернет услуга са _списка:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Не могу да нађем издавача и желим да га унесем _ручно:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Мој издавач користи ГСМ (ГПРС, ЕДГЕ, УМТС, ХСПА)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Мој издавач користи ЦДМА (1xРТТ, ЕВДО)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Изаберите издавача услуга"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Изабери мој план:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Изабрани _НТП план (Назив тачке приступа):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Упозорење: Избор неисправног плана може да утиче на начин плаћања "
-#~ "широкопојасне мреже или да онемогући повезивање.\n"
-#~ "\n"
-#~ "Уколико нисте сигурни за начин плаћања затражите АПН план од издавача "
-#~ "Интернет услуге."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Изаберите план наплате"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Ваша мобилна широкопојасна веза је подешена са следећим параметрима:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Ваш уређај:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Ваш повајдер:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Ваш план:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Сада ће бити направљена веза са вашим издавачем мобилних широкопојасних "
-#~ "услуга на основу подешавања које сте унели. Уколико не успете да се "
-#~ "повежете на мрежу, проверите поново унета подешавања. За измену "
-#~ "подешавања, изаберите „Везе са мрежом“ из изборника Систем → Поставке."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Потврдите мобилну широкопојасну везу"
-
-#~ msgid "(None)"
-#~ msgstr "(Ништа)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Кључ у „%s“"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Уверење у „%s“"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Непознато)"
-
-#~ msgid "Select"
-#~ msgstr "Изабери"
-
-#~ msgid "Cancel"
-#~ msgstr "Откажи"
-
-#~ msgid "Select from file…"
-#~ msgstr "Изабери из датотеке…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Изаберите „%s“ уверење"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Лозинка „%s“ уверења:"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Грешка пријављивања"
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Грешка отварања сесије"
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Откључај модул"
-
-#~ msgid "Issued By"
-#~ msgstr "Издаје га"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Унесите „%s“ ПИН"
-
-#~ msgid "_Login"
-#~ msgstr "_Пријави ме"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Запамти ПИН"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Сачувај лозинку само за овог корисника"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Сачувај лозинку за све кориснике"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Увек затражи ову лозинку"
-
-#~ msgid "The password is not required"
-#~ msgstr "Лозинка није потребна"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Прикажи _лозинке"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Трећа лозинка:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Друга лозинка:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Лозинка:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Притисните да се повежете"
-
-#~ msgid "New…"
-#~ msgstr "Ново…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Ништа"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Динамички ВЕП (802.1х)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Направи"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Потребне су лозинке или кључеви шифровања за приступ бежичној мрежи „%s“."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Потребно је потврђивање идентитета за бежичну мрежу"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Бежична мрежа захтева потврђивање идентитета"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Направи нову бежичну мрежу"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Нова бежична мрежа"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Унесите назив за нову бежичну мрежу."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Повежи се на скривену бежичну мрежу"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Скривена бежична мрежа"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Унесите назив и безбедносне податке за скривену бежичну мрежу на коју "
-#~ "желите да се повежете."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Бежична _безбедност:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "_Веза:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Бежични _уређај:"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Не могу да нађем издавача и желим да га унесем _ручно:"
-
-#~ msgid "Provider:"
-#~ msgstr "Издавач:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Списак држава или региона:"
-
-#~ msgid "Country or region"
-#~ msgstr "Држава или регион"
-
-#~ msgid "Wired"
-#~ msgstr "Жичана"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "ОЛПЦ мрежица"
-
-#~ msgid "ADSL"
-#~ msgstr "АДСЛ"
-
-#~ msgid "PCI"
-#~ msgstr "ПЦИ"
-
-#~ msgid "USB"
-#~ msgstr "УСБ"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Или недостаје лозинка или је веза неисправна. У сваком случају, прво ћете "
-#~ "морати да уредите везу у уређивачу веза"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Бежична _безбедност:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Име мреже:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "_Веза:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Бежични _уређај:"
-
 #, fuzzy
 #~ msgid "CKN"
 #~ msgstr "ЦКН:"
diff --git a/po/sr latin po b/po/sr latin po
index 74c1fb5a..f897e2dd 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2018-02-24 19:43+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
 "Language-Team: srpski <gnome-sr googlegroups org>\n"
@@ -25,6 +25,7 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Mreža"
 
@@ -221,15 +222,19 @@ msgstr "Potvrđivanje identiteta za 802.1X vezu"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Otkaži"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Poveži"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Ime mreže:"
@@ -576,7 +581,7 @@ msgstr "Mobilna veza (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobilna"
 
@@ -697,7 +702,9 @@ msgstr "Potvrđivanje identiteta DSL-a"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "U _redu"
 
@@ -804,6 +811,7 @@ msgid "Error displaying connection information:"
 msgstr "Greška pri prikazivanju podataka o vezi:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -953,7 +961,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Vruća tačka"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Lozinka:"
@@ -978,7 +986,8 @@ msgstr "VPN baner"
 msgid "Base Connection"
 msgstr "Veza osnove"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Nepoznato"
 
@@ -1758,6 +1767,7 @@ msgid "_Service"
 msgstr "S_ervis:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2441,6 +2451,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Dozvoli _roming ukoliko nema domaće mreže"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Prikaži _lozinke"
 
@@ -2867,13 +2878,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Žičana veza"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3224,12 +3236,12 @@ msgstr ""
 "za neke načine."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Bežična"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Blutut"
 
@@ -3239,22 +3251,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "Infini band"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Veza"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Tim"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Most"
 
@@ -3555,6 +3570,7 @@ msgid "Select a connection to delete"
 msgstr "Izaberite vezu za brisanje"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Naziv"
 
@@ -3768,6 +3784,8 @@ msgstr "Žičana veza %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Podrazumevana"
 
@@ -3995,35 +4013,35 @@ msgstr "Moj izdavač koristi _GSM tehnologije (npr. GPRS, EDGE, UMTS, HSDPA)"
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Moj izdavač koristi C_DMA tehnologije (npr. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4181,10 +4199,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Bežična veza %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "VEP 40/128-bitni ključ (Heks ili ASKRI)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "VEP 128-bitna lozinka"
 
@@ -4193,14 +4213,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamički VEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "Lični VPA & VPA2"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "Poslovni VPA & VPA2"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "Lični VPA & VPA2"
@@ -4276,6 +4299,467 @@ msgstr "Podaci o vezi"
 msgid "_Close"
 msgstr "_Zatvori"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Nije podešeno uverenje"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Nije podešen ključ"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Izaberite ključ za „%s“ uverenje"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "„%s“ privatni _ključ:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "„%s“ _lozinka ključa:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Izaberite „%s“ uverenje"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "„%s“ _uverenje:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Moja zemlja nije na spisku"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Neizlistano"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Moj plan nije na spisku…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Dostavljač"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Instaliran GSM uređaj"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Instaliran CDMS uređaj"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Bilo koji uređaj"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Nova mobilna, širokopojasna veza"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Ovaj čarobnjak će vam pomoći da lako podesite mobilnu širokopojasnu vezu sa "
+"3G mrežom."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Potrebni su vam sledeći podaci:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Ime izdavača širokopojasne usluge"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Ime širokopojasnog plana naplate"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(u nekim slučajevima) vaš plan širokopojasne naplate za APN (Naziv tačke "
+"pristupa)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Napravi vezu za _ovaj mobilni, širokopojasni uređaj:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Podesi mobilnu, širokopojasnu vezu"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Država ili region"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Izaberite državu ili region vašeg dostavljača usluga"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Izaberi izdavača Internet usluga sa _spiska:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Ne mogu da nađem izdavača i želim da ga unesem _ručno:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Moj izdavač koristi GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Moj izdavač koristi CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Izaberite izdavača usluga"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Izaberi moj plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Izabrani _NTP plan (Naziv tačke pristupa):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Upozorenje: Izbor neispravnog plana može da utiče na način plaćanja "
+"širokopojasne mreže ili da onemogući povezivanje.\n"
+"\n"
+"Ukoliko niste sigurni za način plaćanja zatražite APN plan od izdavača "
+"Internet usluge."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Izaberite plan naplate"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Vaša mobilna širokopojasna veza je podešena sa sledećim parametrima:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Vaš uređaj:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Vaš povajder:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Vaš plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Sada će biti napravljena veza sa vašim izdavačem mobilnih širokopojasnih "
+"usluga na osnovu podešavanja koje ste uneli. Ukoliko ne uspete da se "
+"povežete na mrežu, proverite ponovo uneta podešavanja. Za izmenu "
+"podešavanja, izaberite „Veze sa mrežom“ iz izbornika Sistem → Postavke."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Potvrdite mobilnu širokopojasnu vezu"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Ništa)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Ključ u „%s“"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Uverenje u „%s“"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Nepoznato)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Izaberi"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Otkaži"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Izaberi iz datoteke…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Izaberite „%s“ uverenje"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Lozinka „%s“ uverenja:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Greška prijavljivanja"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Greška otvaranja sesije"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Otključaj modul"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Izdaje ga"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Unesite „%s“ PIN"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Prijavi me"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Zapamti PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Sačuvaj lozinku samo za ovog korisnika"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Sačuvaj lozinku za sve korisnike"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Uvek zatraži ovu lozinku"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Lozinka nije potrebna"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Prikaži _lozinke"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Treća lozinka:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Druga lozinka:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Lozinka:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Pritisnite da se povežete"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Novo…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ništa"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dinamički VEP (802.1h)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Napravi"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Potrebne su lozinke ili ključevi šifrovanja za pristup bežičnoj mreži „%s“."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Potrebno je potvrđivanje identiteta za bežičnu mrežu"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Bežična mreža zahteva potvrđivanje identiteta"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Napravi novu bežičnu mrežu"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nova bežična mreža"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Unesite naziv za novu bežičnu mrežu."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Poveži se na skrivenu bežičnu mrežu"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Skrivena bežična mreža"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Unesite naziv i bezbednosne podatke za skrivenu bežičnu mrežu na koju želite "
+"da se povežete."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Bežična _bezbednost:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "_Veza:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Bežični _uređaj:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Ne mogu da nađem izdavača i želim da ga unesem _ručno:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Izdavač:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Spisak država ili regiona:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Država ili region"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Žičana"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC mrežica"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Ili nedostaje lozinka ili je veza neispravna. U svakom slučaju, prvo ćete "
+"morati da uredite vezu u uređivaču veza"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Bežična _bezbednost:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Ime mreže:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Veza:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Bežični _uređaj:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Upotreba:"
@@ -4424,25 +4908,25 @@ msgstr "Nije izabrano uverenje"
 msgid "selected CA certificate file does not exist"
 msgstr "izabrana datoteka uverenja ne postoji"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "nedostaje EAP-FAST PAC datoteka"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Izaberi PAC datoteku"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC datoteke (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Sve datoteke"
 
@@ -4482,16 +4966,16 @@ msgstr "_Unutrašnja prijava:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Dozvoli samostalno PAC _rezervisanje"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "nedostaje EAP-LEAP korisničko ime"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "nedostaje EAP-LEAP lozinka"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4528,15 +5012,15 @@ msgstr "Sufiks naziva uverenja servera."
 msgid "_Domain"
 msgstr "_Domen:"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "nedostaje EAP korisničko ime"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "nedostaje EAP lozinka"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4550,23 +5034,23 @@ msgstr "VEP 128-bitna lozinka"
 msgid "Sh_ow passphrase"
 msgstr "Prikaži _lozinke"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "nedostaje EAP-TLS identitet"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "nije izabrano korisničko uverenje"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "izabrana datoteka korisničkog uverenja ne postoji"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "nije izabran ključ"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "izabrana datoteka ključa ne postoji"
 
@@ -4575,7 +5059,7 @@ msgstr "izabrana datoteka ključa ne postoji"
 msgid "I_dentity"
 msgstr "_Identitet:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP-a)"
 
@@ -4614,15 +5098,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Po_tvrđivanje identiteta:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "nedostaje leap korisničko ime"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "nedostaje leap lozinka"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "nedostaje EAP lozinka"
@@ -4632,24 +5116,24 @@ msgstr "nedostaje EAP lozinka"
 msgid "_Type"
 msgstr "_Vrsta:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "nedostaje vep ključ"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4658,11 +5142,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "neispravan vep-ključ: lozinka mora biti kraća od 64 znaka"
 
@@ -4692,7 +5176,7 @@ msgstr "P_rikaži ključ"
 msgid "WEP inde_x"
 msgstr "VEP _indeks:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4701,357 +5185,12 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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 "No certificate set"
-#~ msgstr "Nije podešeno uverenje"
-
-#~ msgid "No key set"
-#~ msgstr "Nije podešen ključ"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Izaberite ključ za „%s“ uverenje"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "„%s“ privatni _ključ:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "„%s“ _lozinka ključa:"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Izaberite „%s“ uverenje"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "„%s“ _uverenje:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Moja zemlja nije na spisku"
-
-#~ msgid "Unlisted"
-#~ msgstr "Neizlistano"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Moj plan nije na spisku…"
-
-#~ msgid "Provider"
-#~ msgstr "Dostavljač"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Instaliran GSM uređaj"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Instaliran CDMS uređaj"
-
-#~ msgid "Any device"
-#~ msgstr "Bilo koji uređaj"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Nova mobilna, širokopojasna veza"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Ovaj čarobnjak će vam pomoći da lako podesite mobilnu širokopojasnu vezu "
-#~ "sa 3G mrežom."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Potrebni su vam sledeći podaci:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Ime izdavača širokopojasne usluge"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Ime širokopojasnog plana naplate"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(u nekim slučajevima) vaš plan širokopojasne naplate za APN (Naziv tačke "
-#~ "pristupa)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Napravi vezu za _ovaj mobilni, širokopojasni uređaj:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Podesi mobilnu, širokopojasnu vezu"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Država ili region"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Izaberite državu ili region vašeg dostavljača usluga"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Izaberi izdavača Internet usluga sa _spiska:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Ne mogu da nađem izdavača i želim da ga unesem _ručno:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Moj izdavač koristi GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Moj izdavač koristi CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Izaberite izdavača usluga"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Izaberi moj plan:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Izabrani _NTP plan (Naziv tačke pristupa):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Upozorenje: Izbor neispravnog plana može da utiče na način plaćanja "
-#~ "širokopojasne mreže ili da onemogući povezivanje.\n"
-#~ "\n"
-#~ "Ukoliko niste sigurni za način plaćanja zatražite APN plan od izdavača "
-#~ "Internet usluge."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Izaberite plan naplate"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Vaša mobilna širokopojasna veza je podešena sa sledećim parametrima:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Vaš uređaj:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Vaš povajder:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Vaš plan:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Sada će biti napravljena veza sa vašim izdavačem mobilnih širokopojasnih "
-#~ "usluga na osnovu podešavanja koje ste uneli. Ukoliko ne uspete da se "
-#~ "povežete na mrežu, proverite ponovo uneta podešavanja. Za izmenu "
-#~ "podešavanja, izaberite „Veze sa mrežom“ iz izbornika Sistem → Postavke."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Potvrdite mobilnu širokopojasnu vezu"
-
-#~ msgid "(None)"
-#~ msgstr "(Ništa)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Ključ u „%s“"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Uverenje u „%s“"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Nepoznato)"
-
-#~ msgid "Select"
-#~ msgstr "Izaberi"
-
-#~ msgid "Cancel"
-#~ msgstr "Otkaži"
-
-#~ msgid "Select from file…"
-#~ msgstr "Izaberi iz datoteke…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Izaberite „%s“ uverenje"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Lozinka „%s“ uverenja:"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Greška prijavljivanja"
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Greška otvaranja sesije"
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Otključaj modul"
-
-#~ msgid "Issued By"
-#~ msgstr "Izdaje ga"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Unesite „%s“ PIN"
-
-#~ msgid "_Login"
-#~ msgstr "_Prijavi me"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Zapamti PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Sačuvaj lozinku samo za ovog korisnika"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Sačuvaj lozinku za sve korisnike"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Uvek zatraži ovu lozinku"
-
-#~ msgid "The password is not required"
-#~ msgstr "Lozinka nije potrebna"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Prikaži _lozinke"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Treća lozinka:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Druga lozinka:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Lozinka:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Pritisnite da se povežete"
-
-#~ msgid "New…"
-#~ msgstr "Novo…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Ništa"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dinamički VEP (802.1h)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Napravi"
-
-#, 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“."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Potrebno je potvrđivanje identiteta za bežičnu mrežu"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Bežična mreža zahteva potvrđivanje identiteta"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Napravi novu bežičnu mrežu"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nova bežična mreža"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Unesite naziv za novu bežičnu mrežu."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Poveži se na skrivenu bežičnu mrežu"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Skrivena bežična mreža"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Unesite naziv i bezbednosne podatke za skrivenu bežičnu mrežu na koju "
-#~ "želite da se povežete."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Bežična _bezbednost:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "_Veza:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Bežični _uređaj:"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Ne mogu da nađem izdavača i želim da ga unesem _ručno:"
-
-#~ msgid "Provider:"
-#~ msgstr "Izdavač:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Spisak država ili regiona:"
-
-#~ msgid "Country or region"
-#~ msgstr "Država ili region"
-
-#~ msgid "Wired"
-#~ msgstr "Žičana"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC mrežica"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Ili nedostaje lozinka ili je veza neispravna. U svakom slučaju, prvo ćete "
-#~ "morati da uredite vezu u uređivaču veza"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Bežična _bezbednost:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Ime mreže:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "_Veza:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Bežični _uređaj:"
-
 #, fuzzy
 #~ msgid "CKN"
 #~ msgstr "CKN:"
diff --git a/po/sv.po b/po/sv.po
index 2e2f8be6..4503a13a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: NetworkManagerApplet\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2018-10-20 23:01+0200\n"
 "Last-Translator: Josef Andersson <l10nl18nsweja gmail com>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
@@ -24,6 +24,7 @@ msgstr ""
 "X-Generator: Poedit 2.2\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Nätverk"
 
@@ -231,15 +232,19 @@ msgstr "802.1X-autentisering"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_Anslut"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Nätverksnamn"
 
@@ -591,7 +596,7 @@ msgstr "Mobilt bredband (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobilt bredband"
 
@@ -712,7 +717,9 @@ msgstr "DSL-autentisering"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_OK"
 
@@ -816,6 +823,7 @@ msgid "Error displaying connection information:"
 msgstr "Fel vid visning av anslutningsinformation:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -964,7 +972,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Surfzon"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Lösenord:"
@@ -989,7 +997,8 @@ msgstr "VPN-banner"
 msgid "Base Connection"
 msgstr "Basanslutning"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Okänd"
 
@@ -1748,6 +1757,7 @@ msgid "_Service"
 msgstr "_Tjänst"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2409,6 +2419,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Tillåt _roaming om hemnätverket inte finns tillgängligt"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Visa _lösenord"
 
@@ -2822,13 +2833,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Trådbundet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3148,12 +3160,12 @@ msgstr ""
 "inaktivera stöd för vissa metoder."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Trådlöst"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3163,22 +3175,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Kombinerad"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Grupp"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Brygga"
 
@@ -3467,6 +3482,7 @@ msgid "Select a connection to delete"
 msgstr "Välj anslutning att ta bort"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Namn"
 
@@ -3677,6 +3693,8 @@ msgstr "Trådbunden anslutning %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Standard"
 
@@ -3903,35 +3921,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Min leverantör använder C_DMA-baserad teknik (t.ex. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4090,10 +4108,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Trådlös anslutning %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitars nyckel (Hexadecimal eller ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bitars lösenfras"
 
@@ -4102,14 +4122,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamisk WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA och WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA och WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA och WPA2 Personal"
@@ -4185,6 +4208,465 @@ msgstr "Anslutningsinformation"
 msgid "_Close"
 msgstr "_Stäng"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Inget certifikat angivet"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Ingen nyckel angiven"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/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/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "Privat _nyckel för %s"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "Nyckel_lösenord för %s"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "Välj %s-certifikat"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "%s-_certifikat"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Mitt land är inte listat"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Inte listad"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Min betalningstyp är inte listad…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Leverantör"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Installerad GSM-enhet"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Installerad CDMA-enhet"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Valfri enhet"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Ny mobil bredbandsanslutning"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Denna guide hjälper dig att enkelt konfigurera en mobil bredbandsanslutning "
+"till ett mobilt (3G) nätverk."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Du behöver följande information:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Namnet på din bredbandsleverantör"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Namnet på betalningstypen för ditt bredband"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(i vissa fall) APN för din betalningstyp (Access Point Name)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Skapa en anslutning för _denna mobila bredbandsenhet:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Konfigurera en mobil bredbandsanslutning"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land eller region"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Välj land eller region för din leverantör"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Välj din leverantör från en _lista:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Jag kan inte hitta min leverantör och vill ange den _manuellt:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Min leverantör använder GSM-tekniken (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Min leverantör använder CDMA-tekniken (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Välj din leverantör"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Välj din betalningstyp:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN för vald betalningstyp (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Varning: Välja en felaktig betalningstyp kan resultera i finansiella problem "
+"för ditt bredbandskonto eller kan förhindra anslutning att fungera.\n"
+"\n"
+"Om du är osäker på din betalningstyp så bör du fråga din leverantör efter "
+"korrekt APN för din betalningstyp."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Välj din betalningstyp"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Din mobila bredbandsanslutning är konfigurerad med följande inställningar:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Din enhet:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Din leverantör:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Din betalningstyp:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"En anslutning kommer nu att göras till din leverantör av mobilt bredband med "
+"de inställningar som du valde.  Om anslutningen misslyckas eller om du inte "
+"kan komma åt några nätverksresurser så bör du kontrollera dina inställningar "
+"igen.  För att ändra dina inställningar för din mobila bredbandsanslutning, "
+"välj ”Nätverksanslutningar” från menyn System →  Inställningar."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Bekräfta inställningar för mobilt bredband"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Ingen)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "Nyckel i %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "Certifikat i %s"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Okänd)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Välj"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Välj från fil…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "Välj ett %s-certifikat"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s-certifikats_lösenord"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Fel vid inloggning: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Fel vid öppnande av en session: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "_Upplåsningstoken"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Utfärdat av"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "Ange %s-PIN"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Logga in"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Kom ihåg PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Lagra lösenordet bara för denna användare"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Lagra lösenordet för alla användare"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Fråga efter detta lösenord varje gång"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Lösenordet krävs inte"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Visa _lösenord"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Tertiärt lösenord:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Sekundärt lösenord:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Lösenord:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Klicka för att ansluta"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Ny…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ingen"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamisk WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "S_kapa"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Lösenord eller krypteringsnycklar krävs för att komma åt det trådlösa "
+"nätverket ”%s”."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Autentisering krävs för det trådlösa nätverket"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Autentisering krävs för det trådlösa nätverket"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Skapa nytt trådlöst nätverk"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Nytt trådlöst nätverk"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Ange ett namn för det trådlösa nätverket som du vill skapa."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Anslut till dolt trådlöst nätverk"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Dolt trådlöst nätverk"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Ange namn och säkerhetsuppgifter för det dolda trådlösa nätverket som du "
+"vill ansluta till."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Trådlös _säkerhet"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "Ans_lutning"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Trådlös _adapter"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Jag kan inte hitta min leverantör och vill ange den _manuellt:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Leverantör:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Lista över länder eller regioner:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Land eller region"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Trådbundet"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC-nätverk"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Antingen saknas ett lösenord eller så är anslutningen ogiltig. I det senare "
+"fallet måste du redigera anslutningen med nm-connection-editor först"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Trådlös _säkerhet:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nätverksnamn:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Ans_lutning:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Trådlös _adapter:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Användning:"
@@ -4333,25 +4815,25 @@ msgstr "inget CA-certifikat valt"
 msgid "selected CA certificate file does not exist"
 msgstr "vald CA-certifikatfil existerar inte"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "saknar PAC-fil för EAP-FAST"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Välj en PAC-fil"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Alla filer"
 
@@ -4387,16 +4869,16 @@ msgstr "_Inre autentisering"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillåt automatisk PAC-pro_visionering"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "saknar EAP-LEAP-användarnamn"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "saknar EAP-LEAP-lösenord"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4431,15 +4913,15 @@ msgstr "Suffix på servercertifikatets namn."
 msgid "_Domain"
 msgstr "_Domän"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "saknar EAP-användarnamn"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "saknar EAP-lösenord"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4453,23 +4935,23 @@ msgstr "WEP 128-bitars lösenfras"
 msgid "Sh_ow passphrase"
 msgstr "Visa _lösenord"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "saknar EAP-TLS-identitet"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "inget användarcertifikat valt"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "vald användarcertifikatfil existerar inte"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "ingen nyckel vald"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "vald nyckelfil existerar inte"
 
@@ -4477,7 +4959,7 @@ msgstr "vald nyckelfil existerar inte"
 msgid "I_dentity"
 msgstr "I_dentitet"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (ingen EAP)"
 
@@ -4515,15 +4997,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Au_tentisering"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "saknar leap-användarnamn"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "saknar leap-lösenord"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "saknar EAP-lösenord"
@@ -4532,18 +5014,18 @@ msgstr "saknar EAP-lösenord"
 msgid "_Type"
 msgstr "_Typ"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "saknar wep-nyckel"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4551,7 +5033,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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4560,11 +5042,11 @@ msgstr ""
 "ogiltig wep-nyckel: felaktig nyckellängd %zu. En nyckel måste ha antingen "
 "längden 5/13 (ascii) eller 10/26 (hex)"
 
-#: src/wireless-security/ws-wep-key.c:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "ogiltig wep-nyckel: lösenfras måste vara kortare än 64 tecken"
 
@@ -4592,7 +5074,7 @@ msgstr "Vis_a nyckel"
 msgid "WEP inde_x"
 msgstr "WEP-inde_x"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4601,354 +5083,10 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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 "No certificate set"
-#~ msgstr "Inget certifikat angivet"
-
-#~ msgid "No key set"
-#~ msgstr "Ingen nyckel angiven"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Välj en nyckel för %s-certifikat"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Privat _nyckel för %s"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Nyckel_lösenord för %s"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Välj %s-certifikat"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s-_certifikat"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Mitt land är inte listat"
-
-#~ msgid "Unlisted"
-#~ msgstr "Inte listad"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Min betalningstyp är inte listad…"
-
-#~ msgid "Provider"
-#~ msgstr "Leverantör"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Installerad GSM-enhet"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Installerad CDMA-enhet"
-
-#~ msgid "Any device"
-#~ msgstr "Valfri enhet"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Ny mobil bredbandsanslutning"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Denna guide hjälper dig att enkelt konfigurera en mobil "
-#~ "bredbandsanslutning till ett mobilt (3G) nätverk."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Du behöver följande information:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Namnet på din bredbandsleverantör"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Namnet på betalningstypen för ditt bredband"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(i vissa fall) APN för din betalningstyp (Access Point Name)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Skapa en anslutning för _denna mobila bredbandsenhet:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Konfigurera en mobil bredbandsanslutning"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Land eller region"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Välj land eller region för din leverantör"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Välj din leverantör från en _lista:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Jag kan inte hitta min leverantör och vill ange den _manuellt:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Min leverantör använder GSM-tekniken (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Min leverantör använder CDMA-tekniken (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Välj din leverantör"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Välj din betalningstyp:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "_APN för vald betalningstyp (Access Point Name):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Varning: Välja en felaktig betalningstyp kan resultera i finansiella "
-#~ "problem för ditt bredbandskonto eller kan förhindra anslutning att "
-#~ "fungera.\n"
-#~ "\n"
-#~ "Om du är osäker på din betalningstyp så bör du fråga din leverantör efter "
-#~ "korrekt APN för din betalningstyp."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Välj din betalningstyp"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Din mobila bredbandsanslutning är konfigurerad med följande inställningar:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Din enhet:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Din leverantör:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Din betalningstyp:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "En anslutning kommer nu att göras till din leverantör av mobilt bredband "
-#~ "med de inställningar som du valde.  Om anslutningen misslyckas eller om "
-#~ "du inte kan komma åt några nätverksresurser så bör du kontrollera dina "
-#~ "inställningar igen.  För att ändra dina inställningar för din mobila "
-#~ "bredbandsanslutning, välj ”Nätverksanslutningar” från menyn System →  "
-#~ "Inställningar."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Bekräfta inställningar för mobilt bredband"
-
-#~ msgid "(None)"
-#~ msgstr "(Ingen)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "Nyckel i %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Certifikat i %s"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Okänd)"
-
-#~ msgid "Select"
-#~ msgstr "Välj"
-
-#~ msgid "Cancel"
-#~ msgstr "Avbryt"
-
-#~ msgid "Select from file…"
-#~ msgstr "Välj från fil…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Välj ett %s-certifikat"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "%s-certifikats_lösenord"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Fel vid inloggning: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Fel vid öppnande av en session: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "_Upplåsningstoken"
-
-#~ msgid "Issued By"
-#~ msgstr "Utfärdat av"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "Ange %s-PIN"
-
-#~ msgid "_Login"
-#~ msgstr "_Logga in"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Kom ihåg PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Lagra lösenordet bara för denna användare"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Lagra lösenordet för alla användare"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Fråga efter detta lösenord varje gång"
-
-#~ msgid "The password is not required"
-#~ msgstr "Lösenordet krävs inte"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Visa _lösenord"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Tertiärt lösenord:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Sekundärt lösenord:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Lösenord:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Klicka för att ansluta"
-
-#~ msgid "New…"
-#~ msgstr "Ny…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Ingen"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dynamisk WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "S_kapa"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Lösenord eller krypteringsnycklar krävs för att komma åt det trådlösa "
-#~ "nätverket ”%s”."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Autentisering krävs för det trådlösa nätverket"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Autentisering krävs för det trådlösa nätverket"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Skapa nytt trådlöst nätverk"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Nytt trådlöst nätverk"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Anslut till dolt trådlöst nätverk"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Dolt trådlöst nätverk"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Ange namn och säkerhetsuppgifter för det dolda trådlösa nätverket som du "
-#~ "vill ansluta till."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Trådlös _säkerhet"
-
-#~ msgid "C_onnection"
-#~ msgstr "Ans_lutning"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Trådlös _adapter"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Jag kan inte hitta min leverantör och vill ange den _manuellt:"
-
-#~ msgid "Provider:"
-#~ msgstr "Leverantör:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Lista över länder eller regioner:"
-
-#~ msgid "Country or region"
-#~ msgstr "Land eller region"
-
-#~ msgid "Wired"
-#~ msgstr "Trådbundet"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC-nätverk"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Antingen saknas ett lösenord eller så är anslutningen ogiltig. I det "
-#~ "senare fallet måste du redigera anslutningen med nm-connection-editor "
-#~ "först"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Trådlös _säkerhet:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Nätverksnamn:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "Ans_lutning:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Trådlös _adapter:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/ta.po b/po/ta.po
index 7b518fca..5ec4dfdd 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet.master.ta\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2012-02-27 13:19+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3 gmail com>\n"
 "Language-Team: American English <kde-i18n-doc kde org>\n"
@@ -31,6 +31,7 @@ msgstr ""
 "X-Generator: Lokalize 1.1\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "பிணையம்"
 
@@ -228,15 +229,19 @@ msgstr "ஒயர்டு 802.1X அங்கீகாரம்"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "இணை (_o)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "பிணைய பெயர் (_N):"
@@ -593,7 +598,7 @@ msgstr "மொபைல் பிராட்பேண்டு (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "மொபைல் பிராட்பேண்டு"
 
@@ -720,7 +725,9 @@ msgstr "DSL அங்கீகாரம்"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -833,6 +840,7 @@ msgid "Error displaying connection information:"
 msgstr "பிழை காட்டும் இணைப்பு தகவல்:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -984,7 +992,7 @@ msgstr "ஐபிவி 6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "கடவுச்சொல்:"
@@ -1009,7 +1017,8 @@ msgstr "விபிஎன் அறிவிப்பு பலகை"
 msgid "Base Connection"
 msgstr "அடிப்படை இணைப்பு"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "தெரியாத"
 
@@ -1768,6 +1777,7 @@ msgid "_Service"
 msgstr "சேவை (_S):"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2424,6 +2434,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "_r இல்ல பிணையம் கிடைக்கவில்லையெனில் ரோமிங்கை அனுமதிக்கவும்"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "கடவுச்சொற்களைக் காட்டு (_w)"
 
@@ -2824,14 +2835,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "தானியக்கி ஈதர்நெட்"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3155,12 +3167,12 @@ msgstr ""
 "இணைப்பு தோல்வியுற்றால், சில முறைகளுக்காவது துணையை நீக்கி முயற்சிக்கவும்."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3170,22 +3182,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "இன்ஃபினிபேன்ட்"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "பிணைப்பு"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "பிரிட்ஜ்"
 
@@ -3479,6 +3494,7 @@ msgid "Select a connection to delete"
 msgstr "ஒயர்டு இணைப்பு %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "பெயர்"
 
@@ -3706,6 +3722,8 @@ msgstr "ஒயர்டு இணைப்பு %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "முன்னிருப்பு"
 
@@ -3934,35 +3952,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "எனது வழங்குபவர் C_DMA-தொடர்புடைய டெக்னாலஜியைப் பயன்படுத்துகிறார் (எ.கா. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "ஜிஎஸ்எம்(GSM)"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4130,10 +4148,12 @@ msgid "Wi-Fi connection %d"
 msgstr "ஒயர்டு இணைப்பு %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-பிட் விசை (ஹெக்ஸ் அல்லது ஆஸ்கி)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-பிட் கடவுச்சொல்"
 
@@ -4142,14 +4162,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "மாறும் WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 தனிப்பட்ட"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 கடவுச்சொல்"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 தனிப்பட்ட"
@@ -4227,6 +4250,498 @@ msgstr "இணைப்பு தகவல்"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "தனிப்பட்ட விசை ( _k):"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "தனிப்பட்ட விசை கடவுச்சொல் (_P):"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "பயனர் சான்றிதழ் (_U):"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "எனது நாடு பட்டியலிடப்படவில்லை"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "பட்டியலிடப்படாத"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "எனது திட்டம் பட்டியலிடப்படவில்லை..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "வழங்குபவர்"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "GSM சாதனம் நிறுவப்பட்டது"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "CDMA சாதனம் நிறுவபட்டது"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "ஏதாவது சாதனம்"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "புதிய மொபைல் பிராட்பேண்டு இணைப்பு"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"ஒரு செல்லுலார் (3G) பிணையத்துடன் மொபைல் பிராட்பேண்டு இணைப்பைஅமைக்க உங்களுக்கு உதவியாளர் "
+"உதவிபுரிவார்."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "பின்வரும் தகவல் உங்களுக்கு தேவை:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "உங்கள் பிராட்பேண்டு வழங்குபவர்கள் பெயர்"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "உங்கள் பிராட்பேண்டு பில்லிங் திட்டப் பெயர்"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(ஒரு சில சமயங்களில்) உங்களது பிராட்பேண்டுபில்லிங் திட்டம் APN (Access Point Name)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "இந்த மொபைல் பிராட்பேண்டு சாதன இணைப்பை உருவாக்கவும் (_t):"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "மொபைல் பிராட்பேண்டு இணைப்பை அமைக்கவும்"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "நாடு அல்லது மாநிலம் "
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "உங்களின் வழங்குபவரின் நாடு அல்லது மாநிலம் தேர்ந்தெடுக்கவும்"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "ஒரு பட்டியலிருந்து உங்கள் வழங்குபவரை தேர்ந்தெடுக்கவும் (_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"எனது வழங்குபவரை தேட முடியவில்லை மற்றும் கைமுறையாக அதை உள்ளிட விரும்புகிறேன் (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "எனது வழங்குபவர் GSM டெக்னாலஜியை பயன்படுத்துகிறார் (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "எனது வழங்குபவர் CDMA டெக்னாலஜியை பயன்படுத்துகிறார் (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "உங்கள் வழங்குபவரை தேர்ந்தெடுக்கவும்"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "உங்கள் திட்டத்தை தேர்ந்தெடுக்கவும் (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "தேர்ந்தெடுக்கப்பட்ட திட்டம் _APN (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"எச்சரிக்கை: ஒரு தவறான திட்டத்தை தேர்ந்தெடுப்பது உங்கள் ப்ராட்பேண்ட் கணக்கில் தவறான பில்லை "
+"கொடுக்கலாம் அல்லது இணைப்பை துண்டிக்கலாம்.\n"
+"\n"
+"உங்கள் திட்டத்தை பற்றி எதுவும் தெரியவில்லையெனில் உங்கள் திட்டத்தின் APNஐ வழங்குநரிடம் "
+"கேட்கவும்."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "பில்லிங் திட்டத்தை தேர்ந்தெடுக்கவும்"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "பின்வரும் அமைவுகள் உங்கள் மொபைல் பிராட்பேண்டு இணைப்பு கட்டமைக்கப்படுகிறது:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "உங்கள் சாதனம்:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "உங்கள் வழங்குபவர்:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "உங்கள் திட்டம்:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+" A connection will now be made to your mobile broadband provider using the "
+"settings you selected.  If the connection fails or you cannot access network "
+"resources, double-check your settings.  To modify your mobile broadband "
+"connection settings, choose \"Network Connections\" from the System >> "
+"Preferences menu."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "மொபைல் பிராட்பேண்டு அமைவுகளை உறுதி செய்யவும்"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ஒன்றுமில்லை)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A சான்றிதழ்:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "தெரியாத"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "ஒரு கோப்பினை தேர்ந்தெடு"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "ஒரு கோப்பினை தேர்ந்தெடு"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "பயனர் சான்றிதழ் (_U):"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "இணைப்பை திருத்தும்போது பிழை"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "பூட்டுநீக்கு (_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "ஒவ்வொரு முறையும் இந்த கடவுச்சொல்லைக் கேட்கவும் (_k)"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "'%s'ஐ இணைப்பதற்கு ஒரு கடவுச்சொல் தேவைப்படுகிறது."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "கடவுச்சொற்களைக் காட்டு (_w)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "கடவுச்சொல் (_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "கடவுச்சொல் (_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "கடவுச்சொல் (_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "துண்டி"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "ஒன்றுமில்லை"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "மாறும் WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "உருவாக்கு (_r)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"கடவுச்சொல் அல்லது மறைகுறியாக்க விசைகள் ஒயர்லெஸ் பிணைய '%s'ஐ அணுகுவதற்கு "
+"தேவைப்படுகிறது."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "ஒயர்லெஸ் பிணைய அங்கீகாரம் தேவைப்படுகிறது"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "அங்கீகார ஒயர்லெஸ் பிணையம் தேவைப்படுகிறது"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "புதிய ஒர்லெஸ் பிணையத்தை உருவாக்கவும்"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "புதிய ஒயர்லெஸ் பிணையம்"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "ஒயர்லெஸ் பிணையத்தை உருவாக்க ஒரு பெயரை உள்ளிடவும்."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "மறைக்கப்பட்ட ஒயர்லெஸ் பிணையத்தை இணைக்கவும்"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "மறைக்கட்ட ஒழர்லெஸ் பிணையம்"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"நீங்கள் இணைக்க விரும்பினால் மறைக்கப்பட்ட ஒயர்லெஸ் பிணையத்திற்கு பெயர் மற்றும்பாதுகாப்பு "
+"விவரங்களை உள்ளிடவும்."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "ஒயர்லெஸ் பாதுகாப்பு (_W):"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "இணைப்பு (_n):"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "ஒயர்லெஸ் அடாப்படர் (_a):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"எனது வழங்குபவரை தேட முடியவில்லை மற்றும் கைமுறையாக அதை உள்ளிட விரும்புகிறேன் (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "வழங்குபவர்:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "நாடு அல்லது மாநிலப் பட்டியல்:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "நாடு அல்லது மாநிலம் "
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "ஒயர்டு"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "ஒயர்லெஸ் பாதுகாப்பு (_W):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "பிணைய பெயர் (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "இணைப்பு (_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "ஒயர்லெஸ் அடாப்படர் (_a):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "பயன்பாடு:"
@@ -4379,26 +4894,26 @@ msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ஒரு PAC கோப்பினை தேர்ந்தெடுக்கவும்..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC கோப்புகள் (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "எல்லா கோப்புகள்"
 
@@ -4437,16 +4952,16 @@ msgstr "_I உள் அங்கீகாரம்:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_v தானியங்கி PAC  ஏற்பாடு"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4482,15 +4997,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4504,24 +5019,24 @@ msgstr "WEP 128-பிட் கடவுச்சொல்"
 msgid "Sh_ow passphrase"
 msgstr "கடவுச்சொற்களைக் காட்டு (_w)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4530,7 +5045,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "அடையாளம்(_d):"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4570,15 +5085,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_t அங்கீகாரம்:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "தனிப்பட்ட விசை கடவுச்சொல் (_P):"
@@ -4588,33 +5103,33 @@ msgstr "தனிப்பட்ட விசை கடவுச்சொல்
 msgid "_Type"
 msgstr "வகை (_T):"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4644,335 +5159,17 @@ msgstr "விசையை காட்டு (_w)"
 msgid "WEP inde_x"
 msgstr "WEP அட்டவணை (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "தனிப்பட்ட விசை ( _k):"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "தனிப்பட்ட விசை கடவுச்சொல் (_P):"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "பயனர் சான்றிதழ் (_U):"
-
-#~ msgid "My country is not listed"
-#~ msgstr "எனது நாடு பட்டியலிடப்படவில்லை"
-
-#~ msgid "Unlisted"
-#~ msgstr "பட்டியலிடப்படாத"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "எனது திட்டம் பட்டியலிடப்படவில்லை..."
-
-#~ msgid "Provider"
-#~ msgstr "வழங்குபவர்"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "GSM சாதனம் நிறுவப்பட்டது"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "CDMA சாதனம் நிறுவபட்டது"
-
-#~ msgid "Any device"
-#~ msgstr "ஏதாவது சாதனம்"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "புதிய மொபைல் பிராட்பேண்டு இணைப்பு"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "ஒரு செல்லுலார் (3G) பிணையத்துடன் மொபைல் பிராட்பேண்டு இணைப்பைஅமைக்க உங்களுக்கு "
-#~ "உதவியாளர் உதவிபுரிவார்."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "பின்வரும் தகவல் உங்களுக்கு தேவை:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "உங்கள் பிராட்பேண்டு வழங்குபவர்கள் பெயர்"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "உங்கள் பிராட்பேண்டு பில்லிங் திட்டப் பெயர்"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(ஒரு சில சமயங்களில்) உங்களது பிராட்பேண்டுபில்லிங் திட்டம் APN (Access Point Name)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "இந்த மொபைல் பிராட்பேண்டு சாதன இணைப்பை உருவாக்கவும் (_t):"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "மொபைல் பிராட்பேண்டு இணைப்பை அமைக்கவும்"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "நாடு அல்லது மாநிலம் "
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "உங்களின் வழங்குபவரின் நாடு அல்லது மாநிலம் தேர்ந்தெடுக்கவும்"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "ஒரு பட்டியலிருந்து உங்கள் வழங்குபவரை தேர்ந்தெடுக்கவும் (_l):"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "எனது வழங்குபவரை தேட முடியவில்லை மற்றும் கைமுறையாக அதை உள்ளிட விரும்புகிறேன் (_m):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr ""
-#~ "எனது வழங்குபவர் GSM டெக்னாலஜியை பயன்படுத்துகிறார் (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "எனது வழங்குபவர் CDMA டெக்னாலஜியை பயன்படுத்துகிறார் (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "உங்கள் வழங்குபவரை தேர்ந்தெடுக்கவும்"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "உங்கள் திட்டத்தை தேர்ந்தெடுக்கவும் (_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "தேர்ந்தெடுக்கப்பட்ட திட்டம் _APN (Access Point Name):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "எச்சரிக்கை: ஒரு தவறான திட்டத்தை தேர்ந்தெடுப்பது உங்கள் ப்ராட்பேண்ட் கணக்கில் தவறான பில்லை "
-#~ "கொடுக்கலாம் அல்லது இணைப்பை துண்டிக்கலாம்.\n"
-#~ "\n"
-#~ "உங்கள் திட்டத்தை பற்றி எதுவும் தெரியவில்லையெனில் உங்கள் திட்டத்தின் APNஐ வழங்குநரிடம் "
-#~ "கேட்கவும்."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "பில்லிங் திட்டத்தை தேர்ந்தெடுக்கவும்"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "பின்வரும் அமைவுகள் உங்கள் மொபைல் பிராட்பேண்டு இணைப்பு கட்டமைக்கப்படுகிறது:"
-
-#~ msgid "Your Device:"
-#~ msgstr "உங்கள் சாதனம்:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "உங்கள் வழங்குபவர்:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "உங்கள் திட்டம்:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ " A connection will now be made to your mobile broadband provider using "
-#~ "the settings you selected.  If the connection fails or you cannot access "
-#~ "network resources, double-check your settings.  To modify your mobile "
-#~ "broadband connection settings, choose \"Network Connections\" from the "
-#~ "System >> Preferences menu."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "மொபைல் பிராட்பேண்டு அமைவுகளை உறுதி செய்யவும்"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(ஒன்றுமில்லை)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "C_A சான்றிதழ்:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "தெரியாத"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "ஒரு கோப்பினை தேர்ந்தெடு"
-
-#, fuzzy
-#~ msgid "Select from file…"
-#~ msgstr "ஒரு கோப்பினை தேர்ந்தெடு"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "பயனர் சான்றிதழ் (_U):"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "இணைப்பை திருத்தும்போது பிழை"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "பூட்டுநீக்கு (_U)"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "ஒவ்வொரு முறையும் இந்த கடவுச்சொல்லைக் கேட்கவும் (_k)"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "'%s'ஐ இணைப்பதற்கு ஒரு கடவுச்சொல் தேவைப்படுகிறது."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "கடவுச்சொற்களைக் காட்டு (_w)"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "கடவுச்சொல் (_P):"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "கடவுச்சொல் (_P):"
-
-#~ msgid "_Password:"
-#~ msgstr "கடவுச்சொல் (_P):"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "துண்டி"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "ஒன்றுமில்லை"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "மாறும் WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "உருவாக்கு (_r)"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "கடவுச்சொல் அல்லது மறைகுறியாக்க விசைகள் ஒயர்லெஸ் பிணைய '%s'ஐ அணுகுவதற்கு "
-#~ "தேவைப்படுகிறது."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "ஒயர்லெஸ் பிணைய அங்கீகாரம் தேவைப்படுகிறது"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "அங்கீகார ஒயர்லெஸ் பிணையம் தேவைப்படுகிறது"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "புதிய ஒர்லெஸ் பிணையத்தை உருவாக்கவும்"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "புதிய ஒயர்லெஸ் பிணையம்"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "ஒயர்லெஸ் பிணையத்தை உருவாக்க ஒரு பெயரை உள்ளிடவும்."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "மறைக்கப்பட்ட ஒயர்லெஸ் பிணையத்தை இணைக்கவும்"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "மறைக்கட்ட ஒழர்லெஸ் பிணையம்"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "நீங்கள் இணைக்க விரும்பினால் மறைக்கப்பட்ட ஒயர்லெஸ் பிணையத்திற்கு பெயர் மற்றும்பாதுகாப்பு "
-#~ "விவரங்களை உள்ளிடவும்."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "ஒயர்லெஸ் பாதுகாப்பு (_W):"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "இணைப்பு (_n):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "ஒயர்லெஸ் அடாப்படர் (_a):"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "எனது வழங்குபவரை தேட முடியவில்லை மற்றும் கைமுறையாக அதை உள்ளிட விரும்புகிறேன் (_m):"
-
-#~ msgid "Provider:"
-#~ msgstr "வழங்குபவர்:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "நாடு அல்லது மாநிலப் பட்டியல்:"
-
-#~ msgid "Country or region"
-#~ msgstr "நாடு அல்லது மாநிலம் "
-
-#~ msgid "Wired"
-#~ msgstr "ஒயர்டு"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "ஒயர்லெஸ் பாதுகாப்பு (_W):"
-
-#~ msgid "_Network name:"
-#~ msgstr "பிணைய பெயர் (_N):"
-
-#~ msgid "C_onnection:"
-#~ msgstr "இணைப்பு (_n):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "ஒயர்லெஸ் அடாப்படர் (_a):"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "1 (முன்னிருப்பு)"
diff --git a/po/te.po b/po/te.po
index 48189a88..2c36cb9b 100644
--- a/po/te.po
+++ b/po/te.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: te\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2012-06-27 15:21+0530\n"
 "Last-Translator: Sasi Bhushan Boddepalli <sasi swecha net>\n"
 "Language-Team: Telugu <indlinux-telugu lists sourceforge net>\n"
@@ -26,6 +26,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "నెట్‌వర్క్"
 
@@ -214,15 +215,19 @@ msgstr "వైరు‌గల 802.1X ధృవీకరణము"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "అనుసంధానించు (_o)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "నెట్వర్కు పేరు (_N):"
@@ -575,7 +580,7 @@ msgstr "మొబైల్ బ్రాడ్‌బాండ్ (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్"
 
@@ -702,7 +707,9 @@ msgstr "DSL దృవీకరణము"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -813,6 +820,7 @@ msgid "Error displaying connection information:"
 msgstr "అనుసంధానము సమాచారమును ప్రదర్శించుటలో దోషము:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -964,7 +972,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "సంకేతపదము:"
@@ -989,7 +997,8 @@ msgstr "VPN ధ్వజము "
 msgid "Base Connection"
 msgstr "పీఠము అనుసంధానము "
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "తెలియదు"
 
@@ -1739,6 +1748,7 @@ msgid "_Service"
 msgstr "సేవ (_S):"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2395,6 +2405,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "హోమ్ నెట్వర్కు అందుబాటులో లేకపోతే రోమింగ్‌ను అనుమతించుము(_r)"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "సంకేతపదములను చూపుము (_w)"
 
@@ -2795,14 +2806,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "స్వయంచాలక ఈథర్‌నెట్"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3126,12 +3138,12 @@ msgstr ""
 "విఫలమైతే, కొన్ని విధానాలకు మద్దతును అచేతనముచేయుటకు ప్రయత్నించుము."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3141,22 +3153,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "ఇన్ఫిబాండ్"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "బాండ్"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "బ్రిడ్జి"
 
@@ -3451,6 +3466,7 @@ msgid "Select a connection to delete"
 msgstr "వైరుగల అనుసంధానము %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "పేరు"
 
@@ -3678,6 +3694,8 @@ msgstr "వైరుగల అనుసంధానము %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "అప్రమేయ"
 
@@ -3903,35 +3921,35 @@ msgstr "నా ఉత్పాదకుడు _GSM-ఆధారిత సాం
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "నా ఉత్పాదకుడు C_DMA-ఆధారిత సాంకేతికతను వుపయోగించుచున్నాడు (అనగా 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4099,10 +4117,12 @@ msgid "Wi-Fi connection %d"
 msgstr "వైరుగల అనుసంధానము %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Key (Hex లేదా ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit సంకేతపదము"
 
@@ -4111,14 +4131,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "గతిక(డైనమిక్) WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 వ్యక్తిగత"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ఎంటర్‌ప్రైజ్"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 వ్యక్తిగత"
@@ -4196,6 +4219,491 @@ msgstr "అనుసంధానము సమాచారము"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r):"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "వ్యక్తిగత కీ (_k):"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "వ్యక్తిగత కీ సంకేతపదము (_P):"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "వినియోగదారి దృవీకరణపత్రము (_U):"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "నా దేశము జాబితాచేసి లేదు"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "జాబితాచేయని"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "నా ప్లాను జాబితాచేసి లేదు..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "ఉత్పాదకుడు"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "సంస్థాపించిన GSM పరికరము"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "సంస్థాపించిన CDMA పరికరము"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "ఏ పరికరమైనా"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "కొత్త మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"సెల్యులార్ (3G) నెట్వర్కునకు మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానమును సులువుగా అమర్చుటకు ఈ సహాయకి మీకు "
+"తోడ్పడుతుంది."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "మీకు ఈ క్రింది సమాచారము అవసరమౌతుంది:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "మీ బ్రాడ్‌బాండ్ ఉత్పాదకుని నామము"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "మీ బ్రాడ్‌బాండ్ బిల్లింగ్ ప్లాన్ నామము"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "కొన్ని సంధర్బాలలో) మీ బ్రాడ్‌బాండ్ బిల్లింగ్ ప్లాన్ APN (యాక్సిస్ పాయింట్ నామము)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "ఈ మొబైల్ బ్రాడ్‌బాండ్ పరికరము కొరకు అనుసంధానమును సృష్టించుము (_t):"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానమును అమర్చుము"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "దేశము లేదా ప్రాంతం  జాబితా"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "మీ ఉత్పాదకునియొక్క దేశములేదా ప్రాంతమును యెంచుకొనుము"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "జాబితానుండి మీ ఉత్పాదకునిని యెంపికచేయుము (_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"నేను నా ఉత్పాదకునిని కనుగొనలేక పోయాను మరియు నేను దానిని మానవీయంగా ప్రవేశపెడుదామని అనుకొనుచున్నాను (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "నా ఉత్పాదకుడు GSM సాంకేతికతను వుపయోగించుతున్నాడు (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "నా ఉత్పాదకుడు CDMA సాంకేతికతను వుపయోగించుతున్నాడు (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "మీ ఉత్పాదకునిని యెంచుకొనుము"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "మీ ప్లాన్ యెంపికచేయుము (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "ఎంపికచేసిన ప్లాన్ _APN (యాక్సిస్ పాయింట్ నేమ్):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"హెచ్చరిక: సరికాని ప్లాను యెంచుకొనుట మీ బ్రాండ్‌బాండ్ ఖాతా బిల్లింగ్ అసౌకర్యాలకు కారణం కావచ్చును లేదా "
+"అనుసంధానతను నిరోధించవచ్చును.\n"
+"\n"
+"మీరు మీ ప్లాన్ పట్ల నిర్ధారణతో లేకపోతే మీ ప్లానుయొక్క APN కొరకు దయచేసి మీ ఉత్పాదకునిని అడుగండి."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "మీ బిల్లింగ్ ప్లానును యెంచుకొనుము"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "మీ మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము క్రింది అమరికలతో ఆకృతీకరించబడింది:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "మీ పరికరము:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "మీ ఉత్పాదకుడు:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "మీ ప్లాన్:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"మీరు యెంపికచేసిన అమర్పులను వుపయోగించుతూ వొక అనుసంధానము యిప్పుడు మీ మొబైల్ బ్రాడ్‌బాండ్ ఉత్పాదకునికి "
+"చేయబడుతుంది.  ఒకవేళ అనుసంధానము విఫలమయినా లేదా మీరు నెట్వర్కు వనరులను వుపయోగించలేకపోయినా, మీ "
+"అమర్పులను వొకటికిరెండుసార్లు పరిశీలించండి.  మీ మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము అమరికలను మార్చుటకు, "
+"సిస్టమ్ >> అభీష్టాలు మెనూనుండి \"నెట్వర్కు అనుసంధానాలు\" యెంచుకొనుము."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "మొబైల్ బ్రాడ్‌బాండ్ అమరికలను నిర్ధారించుము"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ఏదీకాదు)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A ధృవీకరణపత్రము:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "తెలియదు"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "వినియోగదారి దృవీకరణపత్రము (_U):"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "అనుసంధానమును సరికూర్చుటలో దోషం "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "అన్‌లాక్ (_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "ఈ సంకేతపదము కొరకు ప్రతిసారి ఆడుగుము (_k)"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "'%s'కు అనుసంధానమగుటకు వొక సంకేతపదము అవసరమైంది."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "సంకేతపదములను చూపుము (_w)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "సంకేతపదము (_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "సంకేతపదము (_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "సంకేతపదము (_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "అననుసంధానించుము"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "ఏదీకాదు"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "గతిక(డైనమిక్) WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "సృష్టించుము (_r)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "వైరులేని నెట్వర్కు '%s'ను యాక్సిస్ చేసుకొనుటకు సంకేతపదములు లేదా ఎన్క్రిప్షన్ కీలు అవసరము."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "వైరులేని నెట్వర్కు ధృవీకరణము అవసరమైంది"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "వైరులేని నెట్వర్కుద్వారా ధృవీకరణము అవసరమైంది"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "కొత్త వైరులేని నెట్వర్కు సృష్టించుము"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "కొత్త వైరులేని నెట్వర్కు"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "మీరు సృష్టించాలని అనుకొనుచున్న వైరులేని నెట్వర్కునకు వొక నామమును ప్రవేశపెట్టుము."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "మరుగునవున్న వైరులేని నెట్వర్కునకు అనుసంధానించు"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "మరుగునవున్న వైరులేని నెట్వర్కు"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"మీరు అనుసంధానం కావాలనుకొన్న మరుగునవుండు వైరులేని నెట్వర్కుయొక్క రక్షణ వివరములను మరియు నామమును "
+"ప్రవేశపెట్టుము."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "వైర్‌లెస్ రక్షణ (_W):"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "అనుసంధానము (_n):"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "వైర్‌లెస్ ఎడాప్టర్ (_a):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"నేను నా ఉత్పాదకునిని కనుగొనలేక పోయాను మరియు నేను దానిని మానవీయంగా ప్రవేశపెడుదామని అనుకొనుచున్నాను (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "ఉత్పాదకుడు:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "దేశము లేదా ప్రాంతం  జాబితా:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "దేశము లేదా ప్రాంతం  జాబితా"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "వైరుగలవిధం"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "వైర్‌లెస్ రక్షణ (_W):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "నెట్వర్కు పేరు (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "అనుసంధానము (_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "వైర్‌లెస్ ఎడాప్టర్ (_a):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "వినియోగము:"
@@ -4348,26 +4856,26 @@ msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ఒక PAC దస్త్రమును ఎంచుకొనుము"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ఫైళ్ళు (*.PAC)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "అన్ని ఫైళ్ళు"
 
@@ -4406,16 +4914,16 @@ msgstr "లోపలి దృవీకరణము (_I):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "PAC అవకాశాన్ని స్వయంచాలకంగా అనుమతించు(_v)"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4451,15 +4959,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4473,24 +4981,24 @@ msgstr "WEP 128-bit సంకేతపదము"
 msgid "Sh_ow passphrase"
 msgstr "సంకేతపదములను చూపుము (_w)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r):"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4499,7 +5007,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "గుర్తింపు (_d):"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4539,15 +5047,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "ధృవీకరణ (_t):"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "వ్యక్తిగత కీ సంకేతపదము (_P):"
@@ -4557,33 +5065,33 @@ msgstr "వ్యక్తిగత కీ సంకేతపదము (_P):"
 msgid "_Type"
 msgstr "రకము (_T):"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4613,324 +5121,17 @@ msgstr "కీను చూపుము (_w)"
 msgid "WEP inde_x"
 msgstr "WEP విషయసూచిక (_x):"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r):"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "వ్యక్తిగత కీ (_k):"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "వ్యక్తిగత కీ సంకేతపదము (_P):"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "వినియోగదారి దృవీకరణపత్రము (_U):"
-
-#~ msgid "My country is not listed"
-#~ msgstr "నా దేశము జాబితాచేసి లేదు"
-
-#~ msgid "Unlisted"
-#~ msgstr "జాబితాచేయని"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "నా ప్లాను జాబితాచేసి లేదు..."
-
-#~ msgid "Provider"
-#~ msgstr "ఉత్పాదకుడు"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "సంస్థాపించిన GSM పరికరము"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "సంస్థాపించిన CDMA పరికరము"
-
-#~ msgid "Any device"
-#~ msgstr "ఏ పరికరమైనా"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "కొత్త మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "సెల్యులార్ (3G) నెట్వర్కునకు మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానమును సులువుగా అమర్చుటకు ఈ సహాయకి మీకు "
-#~ "తోడ్పడుతుంది."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "మీకు ఈ క్రింది సమాచారము అవసరమౌతుంది:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "మీ బ్రాడ్‌బాండ్ ఉత్పాదకుని నామము"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "మీ బ్రాడ్‌బాండ్ బిల్లింగ్ ప్లాన్ నామము"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "కొన్ని సంధర్బాలలో) మీ బ్రాడ్‌బాండ్ బిల్లింగ్ ప్లాన్ APN (యాక్సిస్ పాయింట్ నామము)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "ఈ మొబైల్ బ్రాడ్‌బాండ్ పరికరము కొరకు అనుసంధానమును సృష్టించుము (_t):"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానమును అమర్చుము"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "దేశము లేదా ప్రాంతం  జాబితా"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "మీ ఉత్పాదకునియొక్క దేశములేదా ప్రాంతమును యెంచుకొనుము"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "జాబితానుండి మీ ఉత్పాదకునిని యెంపికచేయుము (_l):"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "నేను నా ఉత్పాదకునిని కనుగొనలేక పోయాను మరియు నేను దానిని మానవీయంగా ప్రవేశపెడుదామని అనుకొనుచున్నాను "
-#~ "(_m):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "నా ఉత్పాదకుడు GSM సాంకేతికతను వుపయోగించుతున్నాడు (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "నా ఉత్పాదకుడు CDMA సాంకేతికతను వుపయోగించుతున్నాడు (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "మీ ఉత్పాదకునిని యెంచుకొనుము"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "మీ ప్లాన్ యెంపికచేయుము (_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "ఎంపికచేసిన ప్లాన్ _APN (యాక్సిస్ పాయింట్ నేమ్):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "హెచ్చరిక: సరికాని ప్లాను యెంచుకొనుట మీ బ్రాండ్‌బాండ్ ఖాతా బిల్లింగ్ అసౌకర్యాలకు కారణం కావచ్చును లేదా "
-#~ "అనుసంధానతను నిరోధించవచ్చును.\n"
-#~ "\n"
-#~ "మీరు మీ ప్లాన్ పట్ల నిర్ధారణతో లేకపోతే మీ ప్లానుయొక్క APN కొరకు దయచేసి మీ ఉత్పాదకునిని అడుగండి."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "మీ బిల్లింగ్ ప్లానును యెంచుకొనుము"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "మీ మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము క్రింది అమరికలతో ఆకృతీకరించబడింది:"
-
-#~ msgid "Your Device:"
-#~ msgstr "మీ పరికరము:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "మీ ఉత్పాదకుడు:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "మీ ప్లాన్:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "మీరు యెంపికచేసిన అమర్పులను వుపయోగించుతూ వొక అనుసంధానము యిప్పుడు మీ మొబైల్ బ్రాడ్‌బాండ్ ఉత్పాదకునికి "
-#~ "చేయబడుతుంది.  ఒకవేళ అనుసంధానము విఫలమయినా లేదా మీరు నెట్వర్కు వనరులను వుపయోగించలేకపోయినా, మీ "
-#~ "అమర్పులను వొకటికిరెండుసార్లు పరిశీలించండి.  మీ మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము అమరికలను మార్చుటకు, "
-#~ "సిస్టమ్ >> అభీష్టాలు మెనూనుండి \"నెట్వర్కు అనుసంధానాలు\" యెంచుకొనుము."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "మొబైల్ బ్రాడ్‌బాండ్ అమరికలను నిర్ధారించుము"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(ఏదీకాదు)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "C_A ధృవీకరణపత్రము:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "తెలియదు"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "వినియోగదారి దృవీకరణపత్రము (_U):"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "అనుసంధానమును సరికూర్చుటలో దోషం "
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "అన్‌లాక్ (_U)"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "ఈ సంకేతపదము కొరకు ప్రతిసారి ఆడుగుము (_k)"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "'%s'కు అనుసంధానమగుటకు వొక సంకేతపదము అవసరమైంది."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "సంకేతపదములను చూపుము (_w)"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "సంకేతపదము (_P):"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "సంకేతపదము (_P):"
-
-#~ msgid "_Password:"
-#~ msgstr "సంకేతపదము (_P):"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "అననుసంధానించుము"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "ఏదీకాదు"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "గతిక(డైనమిక్) WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "సృష్టించుము (_r)"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "వైరులేని నెట్వర్కు '%s'ను యాక్సిస్ చేసుకొనుటకు సంకేతపదములు లేదా ఎన్క్రిప్షన్ కీలు అవసరము."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "వైరులేని నెట్వర్కు ధృవీకరణము అవసరమైంది"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "వైరులేని నెట్వర్కుద్వారా ధృవీకరణము అవసరమైంది"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "కొత్త వైరులేని నెట్వర్కు సృష్టించుము"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "కొత్త వైరులేని నెట్వర్కు"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "మీరు సృష్టించాలని అనుకొనుచున్న వైరులేని నెట్వర్కునకు వొక నామమును ప్రవేశపెట్టుము."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "మరుగునవున్న వైరులేని నెట్వర్కునకు అనుసంధానించు"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "మరుగునవున్న వైరులేని నెట్వర్కు"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "మీరు అనుసంధానం కావాలనుకొన్న మరుగునవుండు వైరులేని నెట్వర్కుయొక్క రక్షణ వివరములను మరియు "
-#~ "నామమును ప్రవేశపెట్టుము."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "వైర్‌లెస్ రక్షణ (_W):"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "అనుసంధానము (_n):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "వైర్‌లెస్ ఎడాప్టర్ (_a):"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "నేను నా ఉత్పాదకునిని కనుగొనలేక పోయాను మరియు నేను దానిని మానవీయంగా ప్రవేశపెడుదామని అనుకొనుచున్నాను "
-#~ "(_m):"
-
-#~ msgid "Provider:"
-#~ msgstr "ఉత్పాదకుడు:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "దేశము లేదా ప్రాంతం  జాబితా:"
-
-#~ msgid "Country or region"
-#~ msgstr "దేశము లేదా ప్రాంతం  జాబితా"
-
-#~ msgid "Wired"
-#~ msgstr "వైరుగలవిధం"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "వైర్‌లెస్ రక్షణ (_W):"
-
-#~ msgid "_Network name:"
-#~ msgstr "నెట్వర్కు పేరు (_N):"
-
-#~ msgid "C_onnection:"
-#~ msgstr "అనుసంధానము (_n):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "వైర్‌లెస్ ఎడాప్టర్ (_a):"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (అప్రమేయ)"
 
diff --git a/po/tg.po b/po/tg.po
index af0feda8..c2b9be77 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet nma-0-9-8\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2014-02-07 17:37+0500\n"
 "Last-Translator: Victor Ibragimov <victor ibragimov gmail com>\n"
 "Language-Team: Tajik <tg li org>\n"
@@ -20,6 +20,7 @@ msgstr ""
 "X-Generator: Poedit 1.6.3\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Шабака"
 
@@ -225,16 +226,20 @@ msgstr "Санҷиши ҳаққонияти 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 #, fuzzy
 msgid "C_onnect"
 msgstr "Пайваст шудааст"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Номи шабака:"
@@ -605,7 +610,7 @@ msgstr "Паҳннаври мобилӣ (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Паҳннаври мобилӣ"
 
@@ -728,7 +733,9 @@ msgstr "Санҷиши ҳаққонияти DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -838,6 +845,7 @@ msgid "Error displaying connection information:"
 msgstr "Ҳангоми намоиши кӯмак хатогӣ ба вуҷуд омад: %s"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -990,7 +998,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Парол:"
@@ -1015,7 +1023,8 @@ msgstr "Баннери VPN"
 msgid "Base Connection"
 msgstr "Пайвасти асосӣ"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Номаълум"
 
@@ -1794,6 +1803,7 @@ msgid "_Service"
 msgstr "_Хидмат:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2470,6 +2480,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Шабакаи роумингӣ"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Намоиш додани _паролҳо"
 
@@ -2883,13 +2894,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Шабакаи Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "Шабакаи VLAN"
 
@@ -3215,12 +3227,12 @@ msgid ""
 msgstr "Усулҳои санҷиши ҳаққонияти иҷозатшуда"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Шабакаи Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3230,22 +3242,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "Шабакаи InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Алоқа"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Гурӯҳ"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Пул"
 
@@ -3550,6 +3565,7 @@ msgid "Select a connection to delete"
 msgstr "Пайвасти гурӯҳии %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Ном"
 
@@ -3790,6 +3806,8 @@ msgstr "Пайвасти Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Пешфарз"
 
@@ -4023,35 +4041,35 @@ msgstr "2G (GPRS/EDGE)"
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "EVDO"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4218,10 +4236,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Пайвасти Wi-Fi %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Калиди WEP 40/128-бит (Hex ё ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Гузарвожаи WEP 128-бит"
 
@@ -4230,14 +4250,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP-и серҳаракат (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2-и Шахсӣ"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2-и Тиҷорӣ"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2-и Шахсӣ"
@@ -4316,6 +4339,503 @@ msgstr "Иттилооти пайвастшавӣ"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Ягон гувоҳиномаи CA _лозим нест"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Интихоби гувоҳиномаи CA"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Калиди _шахсӣ:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_Пароли калиди шахсӣ:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Интихоби гувоҳиномаи CA"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_Гувоҳиномаи корбарӣ:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+#, fuzzy
+msgid "My country is not listed"
+msgstr "Вуҷуд надора?"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Бе рӯйхат"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Нақша"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Провайдер"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+#, fuzzy
+msgid "Installed GSM device"
+msgstr "GSM"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+#, fuzzy
+msgid "Installed CDMA device"
+msgstr "CDMA"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Ҳар дастгоҳ"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+#, fuzzy
+msgid "New Mobile Broadband Connection"
+msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+#, fuzzy
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr "Шумо ба шабакаи паҳннавори мобилӣ пайваст шудед."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Ба шумо иттилооти зерил лозим мешавад:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Провайдери шумо:"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+#, fuzzy
+msgid "Your broadband billing plan name"
+msgstr "Нақшаи шумо:"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(дар баъзе мавридҳо) Нақшаи биллинги пайвасти паҳннавори APN (Номи Нуқтаи "
+"Дастрасӣ)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+#, fuzzy
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+#, fuzzy
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr ""
+"<li>Кишвар, шаҳр ё кӯчаи мехостагиро ёфт кунед.</li> <li>Маконҳои махсусро, "
+"масалан “Каҳвахонаи Нигина дар назди роҳи асосӣ” ё ”Нуқтаи дастраси Wi-Fi "
+"дар назди боғи Рӯдаки” пайдо кунед.</li>"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Минтақа ё кишвари худро интихоб намоед."
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+#, fuzzy
+msgid "Select your provider from a _list:"
+msgstr "Интихоб кардан аз рӯйхати умумиҷаҳонӣ"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "%i %%"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+#, fuzzy
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "3G (UMTS/HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+#, fuzzy
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "EVDO"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+#, fuzzy
+msgid "Choose your Provider"
+msgstr "Провайдери шумо:"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+#, fuzzy
+msgid "_Select your plan:"
+msgstr "Нақшаи шумо:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+#, fuzzy
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr "Нақшаи шумо:"
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+#, fuzzy
+msgid "Choose your Billing Plan"
+msgstr "Нақшаи шумо:"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+#, fuzzy
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Танзимоти паҳннавори мобилӣ"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Дастгоҳи шумо:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Провайдери шумо:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Нақшаи шумо:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Пайвасти шабакаи дастрас вуҷуд надорад.\n"
+"Лутфан танзимоти пайвасти худро санҷида дубора кӯшиш намоед."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+#, fuzzy
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Танзимоти паҳннавори мобилӣ"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ҳеҷ)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Гувоҳиномаи C_A:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Номаълум"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Интихоби гувоҳиномаи CA"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_Гувоҳиномаи корбарӣ:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Таҳрир"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Кушодан"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "Пароли наверо барои корбари нав интихоб намоед:"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr ""
+"Ин пешниҳод шояд дар экрани вуруд намоиш дода шавад. Ин ба ҳамаи корбарони "
+"ин система аён мешавад. Иҷрои <b>not</b> дар ин ҷо паролро дар бар мегирад."
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "Ҳамеша ин паролро _дархост кардан"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Барои пайваст шудан ба '%s' парол лозим аст."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "На_моиш додани паролҳо"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Пароли иловагӣ:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_Пароли иловагӣ:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Парол:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Қатъ кардани пайваст"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ҳеҷ"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP-и серҳаракат (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Эҷод кардан"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Барои пайдо кардани дастрасӣ ба шабакаи бесими \"%s\" паролҳо ё калидҳои "
+"рамзгузорӣ лозиманд."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Санҷиши ҳаққонияти шабакавии Wi-Fi лозим аст"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "Санҷиши ҳаққонияти шабакавии Wi-Fi лозим аст"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Эҷод кардани шабакаи Wi-Fi-и нав"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Шабакаи Wi-Fi-и нав"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "_Эҷод кардани шабакаи Wi-Fi-и нав..."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Шабакаи Wi-Fi-и ноаён"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Амнияти Wi-Fi:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "_Пайвастшавӣ:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Адаптери Wi-Fi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "%i %%"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Провайдер:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+#, fuzzy
+msgid "Country or Region List:"
+msgstr "Минтақа ё кишвари худро интихоб намоед."
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+#, fuzzy
+msgid "Country or region"
+msgstr ""
+"<li>Кишвар, шаҳр ё кӯчаи мехостагиро ёфт кунед.</li> <li>Маконҳои махсусро, "
+"масалан “Каҳвахонаи Нигина дар назди роҳи асосӣ” ё ”Нуқтаи дастраси Wi-Fi "
+"дар назди боғи Рӯдаки” пайдо кунед.</li>"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Симдор"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Амнияти Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Номи шабака:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Пайвастшавӣ:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Адаптери Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Истифодабарӣ:"
@@ -4467,26 +4987,26 @@ msgstr "Ягон гувоҳиномаи CA _лозим нест"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Интихоби файли PAC..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Файлҳои PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Ҳамаи файлҳо"
 
@@ -4526,16 +5046,16 @@ msgstr "Санҷиши _ҳаққонияти дохилӣ"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Таъминоти PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 #, fuzzy
 msgid "MD5"
@@ -4573,15 +5093,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4595,24 +5115,24 @@ msgstr "Гузарвожаи WEP 128-бит"
 msgid "Sh_ow passphrase"
 msgstr "На_моиш додани паролҳо"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ягон гувоҳиномаи CA _лозим нест"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4621,7 +5141,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "Ш_ахсият"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4662,15 +5182,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Санҷиши ҳаққоният:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_Пароли калиди шахсӣ:"
@@ -4680,33 +5200,33 @@ msgstr "_Пароли калиди шахсӣ:"
 msgid "_Type"
 msgstr "_Навъ:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4737,357 +5257,17 @@ msgstr "Намоиш _додани калид"
 msgid "WEP inde_x"
 msgstr "_Индекси WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Ягон гувоҳиномаи CA _лозим нест"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Интихоби гувоҳиномаи CA"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Калиди _шахсӣ:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Пароли калиди шахсӣ:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Интихоби гувоҳиномаи CA"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_Гувоҳиномаи корбарӣ:"
-
-#, fuzzy
-#~ msgid "My country is not listed"
-#~ msgstr "Вуҷуд надора?"
-
-#~ msgid "Unlisted"
-#~ msgstr "Бе рӯйхат"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Нақша"
-
-#~ msgid "Provider"
-#~ msgstr "Провайдер"
-
-#, fuzzy
-#~ msgid "Installed GSM device"
-#~ msgstr "GSM"
-
-#, fuzzy
-#~ msgid "Installed CDMA device"
-#~ msgstr "CDMA"
-
-#~ msgid "Any device"
-#~ msgstr "Ҳар дастгоҳ"
-
-#, fuzzy
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
-
-#, fuzzy
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr "Шумо ба шабакаи паҳннавори мобилӣ пайваст шудед."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Ба шумо иттилооти зерил лозим мешавад:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Провайдери шумо:"
-
-#, fuzzy
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Нақшаи шумо:"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(дар баъзе мавридҳо) Нақшаи биллинги пайвасти паҳннавори APN (Номи Нуқтаи "
-#~ "Дастрасӣ)"
-
-#, fuzzy
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
-
-#, fuzzy
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr ""
-#~ "<li>Кишвар, шаҳр ё кӯчаи мехостагиро ёфт кунед.</li> <li>Маконҳои "
-#~ "махсусро, масалан “Каҳвахонаи Нигина дар назди роҳи асосӣ” ё ”Нуқтаи "
-#~ "дастраси Wi-Fi дар назди боғи Рӯдаки” пайдо кунед.</li>"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Минтақа ё кишвари худро интихоб намоед."
-
-#, fuzzy
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Интихоб кардан аз рӯйхати умумиҷаҳонӣ"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "%i %%"
-
-#, fuzzy
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "3G (UMTS/HSPA)"
-
-#, fuzzy
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "EVDO"
-
-#, fuzzy
-#~ msgid "Choose your Provider"
-#~ msgstr "Провайдери шумо:"
-
-#, fuzzy
-#~ msgid "_Select your plan:"
-#~ msgstr "Нақшаи шумо:"
-
-#, fuzzy
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "_APN:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr "Нақшаи шумо:"
-
-#, fuzzy
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Нақшаи шумо:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "Танзимоти паҳннавори мобилӣ"
-
-#~ msgid "Your Device:"
-#~ msgstr "Дастгоҳи шумо:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Провайдери шумо:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Нақшаи шумо:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Пайвасти шабакаи дастрас вуҷуд надорад.\n"
-#~ "Лутфан танзимоти пайвасти худро санҷида дубора кӯшиш намоед."
-
-#, fuzzy
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Танзимоти паҳннавори мобилӣ"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(ҳеҷ)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Гувоҳиномаи C_A:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Номаълум"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Интихоби гувоҳиномаи CA"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_Гувоҳиномаи корбарӣ:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Таҳрир"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Кушодан"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "Пароли наверо барои корбари нав интихоб намоед:"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr ""
-#~ "Ин пешниҳод шояд дар экрани вуруд намоиш дода шавад. Ин ба ҳамаи "
-#~ "корбарони ин система аён мешавад. Иҷрои <b>not</b> дар ин ҷо паролро дар "
-#~ "бар мегирад."
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "Ҳамеша ин паролро _дархост кардан"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Барои пайваст шудан ба '%s' парол лозим аст."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "На_моиш додани паролҳо"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Пароли иловагӣ:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Пароли иловагӣ:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Парол:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Қатъ кардани пайваст"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Ҳеҷ"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP-и серҳаракат (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Эҷод кардан"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Барои пайдо кардани дастрасӣ ба шабакаи бесими \"%s\" паролҳо ё калидҳои "
-#~ "рамзгузорӣ лозиманд."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Санҷиши ҳаққонияти шабакавии Wi-Fi лозим аст"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Санҷиши ҳаққонияти шабакавии Wi-Fi лозим аст"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Эҷод кардани шабакаи Wi-Fi-и нав"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Шабакаи Wi-Fi-и нав"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "_Эҷод кардани шабакаи Wi-Fi-и нав..."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Шабакаи Wi-Fi-и ноаён"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Амнияти Wi-Fi:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "_Пайвастшавӣ:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Адаптери Wi-Fi:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "%i %%"
-
-#~ msgid "Provider:"
-#~ msgstr "Провайдер:"
-
-#, fuzzy
-#~ msgid "Country or Region List:"
-#~ msgstr "Минтақа ё кишвари худро интихоб намоед."
-
-#, fuzzy
-#~ msgid "Country or region"
-#~ msgstr ""
-#~ "<li>Кишвар, шаҳр ё кӯчаи мехостагиро ёфт кунед.</li> <li>Маконҳои "
-#~ "махсусро, масалан “Каҳвахонаи Нигина дар назди роҳи асосӣ” ё ”Нуқтаи "
-#~ "дастраси Wi-Fi дар назди боғи Рӯдаки” пайдо кунед.</li>"
-
-#~ msgid "Wired"
-#~ msgstr "Симдор"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Амнияти Wi-Fi:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Номи шабака:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "_Пайвастшавӣ:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Адаптери Wi-Fi:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (пешфарз)"
 
diff --git a/po/th.po b/po/th.po
index 806ec92b..72908e1e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2012-09-12 15:27+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
@@ -21,6 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "เครือข่าย"
 
@@ -206,15 +207,19 @@ msgstr "การยืนยันตัวบุคคลกับเครื
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "เ_ชื่อมต่อ"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_ชื่อเครือข่าย:"
@@ -567,7 +572,7 @@ msgstr "เครือข่ายบรอดแบนด์มือถือ
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "เครือข่ายบรอดแบนด์มือถือ"
 
@@ -694,7 +699,9 @@ msgstr "การยืนยันตัวบุคคลกับ DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -804,6 +811,7 @@ msgid "Error displaying connection information:"
 msgstr "เกิดข้อผิดพลาดในการแสดงข้อมูลการเชื่อมต่อ:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -955,7 +963,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "รหัสผ่าน:"
@@ -980,7 +988,8 @@ msgstr "ข้อความต้อนรับของ VPN"
 msgid "Base Connection"
 msgstr "การเชื่อมต่อฐาน"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "ไม่ทราบ"
 
@@ -1726,6 +1735,7 @@ msgid "_Service"
 msgstr "_บริการ:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2378,6 +2388,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "เปิดใช้บริการ_ข้ามเครือข่ายถ้าออกนอกเครือข่ายเหย้า"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "แ_สดงรหัสผ่าน"
 
@@ -2776,14 +2787,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "อีเทอร์เน็ตอัตโนมัติ"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3106,12 +3118,12 @@ msgstr ""
 "แต่ถ้าการเชื่อมต่อไม่สำเร็จ ก็ลองปิดการรองรับบางวิธีดู"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3121,22 +3133,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3426,6 +3441,7 @@ msgid "Select a connection to delete"
 msgstr "การเชื่อมต่อโยงสาย %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "ชื่อ"
 
@@ -3654,6 +3670,8 @@ msgstr "การเชื่อมต่อโยงสาย %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "ปริยาย"
 
@@ -3879,35 +3897,35 @@ msgstr "ผู้ให้บริการของฉันใช้เทค
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ผู้ให้บริการของฉันใช้เทคโนโลยีที่มี C_DMA เป็นพื้นฐาน (คือ 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4074,10 +4092,12 @@ msgid "Wi-Fi connection %d"
 msgstr "การเชื่อมต่อโยงสาย %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP กุญแจ 40/128 บิต (ฐานสิบหก หรือ ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 บิต แบบวลีรหัสผ่าน"
 
@@ -4086,14 +4106,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP แบบผันแปร (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ส่วนบุคคล"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 เอนเทอร์ไพรส์"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 ส่วนบุคคล"
@@ -4171,6 +4194,485 @@ msgstr "ข้อมูลการเชื่อมต่อ"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "ปิดคำเตือนใบรับรอง CA"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "เลือกใบรับรอง CA"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "กุญแจ_ส่วนตัว:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_รหัสผ่านกุญแจส่วนตัว:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "เลือกใบรับรอง CA"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_ใบรับรองของผู้ใช้:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "ไม่มีประเทศของฉันในรายชื่อ"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "ไม่ระบุ"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "แผนที่ฉันใช้ไม่มีในรายชื่อ..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "ผู้ให้บริการ"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "ติดตั้งอุปกรณ์ GSM แล้ว"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "ติดตั้งอุปกรณ์ CDMA แล้ว"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "อุปกรณ์ใดๆ"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "การเชื่อมต่อบรอดแบนด์มือถือรายการใหม่"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr "เครื่องมือช่วยนี้จะช่วยคุณตั้งค่าการเชื่อมต่อบรอดแบนด์มือถือกับเครือข่ายมือถืออย่างง่ายดาย"
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "คุณจะต้องใช้ข้อมูลต่อไปนี้:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "ผู้ให้บริการบรอดแบนด์ของคุณ"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "ชื่อแผนการจ่ายเงินที่คุณใช้"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(ในบางกรณี) APN (Access Point Name) สำหรับแผนการจ่ายเงินบรอดแบนด์ที่คุณใช้"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "สร้างการเชื่อมต่อสำหรับอุปกรณ์บรอดแบนด์มือถือ_นี้:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "ตั้งค่าการเชื่อมต่อบรอดแบนด์มือถือ"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "ประเทศหรือภูมิภาค"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "เลือกประเทศหรือภูมิภาคของผู้ให้บริการของคุณ"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "เลือกผู้ให้บริการของคุณจาก_รายชื่อ:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "ฉันไม่เห็นชื่อผู้ให้บริการของฉันในรายชื่อ และต้องการป้อนเ_อง:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "ผู้ให้บริการของฉันใช้เทคโนโลยี GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "ผู้ให้บริการของฉันใช้เทคโนโลยี CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "เลือกผู้ให้บริการของคุณ"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "เ_ลือกแผนของคุณ:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "เลือก _APN (Access Point Name) ของแผน:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"คำเตือน: การเลือกแผนผิดอาจทำให้เกิดปัญหาเรื่องค่าบริการในบัญชีบรอดแบนด์ของคุณ "
+"หรืออาจทำให้เชื่อมต่อไม่ได้\n"
+"\n"
+"ถ้าคุณไม่แน่ใจเกี่ยวกับแผนของคุณ กรุณาสอบถามผู้ให้บริการของคุณเกี่ยวกับ APN สำหรับแผนที่คุณใช้"
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "เลือกแผนการจ่ายเงินของคุณ"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "บรอดแบนด์มือถือของคุณถูกตั้งค่าไว้ดังนี้:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "อุปกรณ์ของคุณ:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "ผู้ให้บริการของคุณ:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "แผนของคุณ:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"กำลังจะเชื่อมต่อไปยังผู้ให้บริการบรอดแบนด์มือถือของคุณโดยใช้ค่าต่างๆ ที่คุณเลือกไว้ "
+"ถ้าการเชื่อมต่อล้มเหลว หรือคุณไม่สามารถเข้าถึงทรัพยากรต่างๆ ในเครือข่ายได้ "
+"ก็กรุณาตรวจสอบการตั้งค่าของคุณใหม่ การแก้ไขค่าตั้งบรอดแบนด์มือถือ ทำได้โดยเลือก "
+"\"การเชื่อมต่อเครือข่าย\" จากเมนู \"ระบบ\" >> \"ปรับแต่งพื้นโต๊ะ\""
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "ยืนยันการตั้งค่าบรอดแบนด์มือถือ"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(ไม่มี)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "ใ_บรับรอง CA:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "ไม่ทราบ"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "เลือกใบรับรอง CA"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_ใบรับรองของผู้ใช้:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "เกิดข้อผิดพลาดขณะแก้ไขการเชื่อมต่อ"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_ปลดล็อค"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "_ถามรหัสผ่านทุกครั้ง"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "ต้องการรหัสผ่านในการเชื่อมต่อกับ '%s'"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "แ_สดงรหัสผ่าน"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_รหัสผ่าน:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_รหัสผ่าน:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_รหัสผ่าน:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "ตัดการเชื่อมต่อ"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "ไม่มี"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP แบบผันแปร (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_สร้าง"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "ต้องใช้รหัสผ่านหรือกุญแจเข้ารหัสลับในการเข้าใช้เครือข่ายไร้สาย '%s'"
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "ต้องยืนยันตัวบุคคลกับเครือข่ายไร้สาย"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "เครือข่ายไร้สายต้องการการยืนยันตัวบุคคล"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "สร้างเครือข่ายไร้สายใหม่"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "เครือข่ายไร้สายรายการใหม่"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "ป้อนชื่อเครือข่ายไร้สายที่ต้องการสร้าง"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "เชื่อมต่อไปยังเครือข่ายไร้สายที่ซ่อนอยู่"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "เครือข่ายไร้สายที่ซ่อนอยู่"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "ป้อนชื่อและรายละเอียดการรักษาความปลอดภัยของเครือข่ายไร้สายที่ซ่อนอยู่ที่คุณต้องการเชื่อมต่อ"
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "การรักษา_ความปลอดภัยเครือข่ายไร้สาย:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "การเชื่อม_ต่อ:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "อุปกรณ์ไ_ร้สาย:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "ฉันไม่เห็นชื่อผู้ให้บริการของฉันในรายชื่อ และต้องการป้อนเ_อง:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "ผู้ให้บริการ:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "รายชื่อประเทศหรือภูมิภาค:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "ประเทศหรือภูมิภาค"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "โยงสาย"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "การรักษา_ความปลอดภัยเครือข่ายไร้สาย:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_ชื่อเครือข่าย:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "การเชื่อม_ต่อ:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "อุปกรณ์ไ_ร้สาย:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "วิธีใช้:"
@@ -4322,26 +4824,26 @@ msgstr "ปิดคำเตือนใบรับรอง CA"
 msgid "selected CA certificate file does not exist"
 msgstr "เลือกแฟ้มใบรับรอง CA"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "เลือกแฟ้ม PAC..."
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "แฟ้ม PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "ทุกแฟ้ม"
 
@@ -4380,16 +4882,16 @@ msgstr "การยืนยันตัวบุคคลชั้นใ_น:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "เปิดรับการใช้ PAC อัตโนมัติ"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4426,15 +4928,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4448,24 +4950,24 @@ msgstr "WEP 128 บิต แบบวลีรหัสผ่าน"
 msgid "Sh_ow passphrase"
 msgstr "แสดงวลีรหัสผ่าน"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "ปิดคำเตือนใบรับรอง CA"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4474,7 +4976,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "_ชื่อในระบบ:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4514,15 +5016,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "การ_ยืนยันตัวบุคคล:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_รหัสผ่านกุญแจส่วนตัว:"
@@ -4532,33 +5034,33 @@ msgstr "_รหัสผ่านกุญแจส่วนตัว:"
 msgid "_Type"
 msgstr "ช_นิด:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4588,315 +5090,17 @@ msgstr "แ_สดงกุญแจ"
 msgid "WEP inde_x"
 msgstr "_ดัชนี WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "ปิดคำเตือนใบรับรอง CA"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "เลือกใบรับรอง CA"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "กุญแจ_ส่วนตัว:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_รหัสผ่านกุญแจส่วนตัว:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "เลือกใบรับรอง CA"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_ใบรับรองของผู้ใช้:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "ไม่มีประเทศของฉันในรายชื่อ"
-
-#~ msgid "Unlisted"
-#~ msgstr "ไม่ระบุ"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "แผนที่ฉันใช้ไม่มีในรายชื่อ..."
-
-#~ msgid "Provider"
-#~ msgstr "ผู้ให้บริการ"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "ติดตั้งอุปกรณ์ GSM แล้ว"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "ติดตั้งอุปกรณ์ CDMA แล้ว"
-
-#~ msgid "Any device"
-#~ msgstr "อุปกรณ์ใดๆ"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "การเชื่อมต่อบรอดแบนด์มือถือรายการใหม่"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr "เครื่องมือช่วยนี้จะช่วยคุณตั้งค่าการเชื่อมต่อบรอดแบนด์มือถือกับเครือข่ายมือถืออย่างง่ายดาย"
-
-#~ msgid "You will need the following information:"
-#~ msgstr "คุณจะต้องใช้ข้อมูลต่อไปนี้:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "ผู้ให้บริการบรอดแบนด์ของคุณ"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "ชื่อแผนการจ่ายเงินที่คุณใช้"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(ในบางกรณี) APN (Access Point Name) สำหรับแผนการจ่ายเงินบรอดแบนด์ที่คุณใช้"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "สร้างการเชื่อมต่อสำหรับอุปกรณ์บรอดแบนด์มือถือ_นี้:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "ตั้งค่าการเชื่อมต่อบรอดแบนด์มือถือ"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "ประเทศหรือภูมิภาค"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "เลือกประเทศหรือภูมิภาคของผู้ให้บริการของคุณ"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "เลือกผู้ให้บริการของคุณจาก_รายชื่อ:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "ฉันไม่เห็นชื่อผู้ให้บริการของฉันในรายชื่อ และต้องการป้อนเ_อง:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "ผู้ให้บริการของฉันใช้เทคโนโลยี GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "ผู้ให้บริการของฉันใช้เทคโนโลยี CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "เลือกผู้ให้บริการของคุณ"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "เ_ลือกแผนของคุณ:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "เลือก _APN (Access Point Name) ของแผน:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "คำเตือน: การเลือกแผนผิดอาจทำให้เกิดปัญหาเรื่องค่าบริการในบัญชีบรอดแบนด์ของคุณ "
-#~ "หรืออาจทำให้เชื่อมต่อไม่ได้\n"
-#~ "\n"
-#~ "ถ้าคุณไม่แน่ใจเกี่ยวกับแผนของคุณ กรุณาสอบถามผู้ให้บริการของคุณเกี่ยวกับ APN สำหรับแผนที่คุณใช้"
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "เลือกแผนการจ่ายเงินของคุณ"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "บรอดแบนด์มือถือของคุณถูกตั้งค่าไว้ดังนี้:"
-
-#~ msgid "Your Device:"
-#~ msgstr "อุปกรณ์ของคุณ:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "ผู้ให้บริการของคุณ:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "แผนของคุณ:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "กำลังจะเชื่อมต่อไปยังผู้ให้บริการบรอดแบนด์มือถือของคุณโดยใช้ค่าต่างๆ ที่คุณเลือกไว้ "
-#~ "ถ้าการเชื่อมต่อล้มเหลว หรือคุณไม่สามารถเข้าถึงทรัพยากรต่างๆ ในเครือข่ายได้ "
-#~ "ก็กรุณาตรวจสอบการตั้งค่าของคุณใหม่ การแก้ไขค่าตั้งบรอดแบนด์มือถือ ทำได้โดยเลือก "
-#~ "\"การเชื่อมต่อเครือข่าย\" จากเมนู \"ระบบ\" >> \"ปรับแต่งพื้นโต๊ะ\""
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "ยืนยันการตั้งค่าบรอดแบนด์มือถือ"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(ไม่มี)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "ใ_บรับรอง CA:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "ไม่ทราบ"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "เลือกใบรับรอง CA"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_ใบรับรองของผู้ใช้:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "เกิดข้อผิดพลาดขณะแก้ไขการเชื่อมต่อ"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_ปลดล็อค"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "_ถามรหัสผ่านทุกครั้ง"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "ต้องการรหัสผ่านในการเชื่อมต่อกับ '%s'"
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "แ_สดงรหัสผ่าน"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_รหัสผ่าน:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_รหัสผ่าน:"
-
-#~ msgid "_Password:"
-#~ msgstr "_รหัสผ่าน:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "ตัดการเชื่อมต่อ"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "ไม่มี"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP แบบผันแปร (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_สร้าง"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr "ต้องใช้รหัสผ่านหรือกุญแจเข้ารหัสลับในการเข้าใช้เครือข่ายไร้สาย '%s'"
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "ต้องยืนยันตัวบุคคลกับเครือข่ายไร้สาย"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "เครือข่ายไร้สายต้องการการยืนยันตัวบุคคล"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "สร้างเครือข่ายไร้สายใหม่"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "เครือข่ายไร้สายรายการใหม่"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "ป้อนชื่อเครือข่ายไร้สายที่ต้องการสร้าง"
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "เชื่อมต่อไปยังเครือข่ายไร้สายที่ซ่อนอยู่"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "เครือข่ายไร้สายที่ซ่อนอยู่"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr "ป้อนชื่อและรายละเอียดการรักษาความปลอดภัยของเครือข่ายไร้สายที่ซ่อนอยู่ที่คุณต้องการเชื่อมต่อ"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "การรักษา_ความปลอดภัยเครือข่ายไร้สาย:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "การเชื่อม_ต่อ:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "อุปกรณ์ไ_ร้สาย:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "ฉันไม่เห็นชื่อผู้ให้บริการของฉันในรายชื่อ และต้องการป้อนเ_อง:"
-
-#~ msgid "Provider:"
-#~ msgstr "ผู้ให้บริการ:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "รายชื่อประเทศหรือภูมิภาค:"
-
-#~ msgid "Country or region"
-#~ msgstr "ประเทศหรือภูมิภาค"
-
-#~ msgid "Wired"
-#~ msgstr "โยงสาย"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "การรักษา_ความปลอดภัยเครือข่ายไร้สาย:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_ชื่อเครือข่าย:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "การเชื่อม_ต่อ:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "อุปกรณ์ไ_ร้สาย:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (ปริยาย)"
 
diff --git a/po/tr.po b/po/tr.po
index ac661d0a..f6d02b2e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\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"
@@ -29,6 +29,7 @@ msgstr ""
 "X-POOTLE-MTIME: 1434872144.000000\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Ağ"
 
@@ -232,15 +233,19 @@ msgstr "802.1X kimlik doğrulaması"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "_İptal Et"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "B_ağlan"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Ağ adı"
 
@@ -586,7 +591,7 @@ msgstr "Mobil Geniş Bant (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Mobil Geniş Bant"
 
@@ -707,7 +712,9 @@ msgstr "DSL kimlik doğrulama"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "_TAMAM"
 
@@ -810,6 +817,7 @@ msgid "Error displaying connection information:"
 msgstr "Bağlantı bilgilerini gösterirken hata oluştu:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -955,7 +963,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "Etkin Nokta"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "Parola"
 
@@ -979,7 +987,8 @@ msgstr "VPN Afişi"
 msgid "Base Connection"
 msgstr "Temel Bağlantı"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
@@ -1730,6 +1739,7 @@ msgid "_Service"
 msgstr "_Hizmet"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2384,6 +2394,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Eğer ev ağı kullanılamıyorsa _dolaşıma izin ver"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "Parolaları _göster"
 
@@ -2797,13 +2808,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3124,12 +3136,12 @@ msgstr ""
 "desteklenmesini devre dışı bırakmayı deneyin."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Kablosuz Bağlantı"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3139,22 +3151,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bond"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Takım"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Köprü"
 
@@ -3437,6 +3452,7 @@ msgid "Select a connection to delete"
 msgstr "Silinecek bağlantı seç"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Ad"
 
@@ -3647,6 +3663,8 @@ msgstr "Ethernet bağlantısı %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Öntanımlı"
 
@@ -3874,35 +3892,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Sağlayıcım C_DMA-tabanlı teknoloji kullanıyor (örn.: 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4060,10 +4078,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Kablosuz bağlantı %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Anahtar (Hex ya da ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Parola"
 
@@ -4072,14 +4092,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamik WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Kişisel"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Kişisel"
@@ -4155,6 +4178,459 @@ msgstr "Bağlantı Bilgileri"
 msgid "_Close"
 msgstr "_Kapat"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+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/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "Sertifika belirlenmedi"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "Anahtar belirlenmedi"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "%s Sertifikası için anahtar seç"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "%s özel _anahtarı"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "%s anahtar _parolası"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "%s Sertifikası Seç"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "%s _sertifikası"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Ülkem listede değil"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Listelenmemiş"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "Planım listede yok…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Sağlayıcı"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Kurulan GSM aygıtı"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Kurulan CDMA aygıtı"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Herhangi bir aygıt"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Yeni Mobil Geniş Bant Bağlantı"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Bu yardımcı, bir hücresel ağa (3G) kolayca mobil geniş bant bağlantı "
+"kurmanıza yardımcı olacak."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Aşağıdaki bilgilere gereksineceksiniz:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "Geniş bant sağlayıcınızın adı"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Geniş bant ödeme planınızın adı"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(bazı durumlarda) Geniş bant ödeme planı APNʼsi (Erişim Noktası Adı)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Bu mobil _geniş bant aygıtı için bir bağlantı oluştur:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Mobil Geniş Bant Bağlantı Ayarla"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "Ülke veya bölge:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "Sağlayıcınızın Ülkesini veya Bölgesini Seçin"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "_Listeden sağlayıcınızı seçin:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Sağlayıcımı bulamıyorum ve _elle kurmak istiyorum:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Sağlayıcım GSM teknolojisini kullanıyor (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Sağlayıcım CDMA teknolojisini kullanıyor (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Sağlayıcınızı Seçin"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Planınızı seçin:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Seçili plan _APNʼsi (Erişim Noktası Adı):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Uyarı: Yanlış ödeme planı seçmeniz geniş bant hesabınız için ödeme sorunları "
+"oluşturabilir veya bağlantınızı etkileyebilir.\n"
+"\n"
+"Planınızdan emin değilseniz hizmet sağlayıcınıza planınızın APNʼsini sorun."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Ödeme Planınızı Seçin"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Mobil geniş bant bağlantınız aşağıdaki ayarlarla yapılandırıldı:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Aygıtınız:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Sağlayıcınız:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Planınız:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Seçtiğiniz ayarlar kullanılarak mobil geniş bant sağlayıcınızla bir bağlantı "
+"yapılacak. Bağlantı başarısız olursa veya ağ öz kaynaklarına ulaşamazsanız "
+"ayarlarınızı gözden geçirin. Geniş bant bağlantı ayarlarınızı düzenlemek "
+"için Sistem → Tercihler menüsünden “Ağ Bağlantıları”nı seçin."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Mobil Geniş Bant Ayarlarını Doğrula"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(Hiçbiri)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "%s içindeki anahtar"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "%s içindeki sertifika"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(Bilinmeyen)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "Seç"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "İptal Et"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "Dosyadan seç…"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "%s Sertifikası Seç"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s sertifika _parolası"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "Giriş yaparken hata: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "Oturum açılırken hata: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "Jetonun kilidini _aç"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "Düzenleyen"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "%s PINʼini Gir"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "_Giriş"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "PINʼi _Anımsa"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "Parolayı yalnızca bu kullanıcı için depola"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "Parolayı tüm kullanıcılar için depola"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "Bu parolayı her zaman sor"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "Parola gerekli değil"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "Parolayı _Göster"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "_Üçüncül Parola:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "_İkincil Parola:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "Pa_rola:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "Bağlanmak için tıkla"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "Yeni…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Hiçbiri"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dinamik WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Oluştur"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"“%s” kablosuz ağına erişmek için parola ya da şifreleme anahtarı gereklidir."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Kablosuz Ağ Kimlik Doğrulaması Gerekli"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Kablosuz ağ için kimlik doğrulaması gerekli"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Yeni Kablosuz Ağ Oluştur"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Yeni Kablosuz Ağ"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Oluşturmak istediğiniz Kablosuz ağ için bir ad girin."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Gizli Kablosuz Ağa Bağlan"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Gizli Kablosuz ağ"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Bağlanmak istediğiniz gizli kablosuz ağın adını ve güvenlik ayrıntılarını "
+"girin."
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Kablosuz _güvenliği"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "B_ağlantı"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Kablosuz _bağdaştırıcı"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Sağlayıcımı bulamıyorum ve _elle girmek istiyorum:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Sağlayıcı:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Ülke veya Bölge Listesi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Ülke veya bölge"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Kablolu"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Ya bir parola eksik ya da bağlantı geçersiz. İkinci durumda, önce bağlantıyı "
+"nm-connection-editor ile düzenlemelisiniz"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Kablosuz _güvenliği:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Ağ adı:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "B_ağlantı:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Kablosuz _bağdaştırıcı:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Kullanım:"
@@ -4301,25 +4777,25 @@ msgstr "CA sertifikası seçilmedi"
 msgid "selected CA certificate file does not exist"
 msgstr "seçilen CA sertifika dosyası yok"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC dosyası eksik"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "Bir PAC dosyası seçin"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC dosyaları (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Tüm dosyalar"
 
@@ -4355,16 +4831,16 @@ msgstr "_Dahili kimlik doğrulaması"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Kendiliğinden PAC ön _hazırlığına izin ver"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP kullanıcı adı eksik"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP parolası eksik"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4399,15 +4875,15 @@ msgstr "Sunucu sertifika adının son eki."
 msgid "_Domain"
 msgstr "_Etki Alanı"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "eksik EAP kullanıcı adı"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "eksik EAP parolası"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "kayıp EAP istemci Gizli Anahtar metni"
 
@@ -4419,23 +4895,23 @@ msgstr "Gizli Anahta_r Metni"
 msgid "Sh_ow passphrase"
 msgstr "Parolayı _göster"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "eksik EAP-TLS kimliği"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "kullanıcı sertifikası seçilmedi"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "seçilen kullanıcı sertifika dosyası yok"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "anahtar seçilmedi"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "seçilen anahtar dosyası yok"
 
@@ -4443,7 +4919,7 @@ msgstr "seçilen anahtar dosyası yok"
 msgid "I_dentity"
 msgstr "K_imlik"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (EAP yok)"
 
@@ -4481,15 +4957,15 @@ msgstr "Harici olarak yapılandırıldı"
 msgid "Au_thentication"
 msgstr "_Yetkilendirme"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "leap-kullanıcı adı eksik"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "leap-parolası eksik"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "eksik EAP parolası"
@@ -4498,18 +4974,18 @@ msgstr "eksik EAP parolası"
 msgid "_Type"
 msgstr "_Tür"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "wep-anahtarı eksik"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4517,7 +4993,7 @@ msgstr ""
 "geçersiz wep-anahtarı: %zu uzunluğundaki bir anahtar yalnızca ascii "
 "karakterler içermelidir"
 
-#: src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4526,11 +5002,11 @@ 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:127
+#: src/wireless-security/ws-wep-key.c:128
 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:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "geçersiz wep-anahtarı: parola 64 karakterden kısa olmalıdır"
 
@@ -4558,7 +5034,7 @@ msgstr "Anahtarı _göster"
 msgid "WEP inde_x"
 msgstr "WEP indek_si"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4567,352 +5043,10 @@ 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 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"
 
-#~ 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>"
-
-#~ msgid "No certificate set"
-#~ msgstr "Sertifika belirlenmedi"
-
-#~ msgid "No key set"
-#~ msgstr "Anahtar belirlenmedi"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "%s Sertifikası için anahtar seç"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "%s özel _anahtarı"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "%s anahtar _parolası"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "%s Sertifikası Seç"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s _sertifikası"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Ülkem listede değil"
-
-#~ msgid "Unlisted"
-#~ msgstr "Listelenmemiş"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "Planım listede yok…"
-
-#~ msgid "Provider"
-#~ msgstr "Sağlayıcı"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Kurulan GSM aygıtı"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Kurulan CDMA aygıtı"
-
-#~ msgid "Any device"
-#~ msgstr "Herhangi bir aygıt"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Yeni Mobil Geniş Bant Bağlantı"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Bu yardımcı, bir hücresel ağa (3G) kolayca mobil geniş bant bağlantı "
-#~ "kurmanıza yardımcı olacak."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Aşağıdaki bilgilere gereksineceksiniz:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Geniş bant sağlayıcınızın adı"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Geniş bant ödeme planınızın adı"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(bazı durumlarda) Geniş bant ödeme planı APNʼsi (Erişim Noktası Adı)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Bu mobil _geniş bant aygıtı için bir bağlantı oluştur:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Mobil Geniş Bant Bağlantı Ayarla"
-
-#~ msgid "Country or region:"
-#~ msgstr "Ülke veya bölge:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Sağlayıcınızın Ülkesini veya Bölgesini Seçin"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "_Listeden sağlayıcınızı seçin:"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Sağlayıcımı bulamıyorum ve _elle kurmak istiyorum:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Sağlayıcım GSM teknolojisini kullanıyor (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Sağlayıcım CDMA teknolojisini kullanıyor (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Sağlayıcınızı Seçin"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Planınızı seçin:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Seçili plan _APNʼsi (Erişim Noktası Adı):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Uyarı: Yanlış ödeme planı seçmeniz geniş bant hesabınız için ödeme "
-#~ "sorunları oluşturabilir veya bağlantınızı etkileyebilir.\n"
-#~ "\n"
-#~ "Planınızdan emin değilseniz hizmet sağlayıcınıza planınızın APNʼsini "
-#~ "sorun."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Ödeme Planınızı Seçin"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "Mobil geniş bant bağlantınız aşağıdaki ayarlarla yapılandırıldı:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Aygıtınız:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Sağlayıcınız:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Planınız:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Seçtiğiniz ayarlar kullanılarak mobil geniş bant sağlayıcınızla bir "
-#~ "bağlantı yapılacak. Bağlantı başarısız olursa veya ağ öz kaynaklarına "
-#~ "ulaşamazsanız ayarlarınızı gözden geçirin. Geniş bant bağlantı "
-#~ "ayarlarınızı düzenlemek için Sistem → Tercihler menüsünden “Ağ "
-#~ "Bağlantıları”nı seçin."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Mobil Geniş Bant Ayarlarını Doğrula"
-
-#~ msgid "(None)"
-#~ msgstr "(Hiçbiri)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "%s içindeki anahtar"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "%s içindeki sertifika"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(Bilinmeyen)"
-
-#~ msgid "Select"
-#~ msgstr "Seç"
-
-#~ msgid "Cancel"
-#~ msgstr "İptal Et"
-
-#~ msgid "Select from file…"
-#~ msgstr "Dosyadan seç…"
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "%s Sertifikası Seç"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "%s sertifika _parolası"
-
-#~ msgid "Error logging in: "
-#~ msgstr "Giriş yaparken hata: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "Oturum açılırken hata: "
-
-#~ msgid "_Unlock token"
-#~ msgstr "Jetonun kilidini _aç"
-
-#~ msgid "Issued By"
-#~ msgstr "Düzenleyen"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "%s PINʼini Gir"
-
-#~ msgid "_Login"
-#~ msgstr "_Giriş"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "PINʼi _Anımsa"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "Parolayı yalnızca bu kullanıcı için depola"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "Parolayı tüm kullanıcılar için depola"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "Bu parolayı her zaman sor"
-
-#~ msgid "The password is not required"
-#~ msgstr "Parola gerekli değil"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "Parolayı _Göster"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Üçüncül Parola:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "_İkincil Parola:"
-
-#~ msgid "_Password:"
-#~ msgstr "Pa_rola:"
-
-#~ msgid "Click to connect"
-#~ msgstr "Bağlanmak için tıkla"
-
-#~ msgid "New…"
-#~ msgstr "Yeni…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Hiçbiri"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Dinamik WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Oluştur"
-
-#, 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."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Kablosuz Ağ Kimlik Doğrulaması Gerekli"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Kablosuz ağ için kimlik doğrulaması gerekli"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Yeni Kablosuz Ağ Oluştur"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Yeni Kablosuz Ağ"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Gizli Kablosuz Ağa Bağlan"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Gizli Kablosuz ağ"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Bağlanmak istediğiniz gizli kablosuz ağın adını ve güvenlik ayrıntılarını "
-#~ "girin."
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Kablosuz _güvenliği"
-
-#~ msgid "C_onnection"
-#~ msgstr "B_ağlantı"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Kablosuz _bağdaştırıcı"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Sağlayıcımı bulamıyorum ve _elle girmek istiyorum:"
-
-#~ msgid "Provider:"
-#~ msgstr "Sağlayıcı:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Ülke veya Bölge Listesi:"
-
-#~ msgid "Country or region"
-#~ msgstr "Ülke veya bölge"
-
-#~ msgid "Wired"
-#~ msgstr "Kablolu"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "Ya bir parola eksik ya da bağlantı geçersiz. İkinci durumda, önce "
-#~ "bağlantıyı nm-connection-editor ile düzenlemelisiniz"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Kablosuz _güvenliği:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Ağ adı:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "B_ağlantı:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Kablosuz _bağdaştırıcı:"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/ug.po b/po/ug.po
index 3b1aefe9..be36949b 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2013-02-10 11:32+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret gmail com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ yahoogroups com>\n"
@@ -20,6 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "تور"
 
@@ -216,16 +217,20 @@ msgstr "802.1X كىملىك دەلىللەش"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 #, fuzzy
 msgid "C_onnect"
 msgstr "باغلاندى"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "تور ئاتى(_N)"
@@ -583,7 +588,7 @@ msgstr "كۆچمە كەڭ بەلۋاغ(%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "كۆچمە كەڭ بەلۋاغ"
 
@@ -705,7 +710,9 @@ msgstr "DSL دەلىللەش"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -811,6 +818,7 @@ msgid "Error displaying connection information:"
 msgstr "باغلىنىش ئۇچۇرلىرىنى كۆرسەتكەندە خاتالىق چىقتى:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -961,7 +969,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "ئىم:"
@@ -986,7 +994,8 @@ msgstr "VPN لەۋھەسى"
 msgid "Base Connection"
 msgstr "ئاساسىي باغلىنىش"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "نامەلۇم"
 
@@ -1758,6 +1767,7 @@ msgid "_Service"
 msgstr "مۇلازىمەت(_S)"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2418,6 +2428,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "ئەگەر ئائىلە تورى ئىشلىمىسە، كەزمە ئىشلىتىڭ."
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "ئىمنى كۆرسەت(_W)"
 
@@ -2821,13 +2832,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "ئېفىر تورى"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3151,12 +3163,12 @@ msgstr ""
 "قوللايدۇ. ئەگەر باغلىنىش مەغلۇپ بولسا، بەزى قوللاش ئۇسۇللىرىنى تاقاپ سىناڭ."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "كۆكچىش"
 
@@ -3166,22 +3178,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "كۆۋرۈك"
 
@@ -3476,6 +3491,7 @@ msgid "Select a connection to delete"
 msgstr "DSL باغلىنىشى %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "ئاتى"
 
@@ -3700,6 +3716,8 @@ msgstr "ئېزېرنېت باغلىنىش %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "كۆڭۈلدىكى"
 
@@ -3925,35 +3943,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "تەمىنلىگۈچىم C_DMA -ئاساسىدىكى تېخنىكىنى ئىشلىتىدۇ(1xRTT، EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4120,10 +4138,12 @@ msgid "Wi-Fi connection %d"
 msgstr "سىمسىز تور(Wi-Fi) باغلىنىشى %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 بىتلىق ئاچقۇچ(16لىك ياكى ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 بىتلىق شىفىر"
 
@@ -4132,14 +4152,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "دىنامىكىلىق WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ۋە WPA2 كىشىلىك نۇسخىسى"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ۋە WPA2 كارخانا نۇسخىسى"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA ۋە WPA2 كىشىلىك نۇسخىسى"
@@ -4216,6 +4239,483 @@ msgstr "باغلىنىش ئۇچۇرلىرى"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "CA گۇۋاھنامىسى تاللا"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "شەخسىي ئاچقۇچ(_K)"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "شەخسىي ئاچقۇچ ئىمى(_P):"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "CA گۇۋاھنامىسى تاللا"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "ئىشلەتكۈچى گۇۋاھنامىسى(_U):"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "دۆلىتىم تىزىملانماپتۇ"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "تىزىملانمىغان"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "پىلانىم تىزىملىكتە يوق..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "تەمىنلىگۈچى"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "ئورۇنلاشتۇرۇلغان GSM ئۈسكۈنىسى"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "ئورۇنلاشتۇرۇلغان CDMA ئۈسكۈنىسى"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "ھەرقانداق بىر ئۈسكۈنە"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "يېڭى كۆچمە كەڭ بەلۋاغ باغلىنىشى"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"بۇ ياردەمچى پروگرامما كۆچمە تېلېفون تورى(3G) نى قۇلايلىق تەڭشەپ كۆچمە كەڭ "
+"بەلۋاغقا باغلىنىشقا ياردەم قىلىدۇ."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "ئاستىدىكى ئۇچۇرلارغا ئېھتىياجىڭىز چۈشىدۇ:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "كەڭ بەلۋاغ تەمىنلىگۈچىڭىزنىڭ ئاتى"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "كەڭ بەلۋاغ ھەق تۆلەش پىلانىڭىز ئاتى"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(بەزى ئەھۋالدا) كەڭ بەلۋاغ ھەق تۆلەش پىلانىڭىزنىڭ APN(زىيارەت نۇقتا ئاتى) ئى"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "بۇ كۆچمە كەڭ بەلۋاغ ئۈسكۈنىسى ئۈچۈن بىر باغلىنىش قۇر(_T):"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "يېڭى كۆچمە كەڭ بەلۋاغ باغلىنىشىنى سەپلە"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "دۆلەت ياكى رايون"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "تەمىنلىگۈچىڭىزنىڭ دۆلىتى ياكى رايونىنى تاللاڭ"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "تەمىنلىگۈچىڭىزنى تىزىملىكتىن تاللاڭ(_L)؛"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "تەمىنلىگۈچىمنى تاپالمىدى ۋە قولۇمدا كىرگۈزۈشنى ئىستەيمەن(_M):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "تەمىنلىگۈچىم GSM تېخنىكىسىنى ئىشلىتىدۇ(GPRS، EDGE، UMTS، HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "تەمىنلىگۈچىم CDMA تېخنىكىسىنى ئىشلىتىدۇ(1xRTT، EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "تەمىنلىگۈچىڭىزنى تاللاڭ"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "پىلانىڭىزنى تاللاڭ(_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "تاللانغان پىلان APN(زىيارەت نۇقتا ئاتى)(_A)"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"ئاگاھلاندۇرۇش: ناتوغرا بىر پىلاننى تاللاش كەڭ بەلۋاغ ھېسابات ھەق تۆلەش "
+"مەسىلىسى ياكى باغلىنالماسلىقنى كەلتۈرۈپ چىقىرىشى مۇمكىن.\n"
+"\n"
+"پىلانىڭىزنى جەزم قىلالمىسىڭىز تەمىنلىگۈچىڭىزدىن پىلانىڭىزنىڭ APN ئىنى سوراڭ"
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "ھەق تۆلەش پىلانىڭىزنى كىرگۈزۈڭ"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشىڭىز ئاستىدىكى تەڭشەكلەر بىلەن سەپلەنگەن:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "ئۈسكۈنىڭىز:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "تەمىنلىگۈچىڭىز:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "پىلانىڭىز:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"تاللىغان تەڭشەكلەر بويىچە كۆچمە كەڭ بەلۋاغ تەمىنلىگۈچىڭىزگە بارىدىغان بىر "
+"باغلىنىشنى قۇرىدۇ. ئەگەر باغلىنىش مەغلۇپ بولسا ياكى تور بايلىقلىرىنى زىيارەت "
+"قىلالمىسىڭىز، تەڭشەكلىرىڭىزنى قوش چېكىڭ. كۆچمە كەڭ بەلۋاغ باغلىنىشىڭىزنىڭ "
+"تەڭشەكلىرىنى ئۆزگەرتىش ئۈچۈن \"سىستېما››\" تاللاش ئىقتىدار تىزىملىكىدىن "
+"\"تور باغلىنىشلىرى\" نى تاللاڭ."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "كۆچمە كەڭ بەلۋاغ تەڭشەكلىرىنى جەزملە"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(يوق)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A گۇۋاھنامىسى:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "نامەلۇم"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "CA گۇۋاھنامىسى تاللا"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "ئىشلەتكۈچى گۇۋاھنامىسى(_U):"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "باغلىنىشنى تەھرىرلەۋاتقاندا خاتالىق كۆرۈلدى"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "قۇلۇپسىزلا(_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "بۇ ئىمنى ھەر ۋاقىت سورىسۇن(_K)"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "‹%s› كە باغلىنىش ئۈچۈن بىر ئىمغا ئېھتىياجلىق."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "ئىمنى كۆرسەت(_W)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "ئىم(_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "ئىم(_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "ئىم(_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "ئۈز"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "يوق"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "دىنامىكىلىق WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "قۇر(_R)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"سىمسىز(Wi-Fi) تور ‹%s› نى زىيارەت قىلىش ئۈچۈن ئىم ياكى شىفىرلاش ئاچقۇچى "
+"زۆرۈردۇر."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "سىمسىز(Wi-Fi) تور كىملىك دەلىللەش زۆرۈر"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "سىمسىز(Wi-Fi) تور كىملىك دەلىللەشنى تەلەپ قىلدى"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "يېڭى سىمسىز(Wi-Fi) تور قۇرۇش"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "يېڭى سىمسىز(Wi-Fi) تور"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "قۇرماقچى بولغان سىمسىز(Wi-Fi) تورنىڭ ئاتىنى كىرگۈزۈڭ."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "يوشۇرۇن سىمسىز(Wi-Fi) تورغا باغلىنىش"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "يوشۇرۇن سىمسىز(Wi-Fi) تور"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"باغلانماقچى بولغان يوشۇرۇن سىمسىز تورنىڭ ئاتى ۋە بىخەتەرلىك تەپسىلاتلىرىنى "
+"كىرگۈزۈڭ."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "سىمسىز(Wi-Fi) تور بىخەتەرلىكى:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "باغلىنىش(_O):"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "سىمسىز(Wi-Fi) تور كارتىسى(_A):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "تەمىنلىگۈچىمنى تاپالمىدى ۋە قولۇمدا كىرگۈزۈشنى ئىستەيمەن(_M):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "تەمىنلىگۈچى:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "دۆلەت ياكى رايون تىزىملىكى:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "دۆلەت ياكى رايون"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "سىملىق"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "سىمسىز(Wi-Fi) تور بىخەتەرلىكى:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "تور ئاتى(_N)"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "باغلىنىش(_O):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "سىمسىز(Wi-Fi) تور كارتىسى(_A):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "ئىشلىتىش ئۇسۇلى:"
@@ -4367,26 +4867,26 @@ msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC ھۆججىتىنى تاللاڭ…"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC ھۆججەتلىرى(*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "ھەممە ھۆججەتلەر"
 
@@ -4425,16 +4925,16 @@ msgstr "ئىچكى ئىسپات"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ئاپتوماتىك PAC تەمىنلەش"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4471,15 +4971,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4493,24 +4993,24 @@ msgstr "WEP 128 بىتلىق شىفىر"
 msgid "Sh_ow passphrase"
 msgstr "ئىمنى كۆرسەت(_W)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4519,7 +5019,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "كىملىك(_I):"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4559,15 +5059,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "كىملىك دەلىللەش(_T):"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "شەخسىي ئاچقۇچ ئىمى(_P):"
@@ -4577,33 +5077,33 @@ msgstr "شەخسىي ئاچقۇچ ئىمى(_P):"
 msgid "_Type"
 msgstr "تىپى(_T):"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4633,332 +5133,17 @@ msgstr "ئاچقۇچنى كۆرسەت(_W)"
 msgid "WEP inde_x"
 msgstr "WEP ئىندېكسى(_X):"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "CA گۇۋاھنامىسى تاللا"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "شەخسىي ئاچقۇچ(_K)"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "شەخسىي ئاچقۇچ ئىمى(_P):"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "CA گۇۋاھنامىسى تاللا"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "ئىشلەتكۈچى گۇۋاھنامىسى(_U):"
-
-#~ msgid "My country is not listed"
-#~ msgstr "دۆلىتىم تىزىملانماپتۇ"
-
-#~ msgid "Unlisted"
-#~ msgstr "تىزىملانمىغان"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "پىلانىم تىزىملىكتە يوق..."
-
-#~ msgid "Provider"
-#~ msgstr "تەمىنلىگۈچى"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "ئورۇنلاشتۇرۇلغان GSM ئۈسكۈنىسى"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "ئورۇنلاشتۇرۇلغان CDMA ئۈسكۈنىسى"
-
-#~ msgid "Any device"
-#~ msgstr "ھەرقانداق بىر ئۈسكۈنە"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "يېڭى كۆچمە كەڭ بەلۋاغ باغلىنىشى"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "بۇ ياردەمچى پروگرامما كۆچمە تېلېفون تورى(3G) نى قۇلايلىق تەڭشەپ كۆچمە كەڭ "
-#~ "بەلۋاغقا باغلىنىشقا ياردەم قىلىدۇ."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "ئاستىدىكى ئۇچۇرلارغا ئېھتىياجىڭىز چۈشىدۇ:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "كەڭ بەلۋاغ تەمىنلىگۈچىڭىزنىڭ ئاتى"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "كەڭ بەلۋاغ ھەق تۆلەش پىلانىڭىز ئاتى"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr ""
-#~ "(بەزى ئەھۋالدا) كەڭ بەلۋاغ ھەق تۆلەش پىلانىڭىزنىڭ APN(زىيارەت نۇقتا ئاتى) "
-#~ "ئى"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "بۇ كۆچمە كەڭ بەلۋاغ ئۈسكۈنىسى ئۈچۈن بىر باغلىنىش قۇر(_T):"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "يېڭى كۆچمە كەڭ بەلۋاغ باغلىنىشىنى سەپلە"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "دۆلەت ياكى رايون"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "تەمىنلىگۈچىڭىزنىڭ دۆلىتى ياكى رايونىنى تاللاڭ"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "تەمىنلىگۈچىڭىزنى تىزىملىكتىن تاللاڭ(_L)؛"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "تەمىنلىگۈچىمنى تاپالمىدى ۋە قولۇمدا كىرگۈزۈشنى ئىستەيمەن(_M):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "تەمىنلىگۈچىم GSM تېخنىكىسىنى ئىشلىتىدۇ(GPRS، EDGE، UMTS، HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "تەمىنلىگۈچىم CDMA تېخنىكىسىنى ئىشلىتىدۇ(1xRTT، EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "تەمىنلىگۈچىڭىزنى تاللاڭ"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "پىلانىڭىزنى تاللاڭ(_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "تاللانغان پىلان APN(زىيارەت نۇقتا ئاتى)(_A)"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "ئاگاھلاندۇرۇش: ناتوغرا بىر پىلاننى تاللاش كەڭ بەلۋاغ ھېسابات ھەق تۆلەش "
-#~ "مەسىلىسى ياكى باغلىنالماسلىقنى كەلتۈرۈپ چىقىرىشى مۇمكىن.\n"
-#~ "\n"
-#~ "پىلانىڭىزنى جەزم قىلالمىسىڭىز تەمىنلىگۈچىڭىزدىن پىلانىڭىزنىڭ APN ئىنى "
-#~ "سوراڭ"
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "ھەق تۆلەش پىلانىڭىزنى كىرگۈزۈڭ"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشىڭىز ئاستىدىكى تەڭشەكلەر بىلەن سەپلەنگەن:"
-
-#~ msgid "Your Device:"
-#~ msgstr "ئۈسكۈنىڭىز:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "تەمىنلىگۈچىڭىز:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "پىلانىڭىز:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "تاللىغان تەڭشەكلەر بويىچە كۆچمە كەڭ بەلۋاغ تەمىنلىگۈچىڭىزگە بارىدىغان بىر "
-#~ "باغلىنىشنى قۇرىدۇ. ئەگەر باغلىنىش مەغلۇپ بولسا ياكى تور بايلىقلىرىنى "
-#~ "زىيارەت قىلالمىسىڭىز، تەڭشەكلىرىڭىزنى قوش چېكىڭ. كۆچمە كەڭ بەلۋاغ "
-#~ "باغلىنىشىڭىزنىڭ تەڭشەكلىرىنى ئۆزگەرتىش ئۈچۈن \"سىستېما››\" تاللاش "
-#~ "ئىقتىدار تىزىملىكىدىن \"تور باغلىنىشلىرى\" نى تاللاڭ."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "كۆچمە كەڭ بەلۋاغ تەڭشەكلىرىنى جەزملە"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(يوق)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "C_A گۇۋاھنامىسى:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "نامەلۇم"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "CA گۇۋاھنامىسى تاللا"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "ئىشلەتكۈچى گۇۋاھنامىسى(_U):"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "باغلىنىشنى تەھرىرلەۋاتقاندا خاتالىق كۆرۈلدى"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "قۇلۇپسىزلا(_U)"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "بۇ ئىمنى ھەر ۋاقىت سورىسۇن(_K)"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "‹%s› كە باغلىنىش ئۈچۈن بىر ئىمغا ئېھتىياجلىق."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "ئىمنى كۆرسەت(_W)"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "ئىم(_P):"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "ئىم(_P):"
-
-#~ msgid "_Password:"
-#~ msgstr "ئىم(_P):"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "ئۈز"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "يوق"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "دىنامىكىلىق WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "قۇر(_R)"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "سىمسىز(Wi-Fi) تور ‹%s› نى زىيارەت قىلىش ئۈچۈن ئىم ياكى شىفىرلاش ئاچقۇچى "
-#~ "زۆرۈردۇر."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "سىمسىز(Wi-Fi) تور كىملىك دەلىللەش زۆرۈر"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "سىمسىز(Wi-Fi) تور كىملىك دەلىللەشنى تەلەپ قىلدى"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "يېڭى سىمسىز(Wi-Fi) تور قۇرۇش"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "يېڭى سىمسىز(Wi-Fi) تور"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "قۇرماقچى بولغان سىمسىز(Wi-Fi) تورنىڭ ئاتىنى كىرگۈزۈڭ."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "يوشۇرۇن سىمسىز(Wi-Fi) تورغا باغلىنىش"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "يوشۇرۇن سىمسىز(Wi-Fi) تور"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "باغلانماقچى بولغان يوشۇرۇن سىمسىز تورنىڭ ئاتى ۋە بىخەتەرلىك "
-#~ "تەپسىلاتلىرىنى كىرگۈزۈڭ."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "سىمسىز(Wi-Fi) تور بىخەتەرلىكى:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "باغلىنىش(_O):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "سىمسىز(Wi-Fi) تور كارتىسى(_A):"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "تەمىنلىگۈچىمنى تاپالمىدى ۋە قولۇمدا كىرگۈزۈشنى ئىستەيمەن(_M):"
-
-#~ msgid "Provider:"
-#~ msgstr "تەمىنلىگۈچى:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "دۆلەت ياكى رايون تىزىملىكى:"
-
-#~ msgid "Country or region"
-#~ msgstr "دۆلەت ياكى رايون"
-
-#~ msgid "Wired"
-#~ msgstr "سىملىق"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "سىمسىز(Wi-Fi) تور بىخەتەرلىكى:"
-
-#~ msgid "_Network name:"
-#~ msgstr "تور ئاتى(_N)"
-
-#~ msgid "C_onnection:"
-#~ msgstr "باغلىنىش(_O):"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "سىمسىز(Wi-Fi) تور كارتىسى(_A):"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (كۆڭۈلدىكى)"
 
diff --git a/po/uk.po b/po/uk.po
index 608929bf..edc57c9c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2012-03-24 09:49+0300\n"
 "Last-Translator: Korostil Daniel <ted korostiled gmail com>\n"
 "Language-Team: translation linux org ua\n"
@@ -21,6 +21,7 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Мережа"
 
@@ -216,15 +217,19 @@ msgstr "Автентифікація дротової мережі 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_З'єднати"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_Назва мережі:"
@@ -576,7 +581,7 @@ msgstr "Мобільне широкосмугове (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Мобільні широкосмугові"
 
@@ -704,7 +709,9 @@ msgstr "Автентифікація DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -817,6 +824,7 @@ msgid "Error displaying connection information:"
 msgstr "Помилка при показі відомостей з'єднання: "
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -968,7 +976,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Пароль:"
@@ -993,7 +1001,8 @@ msgstr "Шапка VPN"
 msgid "Base Connection"
 msgstr "Основне з'єднання"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Невідомо"
 
@@ -1744,6 +1753,7 @@ msgid "_Service"
 msgstr "С_лужба:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2401,6 +2411,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Вмикати _роумінг, якщо недоступна домашня мережа"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "П_оказати паролі"
 
@@ -2797,14 +2808,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "Ethernet автоматично"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3128,12 +3140,12 @@ msgstr ""
 "деяких способів.</i>"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3143,22 +3155,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3463,6 +3478,7 @@ msgid "Select a connection to delete"
 msgstr "Дротове з'єднання %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Назва"
 
@@ -3702,6 +3718,8 @@ msgstr "Дротове з'єднання %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Типово"
 
@@ -3933,35 +3951,35 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Мій провайдер використовує технологію на основі C_DMA (т.е. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4135,10 +4153,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Дротове з'єднання %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-бітний ключ (Hex або ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-и бітна ключова фраза"
 
@@ -4147,14 +4167,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "Динамічний WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Personal"
@@ -4235,6 +4258,493 @@ msgstr "Інформація про з'єднання"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "Сертифікат C_A:"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Обрати персональний сертифікат..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "Приватний кл_юч:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Па_роль до мережного ключа:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Обрати персональний сертифікат..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Сертифікат _користувача:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Моєї країни немає у списку"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Немає у списку"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Мого плану немає у списку..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Провайдер"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Встановлено пристрій GSM"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Встановлено пристрій CDMA"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Будь-який пристрій"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Нове мобільне широкосмугове з'єднання"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Цей помічник допоможе вам налаштувати мобільне широкосмугове підключення до "
+"мобільної (3G) мережі."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Вам буде потрібна наступна інформація:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Назва провайдера"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Тарифний план"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(у деяких випадках) Точка доступу (APN), відповідає тарифному плану"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Створити з'єднання для _цього мобільного широкосмугового пристрою:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Налаштовування мобільного широкосмугового пристрою"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Країна або область"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Виберіть країну вашого провайдера або область"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Виберіть п_ровайдера зі списку:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Я не можу знайти свого провайдера та хочу ввести його _вручну:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Мій провайдер використовує технологію GSM (GPRS, EDGE, UMTS, HSPDA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Мій провайдер використовує технологію CDMA (1xRTT. EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Виберіть свого провайдера"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Виберіть план:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Виберіть _точку доступу (APN) цього тарифного плану:"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Увага: вибір неправильного тарифного плану може призвести до проблем із "
+"рахунками чи зробити підключення неможливим.\n"
+"\n"
+"Якщо ви не впевнені, спитайте у провайдера, яка точка доступу (APN) "
+"відповідає вашому тарифному плану."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Виберіть тарифний план"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Мобільне широкосмугове з'єднання налаштовано з наступними параметрами:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Пристрій:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Провайдер:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "План:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Зараз буде виконано приєднання до вашого мобільного широкосмугового "
+"провайдера з використанням вказаних параметрів. Якщо з'єднання не буде "
+"встановлено або  не буде доступу до ресурсів мережі, перевірте параметри ще "
+"раз.  Щоб змінити параметри мобільного широкосмугового з'єднання. Щоб "
+"змінити параметри з'єднання, виберіть пункт «Мережні з'єднання» з меню "
+"Система >> Параметри."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Підтвердження параметрів мобільного з'єднання"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(немає)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Сертифікат C_A:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Невідомо"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Обрати персональний сертифікат..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Сертифікат _користувача:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Помилка редагування з'єднання"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Розблокувати"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "_Запитувати цей пароль щоразу"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Для підключення до мережі «%s» вимагається пароль."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "П_оказати паролі"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_Пароль:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Пароль:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Пароль:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Від'єднатися"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Без перевірки автентичності"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "Динамічний WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "С_творити"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"Для доступу до бездротової мережі «%s» необхідні паролі або ключі шифрування."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Для доступу до бездротової мережі потрібна автентифікація"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "Для доступу до бездротової мережі потрібна автентифікація"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "Створити нову бездротову мережу"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Нова бездротова мережа"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Введіть назву бездротової мережі, яку треба створити."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "З'єднатись з прихованою бездротовою мережею"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "Прихована бездротова мережа"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Введіть назву та параметри безпеки прихованої бездротової мережі, до якої "
+"треба приєднатись."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_Захист бездротової мережі:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "З'_єднання:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Бездротовий _адаптер:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Я не можу знайти свого провайдера та хочу ввести його _вручну:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Провайдер:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Список країн або областей:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Країна або область"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Дротові"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Захист бездротової мережі:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Назва мережі:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "З'_єднання:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Бездротовий _адаптер:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Використання:"
@@ -4387,26 +4897,26 @@ msgstr "Сертифікат C_A:"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Виберіть файл PAC…"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Файли PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Усі файли"
 
@@ -4445,16 +4955,16 @@ msgstr "Вн_утрішня автентифікація:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Дозволити автоматичне перед_бачення PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4491,15 +5001,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4513,24 +5023,24 @@ msgstr "WEP 128-и бітна ключова фраза"
 msgid "Sh_ow passphrase"
 msgstr "П_оказати паролі"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Сертифікат C_A:"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4539,7 +5049,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "_Посвідчення:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4579,15 +5089,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "Ав_тентифікація:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Па_роль до мережного ключа:"
@@ -4597,33 +5107,33 @@ msgstr "Па_роль до мережного ключа:"
 msgid "_Type"
 msgstr "_Тип:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4653,325 +5163,17 @@ msgstr "П_оказати ключ"
 msgid "WEP inde_x"
 msgstr "_Індекс WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Сертифікат C_A:"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Обрати персональний сертифікат..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "Приватний кл_юч:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Па_роль до мережного ключа:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Обрати персональний сертифікат..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Сертифікат _користувача:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Моєї країни немає у списку"
-
-#~ msgid "Unlisted"
-#~ msgstr "Немає у списку"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Мого плану немає у списку..."
-
-#~ msgid "Provider"
-#~ msgstr "Провайдер"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Встановлено пристрій GSM"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Встановлено пристрій CDMA"
-
-#~ msgid "Any device"
-#~ msgstr "Будь-який пристрій"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Нове мобільне широкосмугове з'єднання"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Цей помічник допоможе вам налаштувати мобільне широкосмугове підключення "
-#~ "до мобільної (3G) мережі."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Вам буде потрібна наступна інформація:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Назва провайдера"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Тарифний план"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(у деяких випадках) Точка доступу (APN), відповідає тарифному плану"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Створити з'єднання для _цього мобільного широкосмугового пристрою:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Налаштовування мобільного широкосмугового пристрою"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Країна або область"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Виберіть країну вашого провайдера або область"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Виберіть п_ровайдера зі списку:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Я не можу знайти свого провайдера та хочу ввести його _вручну:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Мій провайдер використовує технологію GSM (GPRS, EDGE, UMTS, HSPDA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Мій провайдер використовує технологію CDMA (1xRTT. EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Виберіть свого провайдера"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Виберіть план:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "Виберіть _точку доступу (APN) цього тарифного плану:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Увага: вибір неправильного тарифного плану може призвести до проблем із "
-#~ "рахунками чи зробити підключення неможливим.\n"
-#~ "\n"
-#~ "Якщо ви не впевнені, спитайте у провайдера, яка точка доступу (APN) "
-#~ "відповідає вашому тарифному плану."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Виберіть тарифний план"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "Мобільне широкосмугове з'єднання налаштовано з наступними параметрами:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Пристрій:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Провайдер:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "План:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Зараз буде виконано приєднання до вашого мобільного широкосмугового "
-#~ "провайдера з використанням вказаних параметрів. Якщо з'єднання не буде "
-#~ "встановлено або  не буде доступу до ресурсів мережі, перевірте параметри "
-#~ "ще раз.  Щоб змінити параметри мобільного широкосмугового з'єднання. Щоб "
-#~ "змінити параметри з'єднання, виберіть пункт «Мережні з'єднання» з меню "
-#~ "Система >> Параметри."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Підтвердження параметрів мобільного з'єднання"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(немає)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "Сертифікат C_A:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Невідомо"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Обрати персональний сертифікат..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Сертифікат _користувача:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Помилка редагування з'єднання"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Розблокувати"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "_Запитувати цей пароль щоразу"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Для підключення до мережі «%s» вимагається пароль."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "П_оказати паролі"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_Пароль:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_Пароль:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Пароль:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Від'єднатися"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Без перевірки автентичності"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "Динамічний WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "С_творити"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "Для доступу до бездротової мережі «%s» необхідні паролі або ключі "
-#~ "шифрування."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Для доступу до бездротової мережі потрібна автентифікація"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Для доступу до бездротової мережі потрібна автентифікація"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Створити нову бездротову мережу"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Нова бездротова мережа"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "Введіть назву бездротової мережі, яку треба створити."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "З'єднатись з прихованою бездротовою мережею"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Прихована бездротова мережа"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "Введіть назву та параметри безпеки прихованої бездротової мережі, до якої "
-#~ "треба приєднатись."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_Захист бездротової мережі:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "З'_єднання:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Бездротовий _адаптер:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Я не можу знайти свого провайдера та хочу ввести його _вручну:"
-
-#~ msgid "Provider:"
-#~ msgstr "Провайдер:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Список країн або областей:"
-
-#~ msgid "Country or region"
-#~ msgstr "Країна або область"
-
-#~ msgid "Wired"
-#~ msgstr "Дротові"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_Захист бездротової мережі:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_Назва мережі:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "З'_єднання:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Бездротовий _адаптер:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (типово)"
 
diff --git a/po/ur.po b/po/ur.po
index cef2ae43..e316618b 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2010-04-06 22:47+0500\n"
 "Last-Translator: Muhammad Ali Makki <makkiabufaris aol com>\n"
 "Language-Team: urducoder.com <makkiabufaris aol com>\n"
@@ -21,6 +21,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 #, fuzzy
 msgid "Network"
 msgstr "ن_یٹ ورک:"
@@ -221,15 +222,19 @@ msgstr "وائیرڈ 802.1X توثیق"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "_متصل ہوں"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "_نیٹ ورک کا نام:"
@@ -591,7 +596,7 @@ msgstr "موبائل براڈ بینڈ (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "موبائل براڈ بینڈ"
 
@@ -720,7 +725,9 @@ msgstr "ڈی ایس ایل DSL توثیق"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -832,6 +839,7 @@ msgid "Error displaying connection information:"
 msgstr "اتصال کی معلومات دکھانے میں غلطی:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -986,7 +994,7 @@ msgstr ""
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "پاس ورڈ:"
@@ -1015,7 +1023,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "ا_تصال:"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "نامعلوم"
 
@@ -1774,6 +1783,7 @@ msgid "_Service"
 msgstr "_سروس:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2429,6 +2439,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr ""
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "پاس ورڈ _دکھائیں"
 
@@ -2829,14 +2840,15 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 #, fuzzy
 msgid "Ethernet"
 msgstr "خودکار ایتھرنیٹ (Ethernet)"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -3161,12 +3173,12 @@ msgstr ""
 "دیکھیں.</i>"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -3176,22 +3188,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3490,6 +3505,7 @@ msgid "Select a connection to delete"
 msgstr "وائیرڈ اتصال %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "نام"
 
@@ -3718,6 +3734,8 @@ msgstr "وائیرڈ اتصال %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "طے شدہ"
 
@@ -3946,35 +3964,35 @@ msgstr ""
 "میرا فراہم کُنندہ سی ڈی ایم اے پر مبنی ٹیکنالوجی استعمال کرتا ہے (جیسے 1xRTT, "
 "EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4142,11 +4160,13 @@ msgid "Wi-Fi connection %d"
 msgstr "وائیرڈ اتصال %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 64/128-bit ASCII"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
@@ -4155,14 +4175,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "حرکی WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ذاتی"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 انٹرپرائز"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 ذاتی"
@@ -4243,6 +4266,502 @@ msgstr "اتصال کی معلومات"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "CA _سند:"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "اپنی ذاتی سند منتخب کریں..."
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "نجی _کلید:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_نجی کلید پاس ورڈ:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "اپنی ذاتی سند منتخب کریں..."
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "_صارف سند:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "میرا ملک فہرست میں نہیں ہے"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "غیر درج شدہ"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "میرا پلان درجِ فہرست نہیں ہے..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "فراہم کُنندہ"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "نصب شدہ GSM ڈیوائس"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "نصب شدہ CDMA ڈیوائس"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "کوئی بھی ڈیوائس"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "نیا موبائل براڈ بینڈ اتصال"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"یہ مددگار سیلولر (3G) نیٹ ورک سے موبائل براڈ بینڈ اتصال مرتب کرنے میں آپ کی "
+"مدد کرے گا."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "آپ کو ذیل کی معلومات درکار ہوں گی:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "آپ کے براڈ بینڈ فراہم کُنندہ کا نام"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "آپ کے فراہم کُنندہ کے بِلِنگ پلان کا نام"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(کچھ صورتوں میں) آپ کا براڈ بینڈ بِلِنگ پلان APN (Access Point Name)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "ا_س موبائل براڈ بینڈ ڈیوائس کے لیے اتصال بنائیں:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "موبائل براڈ بینڈ اتصال مرتب کریں"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "ممالک فہرست:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "اپنے فراہم کُنندہ کا ملک منتخب کریں"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "اپنا فراہم کُنندہ _فہرست میں سے منتخب کریں:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"میں اپنا فراہم کُنندہ تلاش نہیں کر سکا چنانچہ میں اسے _دستی طور پر شامل کرنا "
+"چاہتا ہوں:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+"میرا فراہم کُنندہ GSM ٹیکنالوجی استعمال کرتا ہے (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "میرا فراہم کُنندہ CDMA ٹیکنالوجی استعمال کرتا ہے (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "اپنا فراہم کُنندہ منتخب کریں"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "اپنا پلان _منتخب کریں:"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "منتخب کردہ پلان _APN (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"انتباہ: غلط پلان کے انتخاب سے آپ کے براڈ بینڈ اتصال سے بِلِنگ کے مسائل پیدا "
+"ہوسکتے ہیں یا ممکنہ طور پر آپ کی متصلی بند کی جاسکتی ہے\n"
+"\n"
+"اگر آپ اپنے پلان کے حوالے سے تذبذب کا شکار ہیں تو اپنے فراہم کُنندہ سے اپنے "
+"پلان کے APN کے لیے کہیں."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "اپنا بِلِنگ پلان منتخب کریں"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"آپ کا موبائل براڈ بینڈ اتصال مندرجہ ذیل ترتیبات کے ساتھ وضع کیا گیا ہے:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "آپ کی ڈیوائس:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "آپ کا فراہم کُنندہ:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "آپ کا پلان:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"اب آپ کی منتخب کردہ ترتیبات کو استعمال کرتے ہوئے آپ کے براڈ بینڈ فراہم کُنندہ "
+"سے اتصال قائم کیا جائے گا. اگر تصال ناکام ہوجائے یا آپ نیٹ ورک وسائل تک "
+"رسائی حاصل نہ کرسکیں تو اپنی ترتیبات دوبارہ چیک کریں. اپنے موبائل براڈ بینڈ "
+"اتصال میں تبدیلی کے لیے نظام >> ترجیحات کی فہرست سے \"نیٹ ورک اتصال\" منتخب "
+"کریں."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "موبائل براڈ بینڈ کی ترتیبات کی تصدیق کریں"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(کچھ نہیں)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "CA _سند:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "نامعلوم"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+#, fuzzy
+msgid "Select"
+msgstr "فائل منتخب کریں"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+#, fuzzy
+msgid "Cancel"
+msgstr "gtk-cancel"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+#, fuzzy
+msgid "Select from file…"
+msgstr "فائل منتخب کریں"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "اپنی ذاتی سند منتخب کریں..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "_صارف سند:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Fehler beim Abrufen der VPN-Verbindung »%s«"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "نیٹ ورک '%s' سے اتصال قائم کرنے کے لیے پاس ورڈ درکار ہے."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "پاس ورڈ _دکھائیں"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "_پاس ورڈ:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_پاس ورڈ:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_پاس ورڈ:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Verbindung konnte nicht verschoben werden"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "کچھ نہیں"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "حرکی WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_بنائیں"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+"وائیرلیس نیٹ ورک '%s' تک رسائی کے لیے پاس ورڈ یا ترمیزی کلیدیں درکار ہیں."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "وائیرلیس نیٹ ورک توثیق درکار"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "توثیق درکار از وائیرلیس نیٹ ورک"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "نیا وائیرلیس نیٹ ورک بنائیں"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "نیا وائیرلیس نیٹ ورک"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "نئے وائیرلیس نیٹ ورک کا نام لکھیں جو آپ بنانا چاہتے ہیں."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "پوشیدہ وائیرلیس نیٹ ورک سے اتصال قائم کریں"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "پوشیدہ وائیرلیس نیٹ ورک"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"اس پوشیدہ وائیرلیس نیٹ ورک کا نام اور سیکورٹی تفصیلات داخل کریں جس سے آپ "
+"متصل ہونے چاہتے ہیں."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_وائیرلیس سیکورٹی:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "ا_تصال:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "وائیرلیس ا_ڈاپٹر:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"میں اپنا فراہم کُنندہ تلاش نہیں کر سکا چنانچہ میں اسے _دستی طور پر شامل کرنا "
+"چاہتا ہوں:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "فراہم کُنندہ:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+#, fuzzy
+msgid "Country or Region List:"
+msgstr "ممالک فہرست:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+#, fuzzy
+msgid "Country or region"
+msgstr "ممالک فہرست:"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "وائیرڈ"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_وائیرلیس سیکورٹی:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_نیٹ ورک کا نام:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "ا_تصال:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "وائیرلیس ا_ڈاپٹر:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "استعمال:"
@@ -4396,25 +4915,25 @@ msgstr "CA _سند:"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4454,16 +4973,16 @@ msgstr "داخلی توثیق:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4500,15 +5019,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4522,24 +5041,24 @@ msgstr "_Passwort:"
 msgid "Sh_ow passphrase"
 msgstr "Passphrase anzeigen"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA _سند:"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4548,7 +5067,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "شناخت:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4588,15 +5107,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_توثیق:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_نجی کلید پاس ورڈ:"
@@ -4606,33 +5125,33 @@ msgstr "_نجی کلید پاس ورڈ:"
 msgid "_Type"
 msgstr "_نوعیت:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4667,335 +5186,17 @@ msgstr "کلید _دکھائیں"
 msgid "WEP inde_x"
 msgstr "WEP inde_x:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "CA _سند:"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "اپنی ذاتی سند منتخب کریں..."
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "نجی _کلید:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_نجی کلید پاس ورڈ:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "اپنی ذاتی سند منتخب کریں..."
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "_صارف سند:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "میرا ملک فہرست میں نہیں ہے"
-
-#~ msgid "Unlisted"
-#~ msgstr "غیر درج شدہ"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "میرا پلان درجِ فہرست نہیں ہے..."
-
-#~ msgid "Provider"
-#~ msgstr "فراہم کُنندہ"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "نصب شدہ GSM ڈیوائس"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "نصب شدہ CDMA ڈیوائس"
-
-#~ msgid "Any device"
-#~ msgstr "کوئی بھی ڈیوائس"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "نیا موبائل براڈ بینڈ اتصال"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "یہ مددگار سیلولر (3G) نیٹ ورک سے موبائل براڈ بینڈ اتصال مرتب کرنے میں آپ "
-#~ "کی مدد کرے گا."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "آپ کو ذیل کی معلومات درکار ہوں گی:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "آپ کے براڈ بینڈ فراہم کُنندہ کا نام"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "آپ کے فراہم کُنندہ کے بِلِنگ پلان کا نام"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(کچھ صورتوں میں) آپ کا براڈ بینڈ بِلِنگ پلان APN (Access Point Name)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "ا_س موبائل براڈ بینڈ ڈیوائس کے لیے اتصال بنائیں:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "موبائل براڈ بینڈ اتصال مرتب کریں"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "ممالک فہرست:"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "اپنے فراہم کُنندہ کا ملک منتخب کریں"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "اپنا فراہم کُنندہ _فہرست میں سے منتخب کریں:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr ""
-#~ "میں اپنا فراہم کُنندہ تلاش نہیں کر سکا چنانچہ میں اسے _دستی طور پر شامل "
-#~ "کرنا چاہتا ہوں:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr ""
-#~ "میرا فراہم کُنندہ GSM ٹیکنالوجی استعمال کرتا ہے (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "میرا فراہم کُنندہ CDMA ٹیکنالوجی استعمال کرتا ہے (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "اپنا فراہم کُنندہ منتخب کریں"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "اپنا پلان _منتخب کریں:"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "منتخب کردہ پلان _APN (Access Point Name):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "انتباہ: غلط پلان کے انتخاب سے آپ کے براڈ بینڈ اتصال سے بِلِنگ کے مسائل پیدا "
-#~ "ہوسکتے ہیں یا ممکنہ طور پر آپ کی متصلی بند کی جاسکتی ہے\n"
-#~ "\n"
-#~ "اگر آپ اپنے پلان کے حوالے سے تذبذب کا شکار ہیں تو اپنے فراہم کُنندہ سے "
-#~ "اپنے پلان کے APN کے لیے کہیں."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "اپنا بِلِنگ پلان منتخب کریں"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr ""
-#~ "آپ کا موبائل براڈ بینڈ اتصال مندرجہ ذیل ترتیبات کے ساتھ وضع کیا گیا ہے:"
-
-#~ msgid "Your Device:"
-#~ msgstr "آپ کی ڈیوائس:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "آپ کا فراہم کُنندہ:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "آپ کا پلان:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "اب آپ کی منتخب کردہ ترتیبات کو استعمال کرتے ہوئے آپ کے براڈ بینڈ فراہم "
-#~ "کُنندہ سے اتصال قائم کیا جائے گا. اگر تصال ناکام ہوجائے یا آپ نیٹ ورک "
-#~ "وسائل تک رسائی حاصل نہ کرسکیں تو اپنی ترتیبات دوبارہ چیک کریں. اپنے "
-#~ "موبائل براڈ بینڈ اتصال میں تبدیلی کے لیے نظام >> ترجیحات کی فہرست سے "
-#~ "\"نیٹ ورک اتصال\" منتخب کریں."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "موبائل براڈ بینڈ کی ترتیبات کی تصدیق کریں"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(کچھ نہیں)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "CA _سند:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "نامعلوم"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "فائل منتخب کریں"
-
-#, fuzzy
-#~ msgid "Cancel"
-#~ msgstr "gtk-cancel"
-
-#, fuzzy
-#~ msgid "Select from file…"
-#~ msgstr "فائل منتخب کریں"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "اپنی ذاتی سند منتخب کریں..."
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "_صارف سند:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Fehler beim Abrufen der VPN-Verbindung »%s«"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "نیٹ ورک '%s' سے اتصال قائم کرنے کے لیے پاس ورڈ درکار ہے."
-
-#, fuzzy
-#~ msgid "Sh_ow passwords"
-#~ msgstr "پاس ورڈ _دکھائیں"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "_پاس ورڈ:"
-
-#, fuzzy
-#~ msgid "_Secondary Password:"
-#~ msgstr "_پاس ورڈ:"
-
-#~ msgid "_Password:"
-#~ msgstr "_پاس ورڈ:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Verbindung konnte nicht verschoben werden"
-
-#, fuzzy
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "کچھ نہیں"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "حرکی WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_بنائیں"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr ""
-#~ "وائیرلیس نیٹ ورک '%s' تک رسائی کے لیے پاس ورڈ یا ترمیزی کلیدیں درکار ہیں."
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "وائیرلیس نیٹ ورک توثیق درکار"
-
-#, fuzzy
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "توثیق درکار از وائیرلیس نیٹ ورک"
-
-#, fuzzy
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "نیا وائیرلیس نیٹ ورک بنائیں"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "نیا وائیرلیس نیٹ ورک"
-
-#, fuzzy
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "نئے وائیرلیس نیٹ ورک کا نام لکھیں جو آپ بنانا چاہتے ہیں."
-
-#, fuzzy
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "پوشیدہ وائیرلیس نیٹ ورک سے اتصال قائم کریں"
-
-#, fuzzy
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "پوشیدہ وائیرلیس نیٹ ورک"
-
-#, fuzzy
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr ""
-#~ "اس پوشیدہ وائیرلیس نیٹ ورک کا نام اور سیکورٹی تفصیلات داخل کریں جس سے آپ "
-#~ "متصل ہونے چاہتے ہیں."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_وائیرلیس سیکورٹی:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "ا_تصال:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "وائیرلیس ا_ڈاپٹر:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr ""
-#~ "میں اپنا فراہم کُنندہ تلاش نہیں کر سکا چنانچہ میں اسے _دستی طور پر شامل "
-#~ "کرنا چاہتا ہوں:"
-
-#~ msgid "Provider:"
-#~ msgstr "فراہم کُنندہ:"
-
-#, fuzzy
-#~ msgid "Country or Region List:"
-#~ msgstr "ممالک فہرست:"
-
-#, fuzzy
-#~ msgid "Country or region"
-#~ msgstr "ممالک فہرست:"
-
-#~ msgid "Wired"
-#~ msgstr "وائیرڈ"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_وائیرلیس سیکورٹی:"
-
-#~ msgid "_Network name:"
-#~ msgstr "_نیٹ ورک کا نام:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "ا_تصال:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "وائیرلیس ا_ڈاپٹر:"
-
 #, fuzzy
 #~ msgid "%s (default)"
 #~ msgstr "طے شدہ"
diff --git a/po/vi.po b/po/vi.po
index 40fbf1bd..5f36278c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2014-11-28 15:54+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman gmail com>\n"
 "Language-Team: Vietnamese <gnome-vi-list gnome org>\n"
@@ -22,6 +22,7 @@ msgstr ""
 "X-Generator: Poedit 1.5.5\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "Mạng"
 
@@ -205,15 +206,19 @@ msgstr "Xác thực 802.1X"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "Kết nố_i"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "Tê_n mạng:"
@@ -565,7 +570,7 @@ msgstr "Di động băng thông rộng (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "Di động băng thông rộng"
 
@@ -687,7 +692,9 @@ msgstr "Xác thực DSL"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -792,6 +799,7 @@ msgid "Error displaying connection information:"
 msgstr "Gặp lỗi khi hiển thị thông tin kết nối:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -942,7 +950,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Mật khẩu:"
@@ -967,7 +975,8 @@ msgstr "Khẩu hiện VPN"
 msgid "Base Connection"
 msgstr "Kết nối cơ sở"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "Không rõ"
 
@@ -1739,6 +1748,7 @@ msgid "_Service"
 msgstr "_Dịch vụ:"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2396,6 +2406,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "Cho phép _chuyển vùng nếu mạng nhà không dùng được"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "_Hiện mật khẩu"
 
@@ -2801,13 +2812,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3131,12 +3143,12 @@ msgstr ""
 "thực. Nếu kết nối không thành công, thử tắt một vài cách."
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -3146,22 +3158,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "Bond"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "Team"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "Bridge"
 
@@ -3452,6 +3467,7 @@ msgid "Select a connection to delete"
 msgstr "Kết nối team %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Tên"
 
@@ -3674,6 +3690,8 @@ msgstr "Kết nối Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "Mặc định"
 
@@ -3903,35 +3921,35 @@ msgstr "Dùng công nghệ dựa trên _GSM (v.d. GPRS, EDGS, UTMS, HSDPA)"
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Dùng công nghệ dựa trên C_DMA (v.d. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4096,10 +4114,12 @@ msgstr "Kết nối Wi-Fi %d"
 
 # Name: don't translate / Tên: đừng dịch
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Khoá WEP 40/128-bit (Thập lục phân hoặc ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "Mật khẩu WEP 128-bit"
 
@@ -4108,15 +4128,18 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "WEP động (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Cá nhân"
 
 # Name: don't translate / Tên: đừng dịch
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Kinh doanh"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 Cá nhân"
@@ -4191,6 +4214,479 @@ msgstr "Thông tin kết nối"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/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/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/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/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "_Khoá riêng:"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "_Mật khẩu khoá riêng:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Chọn chứng nhận CA"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Chứng nhận người _dùng:"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "Không thấy có quốc gia của tôi"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "Không liệt kê"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Không thấy gói cước của tôi…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "Nhà cung cấp"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "Thiết bị GSM đã cài đặt"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "Thiết bị CDMA đã cài đặt"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "Bất kỳ thiết bị nào"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "Kết nối băng thông rộng di động mới"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Trợ lý này giúp bạn dễ dàng cài đặt một kết nối băng thông rộng di động vào "
+"một mạng (3G) di động."
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "Bạn sẽ cần những thông tin sau:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Tên nhà cung cấp"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "Tên gói cước"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(trong vài trường hợp) APN (Access Point Name) của gói cước"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Tạo kết nối đến thiết bị di động băng thông rộng _này:"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Thiết lập kết nối băng thông rộng di động"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "Quốc gia hoặc lãnh thổ"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Chọn quốc gia hoặc lãnh thổ của nhà cung cấp"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "Chọn nhà cung cấp từ _danh sách:"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Không tìm thấy nhà cung cấp, để tôi nhập _tay:"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Nhà cung cấp của tôi dùng công nghệ GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Nhà cung cấp của tôi dùng công nghệ CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "Chọn nhà cung cấp của bạn"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "_Chọn gói cước"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Access Point Name - Tên điểm truy cập) của _gói cước được chọn"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"Cảnh báo: Chọn một kế hoạch không đúng có thể dẫn đến các vấn đề thanh toán "
+"cho tài khoản băng thông rộng của bạn hoặc có thể ngăn chặn kết nối.\n"
+"\n"
+"Nếu bạn không chắc về kế hoạch của bạn hãy hỏi nhà cung cấp của bạn cho APN "
+"kế hoạch của bạn."
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "Chọn gói cước của bạn"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Kết nối di động băng thông rộng của bạn được cấu hình như sau:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "Thiết bị của bạn:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "Nhà cung cấp của bạn:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "Gói cước của bạn:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"Kết nối có bây giờ sẽ được thực hiện cho nhà cung cấp băng thông rộng di "
+"động của bạn bằng cách sử dụng các cài đặt đã chọn. Nếu kết nối không thành "
+"công hay bạn không thể truy cập tài nguyên mạng, kiểm tra các cài đặt của "
+"bạn. Để sửa đổi cài đặt kết nối băng thông rộng di động của bạn, chọn \"Kết "
+"nối mạng\" từ trình đơn Hệ Thống>Tuỳ Thích."
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Xác nhận thiết lập di động băng thông rộng"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(không)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "_Chứng nhận CA:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Không rõ"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Chọn chứng nhận CA"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Chứng nhận người _dùng:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Lỗi sửa kết nối"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Bỏ khoá"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "Chỉ lưu mật khẩu cho tài _khoản này"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "Lưu mật khẩu cho _tất cả các tài khoản"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "_Hỏi mật khẩu mỗi lần"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "Cần mật khẩu để kết nối “%s”."
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "_Hiện mật khẩu"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "Mật khẩu _phụ:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "Mật khẩu _phụ:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "_Mật khẩu:"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "Ngắt kết nối"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Không"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP động (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "_Tạo"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "Cần mật khẩu hoặc khoá mã hoá để truy cập mạng Wi-Fi “%s”."
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Cần xác thực mạng Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Cần xác thực mạng Wi-Fi"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "Tạo mạng Wi-Fi mới"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "Mạng Wi-Fi mới"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Nhập tên mạng Wi-Fi bạn muốn tạo."
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Kết nối đến mạng Wi-Fi ẩn"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "Mạng Wi-Fi ẩn"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "Nhập tên và chi tiết an ninh của mạng Wi-Fi ẩn bạn muốn kết nối."
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "_An ninh Wi-Fi:"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "_Kết nối:"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Bộ điều hợp Wi-Fi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Không tìm thấy nhà cung cấp, để tôi nhập _tay:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "Nhà cung cấp:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "Danh sách quốc gia hoặc lãnh thổ:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "Quốc gia hoặc lãnh thổ"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "Dây"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%2$s %1$s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_An ninh Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Tê_n mạng:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Kết nối:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Bộ điều hợp Wi-Fi:"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "Cách dùng:"
@@ -4341,26 +4837,26 @@ msgstr "Không có chứng nhận CA như _yêu cầu"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Chọn tập tin PAC…"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "Tập tin PAC (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "Mọi tập tin"
 
@@ -4399,16 +4895,16 @@ msgstr "Xác thực _trong:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Cho phép tự động dự liệ_u PAC"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4444,15 +4940,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4466,24 +4962,24 @@ msgstr "Mật khẩu WEP 128-bit"
 msgid "Sh_ow passphrase"
 msgstr "_Hiện mật khẩu"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, 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:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4492,7 +4988,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "Đị_nh danh:"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4532,15 +5028,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "_Xác thực:"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "_Mật khẩu khoá riêng:"
@@ -4550,33 +5046,33 @@ msgstr "_Mật khẩu khoá riêng:"
 msgid "_Type"
 msgstr "_Kiểu:"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4606,334 +5102,17 @@ msgstr "_Hiện khoá"
 msgid "WEP inde_x"
 msgstr "_Chỉ mục WEP:"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "Không có chứng nhận CA như _yêu cầu"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "Chọn chứng nhận CA"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "_Khoá riêng:"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "_Mật khẩu khoá riêng:"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "Chọn chứng nhận CA"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "Chứng nhận người _dùng:"
-
-#~ msgid "My country is not listed"
-#~ msgstr "Không thấy có quốc gia của tôi"
-
-#~ msgid "Unlisted"
-#~ msgstr "Không liệt kê"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "Không thấy gói cước của tôi…"
-
-#~ msgid "Provider"
-#~ msgstr "Nhà cung cấp"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "Thiết bị GSM đã cài đặt"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "Thiết bị CDMA đã cài đặt"
-
-#~ msgid "Any device"
-#~ msgstr "Bất kỳ thiết bị nào"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Kết nối băng thông rộng di động mới"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr ""
-#~ "Trợ lý này giúp bạn dễ dàng cài đặt một kết nối băng thông rộng di động "
-#~ "vào một mạng (3G) di động."
-
-#~ msgid "You will need the following information:"
-#~ msgstr "Bạn sẽ cần những thông tin sau:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "Tên nhà cung cấp"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "Tên gói cước"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(trong vài trường hợp) APN (Access Point Name) của gói cước"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "Tạo kết nối đến thiết bị di động băng thông rộng _này:"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "Thiết lập kết nối băng thông rộng di động"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "Quốc gia hoặc lãnh thổ"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "Chọn quốc gia hoặc lãnh thổ của nhà cung cấp"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "Chọn nhà cung cấp từ _danh sách:"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "Không tìm thấy nhà cung cấp, để tôi nhập _tay:"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "Nhà cung cấp của tôi dùng công nghệ GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "Nhà cung cấp của tôi dùng công nghệ CDMA (1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "Chọn nhà cung cấp của bạn"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "_Chọn gói cước"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr ""
-#~ "_APN (Access Point Name - Tên điểm truy cập) của _gói cước được chọn"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "Cảnh báo: Chọn một kế hoạch không đúng có thể dẫn đến các vấn đề thanh "
-#~ "toán cho tài khoản băng thông rộng của bạn hoặc có thể ngăn chặn kết "
-#~ "nối.\n"
-#~ "\n"
-#~ "Nếu bạn không chắc về kế hoạch của bạn hãy hỏi nhà cung cấp của bạn cho "
-#~ "APN kế hoạch của bạn."
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "Chọn gói cước của bạn"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "Kết nối di động băng thông rộng của bạn được cấu hình như sau:"
-
-#~ msgid "Your Device:"
-#~ msgstr "Thiết bị của bạn:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "Nhà cung cấp của bạn:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "Gói cước của bạn:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "Kết nối có bây giờ sẽ được thực hiện cho nhà cung cấp băng thông rộng di "
-#~ "động của bạn bằng cách sử dụng các cài đặt đã chọn. Nếu kết nối không "
-#~ "thành công hay bạn không thể truy cập tài nguyên mạng, kiểm tra các cài "
-#~ "đặt của bạn. Để sửa đổi cài đặt kết nối băng thông rộng di động của bạn, "
-#~ "chọn \"Kết nối mạng\" từ trình đơn Hệ Thống>Tuỳ Thích."
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "Xác nhận thiết lập di động băng thông rộng"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(không)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "_Chứng nhận CA:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "Không rõ"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "Chọn chứng nhận CA"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Chứng nhận người _dùng:"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "Lỗi sửa kết nối"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "_Bỏ khoá"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "Chỉ lưu mật khẩu cho tài _khoản này"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "Lưu mật khẩu cho _tất cả các tài khoản"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "_Hỏi mật khẩu mỗi lần"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "Cần mật khẩu để kết nối “%s”."
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "_Hiện mật khẩu"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "Mật khẩu _phụ:"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "Mật khẩu _phụ:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Mật khẩu:"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "Ngắt kết nối"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "Không"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "WEP động (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "_Tạo"
-
-#, 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”."
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Cần xác thực mạng Wi-Fi"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Cần xác thực mạng Wi-Fi"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "Tạo mạng Wi-Fi mới"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Mạng Wi-Fi mới"
-
-#~ 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."
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "Kết nối đến mạng Wi-Fi ẩn"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "Mạng Wi-Fi ẩn"
-
-#~ 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."
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "_An ninh Wi-Fi:"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "_Kết nối:"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "_Bộ điều hợp Wi-Fi:"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "Không tìm thấy nhà cung cấp, để tôi nhập _tay:"
-
-#~ msgid "Provider:"
-#~ msgstr "Nhà cung cấp:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "Danh sách quốc gia hoặc lãnh thổ:"
-
-#~ msgid "Country or region"
-#~ msgstr "Quốc gia hoặc lãnh thổ"
-
-#~ msgid "Wired"
-#~ msgstr "Dây"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%2$s %1$s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "_An ninh Wi-Fi:"
-
-#~ msgid "_Network name:"
-#~ msgstr "Tê_n mạng:"
-
-#~ msgid "C_onnection:"
-#~ msgstr "_Kết nối:"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "_Bộ điều hợp Wi-Fi:"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (mặc định)"
 
diff --git a/po/wa.po b/po/wa.po
index 58cb824a..93290bf4 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2004-09-09 10:41+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo walon org>\n"
 "Language-Team: Walloon <linux-wa walon org>\n"
@@ -19,6 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 #, fuzzy
 msgid "Network"
 msgstr "Rantoeles sins fyis"
@@ -201,15 +202,19 @@ msgstr ""
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr ""
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "Raloyaedjes rantoele"
@@ -533,7 +538,7 @@ msgstr ""
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr ""
 
@@ -657,7 +662,9 @@ msgstr ""
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr ""
 
@@ -764,6 +771,7 @@ msgid "Error displaying connection information:"
 msgstr ""
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr ""
@@ -909,7 +917,7 @@ msgstr ""
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "Sicret:"
@@ -935,7 +943,8 @@ msgstr ""
 msgid "Base Connection"
 msgstr "Raloyaedjes rantoele"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr ""
 
@@ -1652,6 +1661,7 @@ msgid "_Service"
 msgstr ""
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2258,6 +2268,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr ""
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr ""
 
@@ -2644,13 +2655,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr ""
 
@@ -2953,12 +2965,12 @@ msgid ""
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr ""
 
@@ -2968,22 +2980,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr ""
 
@@ -3269,6 +3284,7 @@ msgid "Select a connection to delete"
 msgstr "Raloyaedjes rantoele"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
@@ -3481,6 +3497,8 @@ msgstr ""
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr ""
 
@@ -3695,35 +3713,35 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr ""
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr ""
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr ""
 
@@ -3874,10 +3892,12 @@ msgid "Wi-Fi connection %d"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 #, fuzzy
 msgid "WEP 128-bit Passphrase"
 msgstr "Sicret:"
@@ -3887,14 +3907,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 msgid "WPA3 Personal"
 msgstr ""
 
@@ -3965,6 +3988,453 @@ msgstr ""
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Sicret:"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr ""
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+#, fuzzy
+msgid "New Mobile Broadband Connection"
+msgstr "Raloyaedjes rantoele"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr ""
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr ""
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Sicret:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "I gn a mezåjhe d' ene clé d' ecriptaedje pol rantoele sins fyis"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Rantoeles sins fyis"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Rantoeles sins fyis"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "Raloyaedjes rantoele"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Rantoeles sins fyis"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:129
+#, fuzzy
+msgid "_Network name:"
+msgstr "Raloyaedjes rantoele"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "Raloyaedjes rantoele"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Rantoeles sins fyis"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr ""
@@ -4111,25 +4581,25 @@ msgstr ""
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr ""
 
@@ -4165,16 +4635,16 @@ msgstr ""
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr ""
@@ -4209,15 +4679,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4230,23 +4700,23 @@ msgstr "Sicret:"
 msgid "Sh_ow passphrase"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4254,7 +4724,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr ""
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
@@ -4292,15 +4762,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "Sicret:"
@@ -4309,33 +4779,33 @@ msgstr "Sicret:"
 msgid "_Type"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4363,61 +4833,17 @@ msgstr ""
 msgid "WEP inde_x"
 msgstr ""
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "Sicret:"
-
-#, fuzzy
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "Raloyaedjes rantoele"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "Sicret:"
-
-#, fuzzy
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "I gn a mezåjhe d' ene clé d' ecriptaedje pol rantoele sins fyis"
-
-#, fuzzy
-#~ msgid "New Wi-Fi network"
-#~ msgstr "Rantoeles sins fyis"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Rantoeles sins fyis"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "Raloyaedjes rantoele"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Rantoeles sins fyis"
-
-#, fuzzy
-#~ msgid "_Network name:"
-#~ msgstr "Raloyaedjes rantoele"
-
-#, fuzzy
-#~ msgid "C_onnection:"
-#~ msgstr "Raloyaedjes rantoele"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Rantoeles sins fyis"
-
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4c6bf4a3..48559c8f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet 1.8.22\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\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"
@@ -32,6 +32,7 @@ msgstr ""
 "X-Generator: Zanata 4.6.2\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "网络"
 
@@ -208,15 +209,19 @@ msgstr "802.1X 认证"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "网络名称(_N)"
 
@@ -559,7 +564,7 @@ msgstr "移动宽带(%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "移动宽带"
 
@@ -681,7 +686,9 @@ msgstr "DSL 认证"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "确定(_O)"
 
@@ -784,6 +791,7 @@ msgid "Error displaying connection information:"
 msgstr "显示连接信息时出错:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -929,7 +937,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "热点"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 msgid "Password"
 msgstr "密码"
 
@@ -953,7 +961,8 @@ msgstr "VPN Banner"
 msgid "Base Connection"
 msgstr "基本连接"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "未知"
 
@@ -1688,6 +1697,7 @@ msgid "_Service"
 msgstr "服务(_S)"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2323,6 +2333,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "如果主网络不可用则允许漫游(_r)"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "显示密码(_w)"
 
@@ -2711,13 +2722,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "以太网"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3027,12 +3039,12 @@ msgstr ""
 "些方法的支持。"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "蓝牙"
 
@@ -3042,22 +3054,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "绑定"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "组队"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "桥接"
 
@@ -3329,6 +3344,7 @@ msgid "Select a connection to delete"
 msgstr "选择一个连接删除"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "名称"
 
@@ -3538,6 +3554,8 @@ msgstr "以太网连接 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "默认"
 
@@ -3757,35 +3775,35 @@ msgstr "我的提供商使用基于 _GSM 的技术(如 GPRS、EDGE、UMTS、HSDP
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "我的提供商使用基于 C_DMA 的技术(如 1xRTT、EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3941,10 +3959,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 连接 %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 位密钥(十六进制或 ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 位密码句"
 
@@ -3953,14 +3973,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "动态 WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 及 WPA2 个人"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 及 WPA2 企业"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA 及 WPA2 个人"
@@ -4034,6 +4057,452 @@ msgstr "连接信息"
 msgid "_Close"
 msgstr "关闭(_C)"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr "使用手机扫描或 <a href=\"nma:print\">打印</a>"
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+msgid "No certificate set"
+msgstr "无证书"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "无密钥"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "为 %s 证书选择一个密钥"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, c-format
+msgid "%s private _key"
+msgstr "%s 私钥(_k)"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, c-format
+msgid "%s key _password"
+msgstr "%s 密钥密码(_p)"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, c-format
+msgid "Choose %s Certificate"
+msgstr "选择 %s 证书"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, c-format
+msgid "%s _certificate"
+msgstr "%s 证书(_c)"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "我所在国家/地区没有被列出"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "未列出"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+msgid "My plan is not listed…"
+msgstr "我的套餐未被列出..."
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "提供商"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "已安装的 GSM 设备"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "已安装的 CDMA 设备"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "任何设备"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "新移动宽带连接"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr "此助手程序可帮助您简单地设置一个到蜂窝(3G)网络的移动宽带连接。"
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "您将需要以下信息:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+msgid "Your broadband provider’s name"
+msgstr "宽带提供商的名称"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "您的宽带付费套餐名称"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(在某些情况下)您的宽带付费套餐 APN (访问点名称)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "为此移动宽带设备创建一个连接(_T):"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "设置一个移动宽带连接"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+msgid "Country or region:"
+msgstr "国家或地区:"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+msgid "Choose your Provider’s Country or Region"
+msgstr "选择您的提供商的国家或地区"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "从列表中选择您的提供商(_L):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "找不到我的提供商,希望手动设置连接(_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "我的提供商使用 GSM 技术(GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "我的提供商使用 CDMA 技术(1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "选择您的提供商"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "选择您的套餐(_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "所选套餐的 _APN (访问点名称):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"警告:选择一个不正确的套餐可能导致宽带账户费用问题或无法连接。\n"
+"\n"
+"如果您不确定您的套餐,请询问您的提供商以获取套餐的 APN。"
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "选择您的付费套餐"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "您的移动宽带连接已按以下设定配置:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "您的设备:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "您的服务商:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "您的套餐:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"现将按照您所选择的设置建立一个到您的移动宽带提供商的连接。如果连接失败或无法"
+"访问网络资源,请检查您的设置。要修改您的移动宽带设置,在系统 >> 首选项菜单中"
+"选择“网络连接”。"
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "确认移动宽带设置"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(无)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "键入 %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, c-format
+msgid "Certificate in %s"
+msgstr "%s 中的证书"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(未知信息)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "选择"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "取消"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "从文件选择..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, c-format
+msgid "Choose a %s Certificate"
+msgstr "选择一个 %s 证书"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, c-format
+msgid "%s certificate _password"
+msgstr "%s 证书密码(_p)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "错误日志中: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+msgid "Error opening a session: "
+msgstr "打开一个会话出错:"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+msgid "_Unlock token"
+msgstr "解锁令牌(_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "由...发出"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "输入 %s PIN码"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "登录(_L)"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_Remember PIN"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+msgid "Store the password only for this user"
+msgstr "仅为该用户存储密码"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+msgid "Store the password for all users"
+msgstr "存储所有用户的密码"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "每次询问这个密码"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+msgid "The password is not required"
+msgstr "不需要密码"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "显示密码(_O)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Tertiary Password:"
+msgstr "三元密码(_T):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "次要密码(_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "密码(_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+msgid "Click to connect"
+msgstr "点击连接"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "新…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "无"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "动态 WEP (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "创建(_R)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "访问 Wi-Fi 网络 %s 需要密码或加密密钥。"
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "需要 Wi-Fi 网络认证"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi 网络要求认证"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "创建新的 Wi-Fi 网络"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "新建 Wi-Fi 网络"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "输入您要创建的 Wi-Fi 网络的名称。"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "连接到隐藏的 Wi-Fi 网络"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "隐藏的 Wi-Fi 网络"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "输入您要连接的隐藏的 Wi-Fi 网络的名称及安全性详细信息。"
+
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi 安全性(_s)"
+
+#: src/libnma/wifi.ui:154
+msgid "C_onnection"
+msgstr "连接(_o)"
+
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi 适配器(_a)"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "找不到我的提供商,希望手动输入(_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "提供商:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "国家或地区列表:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "国家或地区"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "有线"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"密码丢失或连接无效。如果连接无效,您首选需要用 nm-connection-editor 来编辑网"
+"络连接"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi 安全性(_S):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "网络名称(_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "连接(_O):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi 适配器(_A):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "用法:"
@@ -4180,25 +4649,25 @@ msgstr "没有选择 CA 证书"
 msgid "selected CA certificate file does not exist"
 msgstr "所选的CA证书文件不存在"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "缺少 EAP-FAST PAC 文件"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 msgid "Choose a PAC file"
 msgstr "选择一个 PAC 文件"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC 文件(*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "所有文件"
 
@@ -4234,16 +4703,16 @@ msgstr "内部认证(_I)"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允许自动 PAC 配置(_V)"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "缺少 EAP-LEAP 用户名"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "缺少 EAP-LEAP 密码"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4278,15 +4747,15 @@ msgstr "服务器证书名称的后缀。"
 msgid "_Domain"
 msgstr "域(_d)"
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "缺少 EAP 用户名"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "缺少 EAP 密码"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr "缺少 EAP 客户端私钥密码口令"
 
@@ -4298,23 +4767,23 @@ msgstr "私钥密码口令(_r)"
 msgid "Sh_ow passphrase"
 msgstr "显示密码(_o)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "缺少 EAP-TLS 身份"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 msgid "no user certificate selected"
 msgstr "没有选择用户证书"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "选择用户证书文件不存在"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "没有选择的关键"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "选择的关键文件不存在"
 
@@ -4322,7 +4791,7 @@ msgstr "选择的关键文件不存在"
 msgid "I_dentity"
 msgstr "身份(_d)"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (no EAP)"
 
@@ -4360,15 +4829,15 @@ msgstr "外部配置"
 msgid "Au_thentication"
 msgstr "认证(_t)"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "缺少 leap 用户名"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "缺少 leap 密码"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "缺少 EAP 密码"
@@ -4377,22 +4846,22 @@ msgstr "缺少 EAP 密码"
 msgid "_Type"
 msgstr "类型(_T)"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "缺少 wep-key"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4401,11 +4870,11 @@ msgstr ""
 "无效的 wep-key:错误的密钥长度%zu。密钥必须由长度 5/13 (ASCII) 或 10/26 (十六"
 "进制)组成"
 
-#: src/wireless-security/ws-wep-key.c:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "无效的 wep-key:密码必须非空"
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "无效的 wep-key:密码必须少于64个字符"
 
@@ -4433,7 +4902,7 @@ msgstr "显示密钥(_W)"
 msgid "WEP inde_x"
 msgstr "WEP 索引(_x)"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4441,341 +4910,10 @@ msgid ""
 msgstr ""
 "无效的 wpa-psk:无效的密钥长度 %zu。必须是 [8,63] 字节或 64 个十六进制数字"
 
-#: src/wireless-security/ws-wpa-psk.c:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "无效的 wpa-psk:不能用 64 个字节作为十六进制解释密钥"
 
-#~ msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
-#~ msgstr "使用手机扫描或 <a href=\"nma:print\">打印</a>"
-
-#~ msgid "No certificate set"
-#~ msgstr "无证书"
-
-#~ msgid "No key set"
-#~ msgstr "无密钥"
-
-#, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "为 %s 证书选择一个密钥"
-
-#, c-format
-#~ msgid "%s private _key"
-#~ msgstr "%s 私钥(_k)"
-
-#, c-format
-#~ msgid "%s key _password"
-#~ msgstr "%s 密钥密码(_p)"
-
-#, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "选择 %s 证书"
-
-#, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "%s 证书(_c)"
-
-#~ msgid "My country is not listed"
-#~ msgstr "我所在国家/地区没有被列出"
-
-#~ msgid "Unlisted"
-#~ msgstr "未列出"
-
-#~ msgid "My plan is not listed…"
-#~ msgstr "我的套餐未被列出..."
-
-#~ msgid "Provider"
-#~ msgstr "提供商"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "已安装的 GSM 设备"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "已安装的 CDMA 设备"
-
-#~ msgid "Any device"
-#~ msgstr "任何设备"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "新移动宽带连接"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr "此助手程序可帮助您简单地设置一个到蜂窝(3G)网络的移动宽带连接。"
-
-#~ msgid "You will need the following information:"
-#~ msgstr "您将需要以下信息:"
-
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "宽带提供商的名称"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "您的宽带付费套餐名称"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(在某些情况下)您的宽带付费套餐 APN (访问点名称)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "为此移动宽带设备创建一个连接(_T):"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "设置一个移动宽带连接"
-
-#~ msgid "Country or region:"
-#~ msgstr "国家或地区:"
-
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "选择您的提供商的国家或地区"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "从列表中选择您的提供商(_L):"
-
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "找不到我的提供商,希望手动设置连接(_m):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "我的提供商使用 GSM 技术(GPRS, EDGE, UMTS, HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "我的提供商使用 CDMA 技术(1xRTT, EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "选择您的提供商"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "选择您的套餐(_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "所选套餐的 _APN (访问点名称):"
-
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "警告:选择一个不正确的套餐可能导致宽带账户费用问题或无法连接。\n"
-#~ "\n"
-#~ "如果您不确定您的套餐,请询问您的提供商以获取套餐的 APN。"
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "选择您的付费套餐"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "您的移动宽带连接已按以下设定配置:"
-
-#~ msgid "Your Device:"
-#~ msgstr "您的设备:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "您的服务商:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "您的套餐:"
-
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "现将按照您所选择的设置建立一个到您的移动宽带提供商的连接。如果连接失败或无"
-#~ "法访问网络资源,请检查您的设置。要修改您的移动宽带设置,在系统 >> 首选项菜"
-#~ "单中选择“网络连接”。"
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "确认移动宽带设置"
-
-#~ msgid "(None)"
-#~ msgstr "(无)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "键入 %s"
-
-#, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "%s 中的证书"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(未知信息)"
-
-#~ msgid "Select"
-#~ msgstr "选择"
-
-#~ msgid "Cancel"
-#~ msgstr "取消"
-
-#~ msgid "Select from file…"
-#~ msgstr "从文件选择..."
-
-#, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "选择一个 %s 证书"
-
-#, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "%s 证书密码(_p)"
-
-#~ msgid "Error logging in: "
-#~ msgstr "错误日志中: "
-
-#~ msgid "Error opening a session: "
-#~ msgstr "打开一个会话出错:"
-
-#~ msgid "_Unlock token"
-#~ msgstr "解锁令牌(_U)"
-
-#~ msgid "Issued By"
-#~ msgstr "由...发出"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "输入 %s PIN码"
-
-#~ msgid "_Login"
-#~ msgstr "登录(_L)"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_Remember PIN"
-
-#~ msgid "Store the password only for this user"
-#~ msgstr "仅为该用户存储密码"
-
-#~ msgid "Store the password for all users"
-#~ msgstr "存储所有用户的密码"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "每次询问这个密码"
-
-#~ msgid "The password is not required"
-#~ msgstr "不需要密码"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "显示密码(_O)"
-
-#~ msgid "_Tertiary Password:"
-#~ msgstr "三元密码(_T):"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "次要密码(_S):"
-
-#~ msgid "_Password:"
-#~ msgstr "密码(_P):"
-
-#~ msgid "Click to connect"
-#~ msgstr "点击连接"
-
-#~ msgid "New…"
-#~ msgstr "新…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "无"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "动态 WEP (802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "创建(_R)"
-
-#, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr "访问 Wi-Fi 网络 %s 需要密码或加密密钥。"
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "需要 Wi-Fi 网络认证"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Wi-Fi 网络要求认证"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "创建新的 Wi-Fi 网络"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "新建 Wi-Fi 网络"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "输入您要创建的 Wi-Fi 网络的名称。"
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "连接到隐藏的 Wi-Fi 网络"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "隐藏的 Wi-Fi 网络"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr "输入您要连接的隐藏的 Wi-Fi 网络的名称及安全性详细信息。"
-
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wi-Fi 安全性(_s)"
-
-#~ msgid "C_onnection"
-#~ msgstr "连接(_o)"
-
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-Fi 适配器(_a)"
-
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "找不到我的提供商,希望手动输入(_m):"
-
-#~ msgid "Provider:"
-#~ msgstr "提供商:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "国家或地区列表:"
-
-#~ msgid "Country or region"
-#~ msgstr "国家或地区"
-
-#~ msgid "Wired"
-#~ msgstr "有线"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "密码丢失或连接无效。如果连接无效,您首选需要用 nm-connection-editor 来编辑"
-#~ "网络连接"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wi-Fi 安全性(_S):"
-
-#~ msgid "_Network name:"
-#~ msgstr "网络名称(_N):"
-
-#~ msgid "C_onnection:"
-#~ msgstr "连接(_O):"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-Fi 适配器(_A):"
-
 #~ msgid "CKN"
 #~ msgstr "CKN"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index ca04edbf..28ce450c 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: network-manager-applet 0.9.8\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2014-08-30 18:45+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
@@ -26,6 +26,7 @@ msgstr ""
 "X-Generator: Poedit 1.6.5\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "網絡"
 
@@ -207,15 +208,19 @@ msgstr "802.1X 驗證"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr ""
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "網絡名稱(_N):"
@@ -565,7 +570,7 @@ msgstr "流動寬頻 (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "流動寬頻"
 
@@ -687,7 +692,9 @@ msgstr "DSL 驗證"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "確定(_O)"
 
@@ -792,6 +799,7 @@ msgid "Error displaying connection information:"
 msgstr "顯示連線資訊發生錯誤:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -942,7 +950,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr ""
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "密碼:"
@@ -967,7 +975,8 @@ msgstr "VPN 旗幟"
 msgid "Base Connection"
 msgstr "基礎連線"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "不明"
 
@@ -1727,6 +1736,7 @@ msgid "_Service"
 msgstr "服務(_S):"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2381,6 +2391,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "如果家用網絡無法使用,允許使用漫遊(_R)"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "顯示密碼(_W)"
 
@@ -2785,13 +2796,14 @@ msgstr ""
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "有線網絡"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3115,12 +3127,12 @@ msgstr ""
 "嘗試停用某些方法的支援。"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "藍牙"
 
@@ -3130,22 +3142,25 @@ msgid "DSL/PPPoE"
 msgstr ""
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "繫結"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "隊伍"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "橋接"
 
@@ -3432,6 +3447,7 @@ msgid "Select a connection to delete"
 msgstr "隊伍連線 %d"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "名稱"
 
@@ -3655,6 +3671,8 @@ msgstr "線網絡連線 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "預設"
 
@@ -3879,35 +3897,35 @@ msgstr "我的供應商使用 _GSM 為主的技術(例如 GPRS、EDGE、UMTS
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "我的供應商使用 C_DMA 為主的技術(例如 1xRTT、EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4071,10 +4089,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 連線 %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-位元 密碼匙 (Hex 或 ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-位元 密語"
 
@@ -4083,14 +4103,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "動態 WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 個人版"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 企業版"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 個人版"
@@ -4165,6 +4188,473 @@ msgstr "連線資訊"
 msgid "_Close"
 msgstr ""
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "不需要 CA 證書(_R)"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "選擇 CA 憑證"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "私密密碼匙(_K):"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "私密密碼匙密碼(_P):"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "選擇 CA 憑證"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "使用者證書(_U):"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "我的國家並沒有列出來"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "未列出的"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "我的計劃沒有列出…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "供應商"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "已安裝的 GSM 裝置"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "已安裝的 CDMA 裝置"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "任何裝置"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "新的流動寬頻連線"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr "這能幫助你輕易地設定流動寬頻連線,連至手機 (3G) 網絡。"
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "你需要以下資訊:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "寬頻供應商的名稱"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "寬頻計費計劃的名稱"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(在有些情況下)你的寬頻計費計劃的 APN(存取點名稱)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "為這個流動寬頻裝置建立連線(_T)"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "設定流動寬頻連線"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "國家或地區"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "選擇你的供應商的國家或地區"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "請從清單裏選擇供應商(_L):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "我找不到我的供應商,我想要手動輸入(_M):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "我的供應商使用 GSM 技術(GPRS、EDGE、UMTS、HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "我的供應商使用 CDMA 技術(1xRTT、EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "選擇你的供應商"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "選擇你的計劃(_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "選擇計劃的 _APN(Access Point Name,存取點名稱):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"警告:選擇不正確的計劃可能會引起寬頻帳號的收費爭議,或讓你無法連線。\n"
+"\n"
+"如果你不確定所使用的計劃,請洽詢供應商,以得知計劃的 APN 為何。"
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "選擇你的計費計劃"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "行動寬連線已經配置了以下設定:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "你的裝置:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "你的供應商:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "你的計劃:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"現在,根據你所選取的設定,電腦將連上你的流動寬頻供應商。如果連線失敗,或是你"
+"無法存取網絡資源,請檢查設定。要修改流動寬頻連線的設定,請從「系統」 >> 「偏"
+"好設定」中,選擇「網絡連線」。"
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "確認流動寬頻設定"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+#, fuzzy
+msgid "(None)"
+msgstr "(無)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A 證書:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+#, fuzzy
+msgid "(Unknown)"
+msgstr "不明"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr ""
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "選擇 CA 憑證"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "使用者證書(_U):"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr ""
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "編輯連線時發生錯誤"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "解鎖(_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "只儲存這個使用者的密碼(_U)"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "儲存所有使用者的密碼(_A)"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "每次都詢問密碼(_K)"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "連線至「%s」需要密碼。"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "顯示密碼(_O)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "第二密碼(_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "第二密碼(_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "密碼(_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "斷線"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "沒有"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "動態 WEP (802.1X)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "建立(_R)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "需要密碼或是加密密碼匙來存取 Wi-Fi 網絡「%s」。"
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi 網絡連線需要驗證"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi 網絡連線需要驗證"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "建立新的 Wi-Fi 網絡"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "新的 Wi-Fi 網絡"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "輸入你要建立的 Wi-Fi 網絡的名稱。"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "連接到隱藏的 Wi-Fi 網絡"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "隱藏的 Wi-Fi 網絡"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "輸入你要連接的隱藏 Wi-Fi 網絡的名稱與安全性詳細資料。"
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi 安全性(_S):"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "連線(_N):"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi 介面卡(_A):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "我找不到我的供應商,我想要手動輸入(_M):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "供應商:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "國家或地區清單:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "國家或地區"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "有線"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi 安全性(_S):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "網絡名稱(_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "連線(_N):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi 介面卡(_A):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "用法:"
@@ -4313,26 +4803,26 @@ msgstr "不需要 CA 證書(_R)"
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "選擇一個 PAC 檔案…"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "所有檔案"
 
@@ -4371,16 +4861,16 @@ msgstr "內部驗證(_I):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允許自動供應 PAC (_V)"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4416,15 +4906,15 @@ msgstr ""
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4438,24 +4928,24 @@ msgstr "WEP 128-位元 密語"
 msgid "Sh_ow passphrase"
 msgstr "顯示密碼(_O)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "不需要 CA 證書(_R)"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr ""
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr ""
 
@@ -4464,7 +4954,7 @@ msgstr ""
 msgid "I_dentity"
 msgstr "識別(_D):"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4504,15 +4994,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "驗證(_E):"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr ""
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "私密密碼匙密碼(_P):"
@@ -4522,33 +5012,33 @@ msgstr "私密密碼匙密碼(_P):"
 msgid "_Type"
 msgstr "類型(_T):"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, 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:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
@@ -4578,326 +5068,17 @@ msgstr "顯示密碼匙(_W)"
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X):"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, 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:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "不需要 CA 證書(_R)"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "選擇 CA 憑證"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "私密密碼匙(_K):"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "私密密碼匙密碼(_P):"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "選擇 CA 憑證"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "使用者證書(_U):"
-
-#~ msgid "My country is not listed"
-#~ msgstr "我的國家並沒有列出來"
-
-#~ msgid "Unlisted"
-#~ msgstr "未列出的"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "我的計劃沒有列出…"
-
-#~ msgid "Provider"
-#~ msgstr "供應商"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "已安裝的 GSM 裝置"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "已安裝的 CDMA 裝置"
-
-#~ msgid "Any device"
-#~ msgstr "任何裝置"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "新的流動寬頻連線"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr "這能幫助你輕易地設定流動寬頻連線,連至手機 (3G) 網絡。"
-
-#~ msgid "You will need the following information:"
-#~ msgstr "你需要以下資訊:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "寬頻供應商的名稱"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "寬頻計費計劃的名稱"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(在有些情況下)你的寬頻計費計劃的 APN(存取點名稱)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "為這個流動寬頻裝置建立連線(_T)"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "設定流動寬頻連線"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "國家或地區"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "選擇你的供應商的國家或地區"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "請從清單裏選擇供應商(_L):"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "我找不到我的供應商,我想要手動輸入(_M):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "我的供應商使用 GSM 技術(GPRS、EDGE、UMTS、HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "我的供應商使用 CDMA 技術(1xRTT、EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "選擇你的供應商"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "選擇你的計劃(_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "選擇計劃的 _APN(Access Point Name,存取點名稱):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "警告:選擇不正確的計劃可能會引起寬頻帳號的收費爭議,或讓你無法連線。\n"
-#~ "\n"
-#~ "如果你不確定所使用的計劃,請洽詢供應商,以得知計劃的 APN 為何。"
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "選擇你的計費計劃"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "行動寬連線已經配置了以下設定:"
-
-#~ msgid "Your Device:"
-#~ msgstr "你的裝置:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "你的供應商:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "你的計劃:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "現在,根據你所選取的設定,電腦將連上你的流動寬頻供應商。如果連線失敗,或是"
-#~ "你無法存取網絡資源,請檢查設定。要修改流動寬頻連線的設定,請從「系統」 >> "
-#~ "「偏好設定」中,選擇「網絡連線」。"
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "確認流動寬頻設定"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "(無)"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "C_A 證書:"
-
-#, fuzzy
-#~ msgid "(Unknown)"
-#~ msgstr "不明"
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "選擇 CA 憑證"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "使用者證書(_U):"
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "編輯連線時發生錯誤"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "解鎖(_U)"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "只儲存這個使用者的密碼(_U)"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "儲存所有使用者的密碼(_A)"
-
-#, fuzzy
-#~ msgid "Ask for this password every time"
-#~ msgstr "每次都詢問密碼(_K)"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "連線至「%s」需要密碼。"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "顯示密碼(_O)"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "第二密碼(_S):"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "第二密碼(_S):"
-
-#~ msgid "_Password:"
-#~ msgstr "密碼(_P):"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "斷線"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "沒有"
-
-#, fuzzy
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "動態 WEP (802.1X)"
-
-#~ msgid "C_reate"
-#~ msgstr "建立(_R)"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr "需要密碼或是加密密碼匙來存取 Wi-Fi 網絡「%s」。"
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wi-Fi 網絡連線需要驗證"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Wi-Fi 網絡連線需要驗證"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "建立新的 Wi-Fi 網絡"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "新的 Wi-Fi 網絡"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "輸入你要建立的 Wi-Fi 網絡的名稱。"
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "連接到隱藏的 Wi-Fi 網絡"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "隱藏的 Wi-Fi 網絡"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr "輸入你要連接的隱藏 Wi-Fi 網絡的名稱與安全性詳細資料。"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wi-Fi 安全性(_S):"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "連線(_N):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-Fi 介面卡(_A):"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "我找不到我的供應商,我想要手動輸入(_M):"
-
-#~ msgid "Provider:"
-#~ msgstr "供應商:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "國家或地區清單:"
-
-#~ msgid "Country or region"
-#~ msgstr "國家或地區"
-
-#~ msgid "Wired"
-#~ msgstr "有線"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wi-Fi 安全性(_S):"
-
-#~ msgid "_Network name:"
-#~ msgstr "網絡名稱(_N):"
-
-#~ msgid "C_onnection:"
-#~ msgstr "連線(_N):"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-Fi 介面卡(_A):"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (預設值)"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 86826648..83c85470 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-";
 "applet/\n"
-"POT-Creation-Date: 2019-10-14 10:58+0200\n"
+"POT-Creation-Date: 2019-10-09 15:43+0200\n"
 "PO-Revision-Date: 2017-11-07 06:45+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata zanata org>\n"
 "Language-Team: Traditional Chinese <zh-l10n lists linux org tw>\n"
@@ -26,6 +26,7 @@ msgstr ""
 "X-Generator: Zanata 4.3.2\n"
 
 #: nm-applet.desktop.in:3 src/applet.c:3182 src/applet-dialogs.c:725
+#: src/libnma/nma-bar-code-widget.c:140
 msgid "Network"
 msgstr "網路"
 
@@ -209,15 +210,19 @@ msgstr "802.1X 驗證"
 #: src/connection-editor/page-proxy.c:107 src/connection-editor/page-team.c:330
 #: src/connection-editor/page-team-port.c:192
 #: src/connection-editor/vpn-helpers.c:198 src/gsm-unlock.ui:28
-#: src/mobile-helpers.c:451
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1115
+#: src/libnm-gtk/nm-vpn-password-dialog.c:204
+#: src/libnm-gtk/nm-wifi-dialog.c:1053 src/mobile-helpers.c:451
 msgid "_Cancel"
 msgstr "取消 (_C)"
 
-#: src/8021x.ui:46
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1121
+#: src/libnm-gtk/nm-wifi-dialog.c:1059
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: src/8021x.ui:122
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "網路名稱(_N):"
@@ -567,7 +572,7 @@ msgstr "行動寬頻 (%s)"
 
 #: src/applet-device-broadband.c:727
 #: src/connection-editor/connection-helpers.c:94
-#: src/connection-editor/page-mobile.c:291
+#: src/connection-editor/page-mobile.c:291 src/libnm-gtk/nm-ui-utils.c:315
 msgid "Mobile Broadband"
 msgstr "行動寬頻"
 
@@ -689,7 +694,9 @@ msgstr "DSL 驗證"
 #: src/connection-editor/ce-page-dcb.ui:1033
 #: src/connection-editor/ce-ppp-auth-methods.ui:42
 #: src/connection-editor/page-bluetooth.c:295
-#: src/connection-editor/page-mobile.c:528 src/mobile-helpers.c:452
+#: src/connection-editor/page-mobile.c:528
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:205 src/mobile-helpers.c:452
 msgid "_OK"
 msgstr "確定(_O)"
 
@@ -794,6 +801,7 @@ msgid "Error displaying connection information:"
 msgstr "顯示連線資訊發生錯誤:"
 
 #: src/applet-dialogs.c:60 src/connection-editor/page-wifi-security.c:369
+#: src/libnma/nma-wifi-dialog.c:966 src/libnm-gtk/nm-wifi-dialog.c:934
 #: src/wireless-security/wireless-security.c:435
 msgid "LEAP"
 msgstr "LEAP"
@@ -943,7 +951,7 @@ msgstr "IPv6"
 msgid "Hotspot"
 msgstr "熱點"
 
-#: src/applet-dialogs.c:736
+#: src/applet-dialogs.c:736 src/libnma/nma-bar-code-widget.c:157
 #, fuzzy
 msgid "Password"
 msgstr "密碼:"
@@ -968,7 +976,8 @@ msgstr "VPN 旗幟"
 msgid "Base Connection"
 msgstr "基礎連線"
 
-#: src/applet-dialogs.c:884 src/wireless-security/wireless-security.c:495
+#: src/applet-dialogs.c:884 src/libnm-gtk/nm-ui-utils.c:329
+#: src/wireless-security/wireless-security.c:495
 msgid "Unknown"
 msgstr "不明"
 
@@ -1741,6 +1750,7 @@ msgid "_Service"
 msgstr "服務(_S):"
 
 #: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/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
@@ -2403,6 +2413,7 @@ msgid "Allow _roaming if home network is not available"
 msgstr "如果家用網路無法使用,允許使用漫遊(_R)"
 
 #: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:441
 msgid "Sho_w passwords"
 msgstr "顯示密碼(_W)"
 
@@ -2811,13 +2822,14 @@ msgstr "LACP"
 
 #: src/connection-editor/ce-page-team.ui:485
 #: src/connection-editor/connection-helpers.c:91
-#: src/connection-editor/page-ethernet.c:334
+#: src/connection-editor/page-ethernet.c:334 src/libnm-gtk/nm-ui-utils.c:307
 msgid "Ethernet"
 msgstr "有線網路"
 
 #: src/connection-editor/ce-page-team.ui:489
 #: src/connection-editor/connection-helpers.c:106
-#: src/connection-editor/page-vlan.c:575
+#: src/connection-editor/page-vlan.c:575 src/libnm-gtk/nm-ui-utils.c:325
+#: src/libnm-gtk/nm-ui-utils.c:569
 msgid "VLAN"
 msgstr "VLAN"
 
@@ -3145,12 +3157,12 @@ msgstr ""
 "嘗試停用某些方法的支援。"
 
 #: src/connection-editor/connection-helpers.c:92
-#: src/connection-editor/page-wifi.c:423
+#: src/connection-editor/page-wifi.c:423 src/libnm-gtk/nm-ui-utils.c:309
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
 #: src/connection-editor/connection-helpers.c:100
-#: src/connection-editor/page-bluetooth.c:106
+#: src/connection-editor/page-bluetooth.c:106 src/libnm-gtk/nm-ui-utils.c:311
 msgid "Bluetooth"
 msgstr "藍牙"
 
@@ -3160,22 +3172,25 @@ msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
 #: src/connection-editor/connection-helpers.c:102
-#: src/connection-editor/page-infiniband.c:131
+#: src/connection-editor/page-infiniband.c:131 src/libnm-gtk/nm-ui-utils.c:317
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
 #: src/connection-editor/connection-helpers.c:103
-#: src/connection-editor/page-bond.c:429
+#: src/connection-editor/page-bond.c:429 src/libnm-gtk/nm-ui-utils.c:319
+#: src/libnm-gtk/nm-ui-utils.c:563
 msgid "Bond"
 msgstr "繫結"
 
 #: src/connection-editor/connection-helpers.c:104
-#: src/connection-editor/page-team.c:1014
+#: src/connection-editor/page-team.c:1014 src/libnm-gtk/nm-ui-utils.c:321
+#: src/libnm-gtk/nm-ui-utils.c:565
 msgid "Team"
 msgstr "團隊"
 
 #: src/connection-editor/connection-helpers.c:105
-#: src/connection-editor/page-bridge.c:216
+#: src/connection-editor/page-bridge.c:216 src/libnm-gtk/nm-ui-utils.c:323
+#: src/libnm-gtk/nm-ui-utils.c:567
 msgid "Bridge"
 msgstr "橋接"
 
@@ -3459,6 +3474,7 @@ msgid "Select a connection to delete"
 msgstr "選擇要刪除的連接"
 
 #: src/connection-editor/nm-connection-list.c:785
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "名稱"
 
@@ -3679,6 +3695,8 @@ msgstr "線網路連線 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: src/connection-editor/page-general.c:41
+#: src/libnma/nma-mobile-providers.c:787
+#: src/libnm-gtk/nm-mobile-providers.c:786
 msgid "Default"
 msgstr "預設"
 
@@ -3902,35 +3920,35 @@ msgstr "我的供應商使用 _GSM 為主的技術(例如 GPRS、EDGE、UMTS
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "我的供應商使用 C_DMA 為主的技術(例如 1xRTT、EVDO)"
 
-#: src/connection-editor/page-mobile.c:572 src/mb-menu-item.c:36
-#: src/mobile-helpers.c:268
+#: src/connection-editor/page-mobile.c:572 src/libnma/nma-mobile-wizard.c:142
+#: src/mb-menu-item.c:36 src/mobile-helpers.c:268
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:575 src/mb-menu-item.c:40
-#: src/mobile-helpers.c:266
+#: src/connection-editor/page-mobile.c:575 src/libnma/nma-mobile-wizard.c:139
+#: src/mb-menu-item.c:40 src/mobile-helpers.c:266
 msgid "GSM"
 msgstr "GSM"
 
 #: src/connection-editor/page-ppp.c:116
-#: src/wireless-security/eap-method-ttls.c:274
+#: src/wireless-security/eap-method-ttls.c:275
 msgid "PAP"
 msgstr "PAP"
 
 #: src/connection-editor/page-ppp.c:117
-#: src/wireless-security/eap-method-ttls.c:340
+#: src/wireless-security/eap-method-ttls.c:341
 msgid "CHAP"
 msgstr "CHAP"
 
 #: src/connection-editor/page-ppp.c:118
-#: src/wireless-security/eap-method-fast.c:271
-#: src/wireless-security/eap-method-peap.c:286
-#: src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-fast.c:272
+#: src/wireless-security/eap-method-peap.c:287
+#: src/wireless-security/eap-method-ttls.c:307
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: src/connection-editor/page-ppp.c:119
-#: src/wireless-security/eap-method-ttls.c:290
+#: src/wireless-security/eap-method-ttls.c:291
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -4094,10 +4112,12 @@ msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 連線 %d"
 
 #: src/connection-editor/page-wifi-security.c:346
+#: src/libnma/nma-wifi-dialog.c:940 src/libnm-gtk/nm-wifi-dialog.c:908
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-位元 金鑰 (Hex 或 ASCII)"
 
 #: src/connection-editor/page-wifi-security.c:356
+#: src/libnma/nma-wifi-dialog.c:949 src/libnm-gtk/nm-wifi-dialog.c:917
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-位元 密語"
 
@@ -4106,14 +4126,17 @@ msgid "Dynamic WEP (802.1X)"
 msgstr "動態 WEP (802.1X)"
 
 #: src/connection-editor/page-wifi-security.c:395
+#: src/libnma/nma-wifi-dialog.c:993 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 個人版"
 
 #: src/connection-editor/page-wifi-security.c:408
+#: src/libnma/nma-wifi-dialog.c:1011 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 企業版"
 
 #: src/connection-editor/page-wifi-security.c:421
+#: src/libnma/nma-wifi-dialog.c:1024
 #, fuzzy
 msgid "WPA3 Personal"
 msgstr "WPA & WPA2 個人版"
@@ -4189,6 +4212,471 @@ msgstr "連線資訊"
 msgid "_Close"
 msgstr "關閉(_C)"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:101
+#: src/libnma/nma-pkcs11-cert-chooser.c:139
+#, fuzzy
+msgid "No certificate set"
+msgstr "不需要 CA 憑證(_R)"
+
+#: src/libnma/nma-file-cert-chooser.c:119
+#: src/libnma/nma-pkcs11-cert-chooser.c:163
+msgid "No key set"
+msgstr "沒有按鍵設置"
+
+#: src/libnma/nma-file-cert-chooser.c:239
+#: src/libnma/nma-pkcs11-cert-chooser.c:369
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "選擇 CA 憑證"
+
+#: src/libnma/nma-file-cert-chooser.c:243
+#: src/libnma/nma-pkcs11-cert-chooser.c:373
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "私密金鑰(_K):"
+
+#: src/libnma/nma-file-cert-chooser.c:247
+#: src/libnma/nma-pkcs11-cert-chooser.c:377
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "私密金鑰密碼(_P):"
+
+#: src/libnma/nma-file-cert-chooser.c:251
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "選擇 CA 憑證"
+
+#: src/libnma/nma-file-cert-chooser.c:255
+#: src/libnma/nma-pkcs11-cert-chooser.c:385
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "使用者憑證(_U):"
+
+#: src/libnma/nma-mobile-providers.c:976 src/libnm-gtk/nm-mobile-wizard.c:1063
+msgid "My country is not listed"
+msgstr "我的國家並沒有列出來"
+
+#: src/libnma/nma-mobile-wizard.c:247 src/libnma/nma-mobile-wizard.c:279
+#: src/libnm-gtk/nm-mobile-wizard.c:312
+msgid "Unlisted"
+msgstr "未列出的"
+
+#: src/libnma/nma-mobile-wizard.c:479 src/libnm-gtk/nm-mobile-wizard.c:544
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "我的方案沒有列出…"
+
+#: src/libnma/nma-mobile-wizard.c:651 src/libnm-gtk/nm-mobile-wizard.c:710
+msgid "Provider"
+msgstr "供應商"
+
+#: src/libnma/nma-mobile-wizard.c:1023 src/libnm-gtk/nm-mobile-wizard.c:1170
+msgid "Installed GSM device"
+msgstr "已安裝的 GSM 裝置"
+
+#: src/libnma/nma-mobile-wizard.c:1026 src/libnm-gtk/nm-mobile-wizard.c:1173
+msgid "Installed CDMA device"
+msgstr "已安裝的 CDMA 裝置"
+
+#: src/libnma/nma-mobile-wizard.c:1231 src/libnm-gtk/nm-mobile-wizard.c:1414
+msgid "Any device"
+msgstr "任何裝置"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1600
+msgid "New Mobile Broadband Connection"
+msgstr "新的行動寬頻連線"
+
+#: src/libnma/nma-mobile-wizard.ui:71 src/libnm-gtk/nm-mobile-wizard.c:1341
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr "這能幫助您輕易地設定行動寬頻連線,連至手機 (3G) 網路。"
+
+#: src/libnma/nma-mobile-wizard.ui:86 src/libnm-gtk/nm-mobile-wizard.c:1347
+msgid "You will need the following information:"
+msgstr "您需要以下資訊:"
+
+#: src/libnma/nma-mobile-wizard.ui:101 src/libnm-gtk/nm-mobile-wizard.c:1358
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "寬頻供應商的名稱"
+
+#: src/libnma/nma-mobile-wizard.ui:115 src/libnm-gtk/nm-mobile-wizard.c:1364
+msgid "Your broadband billing plan name"
+msgstr "寬頻計費方案的名稱"
+
+#: src/libnma/nma-mobile-wizard.ui:129 src/libnm-gtk/nm-mobile-wizard.c:1370
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(在有些情況下)您的寬頻計費方案的 APN(存取點名稱)"
+
+#: src/libnma/nma-mobile-wizard.ui:143 src/libnm-gtk/nm-mobile-wizard.c:1399
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "為這個行動寬頻裝置建立連線(_T)"
+
+#: src/libnma/nma-mobile-wizard.ui:170 src/libnm-gtk/nm-mobile-wizard.c:1427
+msgid "Set up a Mobile Broadband Connection"
+msgstr "設定行動寬頻連線"
+
+#: src/libnma/nma-mobile-wizard.ui:188
+#, fuzzy
+msgid "Country or region:"
+msgstr "國家或地區"
+
+#: src/libnma/nma-mobile-wizard.ui:228 src/libnm-gtk/nm-mobile-wizard.c:1113
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "選擇您的供應商的國家或地區"
+
+#: src/libnma/nma-mobile-wizard.ui:243 src/libnm-gtk/nm-mobile-wizard.c:697
+msgid "Select your provider from a _list:"
+msgstr "請從清單裡選擇供應商(_L):"
+
+#: src/libnma/nma-mobile-wizard.ui:288
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "我找不到我的供應商,我想要手動輸入(_M):"
+
+#: src/libnma/nma-mobile-wizard.ui:309 src/libnm-gtk/nm-mobile-wizard.c:765
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "我的供應商使用 GSM 技術(GPRS、EDGE、UMTS、HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:767
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "我的供應商使用 CDMA 技術(1xRTT、EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:321 src/libnm-gtk/nm-mobile-wizard.c:778
+msgid "Choose your Provider"
+msgstr "選擇您的供應商"
+
+#: src/libnma/nma-mobile-wizard.ui:338 src/libnm-gtk/nm-mobile-wizard.c:443
+msgid "_Select your plan:"
+msgstr "選擇您的方案(_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:365 src/libnm-gtk/nm-mobile-wizard.c:467
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "選擇方案的 _APN(Access Point Name,存取點名稱):"
+
+#: src/libnma/nma-mobile-wizard.ui:415 src/libnm-gtk/nm-mobile-wizard.c:487
+#, fuzzy
+msgid ""
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
+"\n"
+"If you are unsure of your plan please ask your provider for your plan’s APN."
+msgstr ""
+"警告:選擇不正確的方案可能會引起寬頻帳號的收費爭議,或讓您無法連線。\n"
+"\n"
+"如果您不確定所使用的方案,請洽詢供應商,以得知方案的 APN 為何。"
+
+#: src/libnma/nma-mobile-wizard.ui:436 src/libnm-gtk/nm-mobile-wizard.c:495
+msgid "Choose your Billing Plan"
+msgstr "選擇您的計費方案"
+
+#: src/libnma/nma-mobile-wizard.ui:454 src/libnm-gtk/nm-mobile-wizard.c:185
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "行動寬連線已經配置了以下設定:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:468 src/libnm-gtk/nm-mobile-wizard.c:192
+msgid "Your Device:"
+msgstr "您的裝置:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:494 src/libnm-gtk/nm-mobile-wizard.c:203
+msgid "Your Provider:"
+msgstr "您的供應商:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:520 src/libnm-gtk/nm-mobile-wizard.c:214
+msgid "Your Plan:"
+msgstr "您的方案:"
+
+#: src/libnma/nma-mobile-wizard.ui:575 src/libnm-gtk/nm-mobile-wizard.c:235
+#, fuzzy
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected. If the connection fails or you cannot access network "
+"resources, double-check your settings. To modify your mobile broadband "
+"connection settings, choose “Network Connections” from the System → "
+"Preferences menu."
+msgstr ""
+"現在,根據您所選取的設定,電腦將連上您的行動寬頻供應商。如果連線失敗,或是您"
+"無法存取網路資源,請檢查設定。要修改行動寬頻連線的設定,請從「系統」 >> 「偏"
+"好設定」中,選擇「網路連線」。"
+
+#: src/libnma/nma-mobile-wizard.ui:589 src/libnm-gtk/nm-mobile-wizard.c:248
+msgid "Confirm Mobile Broadband Settings"
+msgstr "確認行動寬頻設定"
+
+#: src/libnma/nma-cert-chooser-button.c:153
+msgid "(None)"
+msgstr "(無)"
+
+#: src/libnma/nma-cert-chooser-button.c:161
+#, c-format
+msgid "Key in %s"
+msgstr "鍵入 %s"
+
+#: src/libnma/nma-cert-chooser-button.c:162
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "C_A 憑證:"
+
+#: src/libnma/nma-cert-chooser-button.c:181
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:169
+msgid "(Unknown)"
+msgstr "(不明)"
+
+#: src/libnma/nma-cert-chooser-button.c:203
+#: src/libnma/nma-cert-chooser-button.c:233
+msgid "Select"
+msgstr "選擇"
+
+#: src/libnma/nma-cert-chooser-button.c:204
+#: src/libnma/nma-cert-chooser-button.c:234
+msgid "Cancel"
+msgstr "取消"
+
+#: src/libnma/nma-cert-chooser-button.c:460
+msgid "Select from file…"
+msgstr "從文件中選擇..."
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:381
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "選擇 CA 憑證"
+
+#: src/libnma/nma-pkcs11-cert-chooser.c:389
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "使用者憑證(_U):"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:241
+msgid "Error logging in: "
+msgstr "登錄時出錯: "
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:263
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "編輯連線時發生錯誤"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "解鎖(_U)"
+
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
+msgstr "由...發出"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.c:132
+#, c-format
+msgid "Enter %s PIN"
+msgstr "輸入 %s 銷"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr "登入(_L)"
+
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr "_記住密碼"
+
+#: src/libnma/nma-ui-utils.c:36 src/libnm-gtk/nm-ui-utils.c:601
+#, fuzzy
+msgid "Store the password only for this user"
+msgstr "只儲存這個使用者的密碼(_U)"
+
+#: src/libnma/nma-ui-utils.c:37 src/libnm-gtk/nm-ui-utils.c:602
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "儲存所有使用者的密碼(_A)"
+
+#: src/libnma/nma-ui-utils.c:38 src/libnm-gtk/nm-ui-utils.c:603
+msgid "Ask for this password every time"
+msgstr "每次都詢問此密碼"
+
+#: src/libnma/nma-ui-utils.c:39 src/libnm-gtk/nm-ui-utils.c:604
+#, fuzzy
+msgid "The password is not required"
+msgstr "連線至「%s」需要密碼。"
+
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:233
+msgid "Sh_ow passwords"
+msgstr "顯示密碼(_O)"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "第二密碼(_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:94
+msgid "_Secondary Password:"
+msgstr "第二密碼(_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:92
+msgid "_Password:"
+msgstr "密碼(_P):"
+
+#: src/libnma/nma-wifi-dialog.c:114 src/libnm-gtk/nm-wifi-dialog.c:127
+#, fuzzy
+msgid "Click to connect"
+msgstr "斷線"
+
+#: src/libnma/nma-wifi-dialog.c:445 src/libnm-gtk/nm-wifi-dialog.c:451
+msgid "New…"
+msgstr "新…"
+
+#: src/libnma/nma-wifi-dialog.c:923 src/libnm-gtk/nm-wifi-dialog.c:891
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "沒有"
+
+#: src/libnma/nma-wifi-dialog.c:979 src/libnm-gtk/nm-wifi-dialog.c:947
+msgid "Dynamic WEP (802.1x)"
+msgstr "動態 WEP(802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1119 src/libnm-gtk/nm-wifi-dialog.c:1057
+msgid "C_reate"
+msgstr "建立(_R)"
+
+#: src/libnma/nma-wifi-dialog.c:1199 src/libnm-gtk/nm-wifi-dialog.c:1136
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network “%s”."
+msgstr "需要密碼或是加密金鑰來存取 Wi-Fi 網路「%s」。"
+
+#: src/libnma/nma-wifi-dialog.c:1201 src/libnm-gtk/nm-wifi-dialog.c:1138
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wi-Fi 網路連線需要驗證"
+
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1140
+msgid "Authentication required by Wi-Fi network"
+msgstr "Wi-Fi 網路連線需要驗證"
+
+#: src/libnma/nma-wifi-dialog.c:1208 src/libnm-gtk/nm-wifi-dialog.c:1145
+msgid "Create New Wi-Fi Network"
+msgstr "建立新的 Wi-Fi 網路"
+
+#: src/libnma/nma-wifi-dialog.c:1210 src/libnm-gtk/nm-wifi-dialog.c:1147
+msgid "New Wi-Fi network"
+msgstr "新的 Wi-Fi 網路"
+
+#: src/libnma/nma-wifi-dialog.c:1211 src/libnm-gtk/nm-wifi-dialog.c:1148
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "輸入您要建立的 Wi-Fi 網路的名稱。"
+
+#: src/libnma/nma-wifi-dialog.c:1213 src/libnm-gtk/nm-wifi-dialog.c:1150
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "連接到隱藏的 Wi-Fi 網路"
+
+#: src/libnma/nma-wifi-dialog.c:1215 src/libnm-gtk/nm-wifi-dialog.c:1152
+msgid "Hidden Wi-Fi network"
+msgstr "隱藏的 Wi-Fi 網路"
+
+#: src/libnma/nma-wifi-dialog.c:1216 src/libnm-gtk/nm-wifi-dialog.c:1153
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "輸入您要連接的隱藏 Wi-Fi 網路的名稱與安全性詳細資料。"
+
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Wi-Fi 安全性(_S):"
+
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
+msgstr "連線(_N):"
+
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Wi-Fi 介面卡(_A):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:735
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "我找不到我的供應商,我想要手動輸入(_M):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:748
+msgid "Provider:"
+msgstr "供應商:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1040
+msgid "Country or Region List:"
+msgstr "國家或地區清單:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1053
+msgid "Country or region"
+msgstr "國家或地區"
+
+#: src/libnm-gtk/nm-ui-utils.c:288 src/libnm-gtk/nm-ui-utils.c:355
+msgid "Wired"
+msgstr "有線"
+
+#: src/libnm-gtk/nm-ui-utils.c:313
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: src/libnm-gtk/nm-ui-utils.c:327
+msgid "ADSL"
+msgstr "ADSL"
+
+#: src/libnm-gtk/nm-ui-utils.c:390
+msgid "PCI"
+msgstr "PCI"
+
+#: src/libnm-gtk/nm-ui-utils.c:392
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: src/libnm-gtk/nm-ui-utils.c:468 src/libnm-gtk/nm-ui-utils.c:488
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: src/libnm-gtk/nm-wifi-dialog.c:128
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"密碼丟失或連接無效。在後一種情況下,您必須首先使用nm-connection-editor編輯連"
+"接"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi 安全性(_S):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "網路名稱(_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "連線(_N):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi 介面卡(_A):"
+
 #: src/main.c:28
 msgid "Usage:"
 msgstr "用法:"
@@ -4337,26 +4825,26 @@ msgstr "不需要 CA 憑證(_R)"
 msgid "selected CA certificate file does not exist"
 msgstr "選定的CA證書文件不存在"
 
-#: src/wireless-security/eap-method-fast.c:58
+#: src/wireless-security/eap-method-fast.c:59
 msgid "missing EAP-FAST PAC file"
 msgstr "缺少EAP-FAST PAC文件"
 
-#: src/wireless-security/eap-method-fast.c:255
-#: src/wireless-security/eap-method-peap.c:318
-#: src/wireless-security/eap-method-ttls.c:372
+#: src/wireless-security/eap-method-fast.c:256
+#: src/wireless-security/eap-method-peap.c:319
+#: src/wireless-security/eap-method-ttls.c:373
 msgid "GTC"
 msgstr "GTC"
 
-#: src/wireless-security/eap-method-fast.c:394
+#: src/wireless-security/eap-method-fast.c:395
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "選擇一個 PAC 檔案…"
 
-#: src/wireless-security/eap-method-fast.c:401
+#: src/wireless-security/eap-method-fast.c:402
 msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
-#: src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:406
 msgid "All files"
 msgstr "所有檔案"
 
@@ -4395,16 +4883,16 @@ msgstr "內部驗證(_I):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允許自動供應 PAC (_V)"
 
-#: src/wireless-security/eap-method-leap.c:52
+#: src/wireless-security/eap-method-leap.c:53
 msgid "missing EAP-LEAP username"
 msgstr "缺少EAP-LEAP用戶名"
 
-#: src/wireless-security/eap-method-leap.c:61
+#: src/wireless-security/eap-method-leap.c:62
 msgid "missing EAP-LEAP password"
 msgstr "缺少EAP-LEAP密碼"
 
-#: src/wireless-security/eap-method-peap.c:302
-#: src/wireless-security/eap-method-ttls.c:356
+#: src/wireless-security/eap-method-peap.c:303
+#: src/wireless-security/eap-method-ttls.c:357
 #: src/wireless-security/wireless-security.c:411
 msgid "MD5"
 msgstr "MD5"
@@ -4440,15 +4928,15 @@ msgstr "服務器證書名稱的後綴。"
 msgid "_Domain"
 msgstr ""
 
-#: src/wireless-security/eap-method-simple.c:76
+#: src/wireless-security/eap-method-simple.c:77
 msgid "missing EAP username"
 msgstr "缺少EAP用戶名"
 
-#: src/wireless-security/eap-method-simple.c:92
+#: src/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "缺少EAP密碼"
 
-#: src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:107
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
@@ -4462,24 +4950,24 @@ msgstr "WEP 128-位元 密語"
 msgid "Sh_ow passphrase"
 msgstr "顯示密碼(_O)"
 
-#: src/wireless-security/eap-method-tls.c:50
+#: src/wireless-security/eap-method-tls.c:51
 msgid "missing EAP-TLS identity"
 msgstr "缺少EAP-TLS身份"
 
-#: src/wireless-security/eap-method-tls.c:242
+#: src/wireless-security/eap-method-tls.c:243
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "不需要 CA 憑證(_R)"
 
-#: src/wireless-security/eap-method-tls.c:247
+#: src/wireless-security/eap-method-tls.c:248
 msgid "selected user certificate file does not exist"
 msgstr "選定的用戶證書文件不存在"
 
-#: src/wireless-security/eap-method-tls.c:267
+#: src/wireless-security/eap-method-tls.c:268
 msgid "no key selected"
 msgstr "沒有選擇密鑰"
 
-#: src/wireless-security/eap-method-tls.c:272
+#: src/wireless-security/eap-method-tls.c:273
 msgid "selected key file does not exist"
 msgstr "選定的密鑰文件不存在"
 
@@ -4488,7 +4976,7 @@ msgstr "選定的密鑰文件不存在"
 msgid "I_dentity"
 msgstr "識別(_D):"
 
-#: src/wireless-security/eap-method-ttls.c:323
+#: src/wireless-security/eap-method-ttls.c:324
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4528,15 +5016,15 @@ msgstr ""
 msgid "Au_thentication"
 msgstr "驗證(_E):"
 
-#: src/wireless-security/ws-leap.c:50
+#: src/wireless-security/ws-leap.c:51
 msgid "missing leap-username"
 msgstr "缺少leap-username"
 
-#: src/wireless-security/ws-leap.c:68
+#: src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "缺少飛躍密碼"
 
-#: src/wireless-security/ws-sae.c:56
+#: src/wireless-security/ws-sae.c:57
 #, fuzzy
 msgid "missing password"
 msgstr "缺少EAP密碼"
@@ -4546,22 +5034,22 @@ msgstr "缺少EAP密碼"
 msgid "_Type"
 msgstr "類型(_T):"
 
-#: src/wireless-security/ws-wep-key.c:99
+#: src/wireless-security/ws-wep-key.c:100
 msgid "missing wep-key"
 msgstr "缺少wep-key"
 
-#: src/wireless-security/ws-wep-key.c:106
+#: src/wireless-security/ws-wep-key.c:107
 #, 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:114
+#: src/wireless-security/ws-wep-key.c:115
 #, 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:120
+#: src/wireless-security/ws-wep-key.c:121
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4569,11 +5057,11 @@ msgid ""
 msgstr ""
 "無效的wep-key:錯誤的密鑰長度 %zu。密鑰長度必須為5/13(ascii)或10/26(hex)"
 
-#: src/wireless-security/ws-wep-key.c:127
+#: src/wireless-security/ws-wep-key.c:128
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "無效的wep-key:passphrase必須是非空的"
 
-#: src/wireless-security/ws-wep-key.c:129
+#: src/wireless-security/ws-wep-key.c:130
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "無效的wep-key:passphrase必須短於64個字符"
 
@@ -4603,7 +5091,7 @@ msgstr "顯示金鑰(_W)"
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X):"
 
-#: src/wireless-security/ws-wpa-psk.c:62
+#: src/wireless-security/ws-wpa-psk.c:63
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4611,357 +5099,10 @@ msgid ""
 msgstr ""
 "無效的wpa-psk:無效的密鑰長度 %zu。必須是[8,63]個字節或64個十六進制數字"
 
-#: src/wireless-security/ws-wpa-psk.c:69
+#: src/wireless-security/ws-wpa-psk.c:70
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "無效的wpa-psk:無法將64字節的密鑰解釋為十六進制"
 
-#, fuzzy
-#~ msgid "No certificate set"
-#~ msgstr "不需要 CA 憑證(_R)"
-
-#~ msgid "No key set"
-#~ msgstr "沒有按鍵設置"
-
-#, fuzzy, c-format
-#~ msgid "Choose a key for %s Certificate"
-#~ msgstr "選擇 CA 憑證"
-
-#, fuzzy, c-format
-#~ msgid "%s private _key"
-#~ msgstr "私密金鑰(_K):"
-
-#, fuzzy, c-format
-#~ msgid "%s key _password"
-#~ msgstr "私密金鑰密碼(_P):"
-
-#, fuzzy, c-format
-#~ msgid "Choose %s Certificate"
-#~ msgstr "選擇 CA 憑證"
-
-#, fuzzy, c-format
-#~ msgid "%s _certificate"
-#~ msgstr "使用者憑證(_U):"
-
-#~ msgid "My country is not listed"
-#~ msgstr "我的國家並沒有列出來"
-
-#~ msgid "Unlisted"
-#~ msgstr "未列出的"
-
-#, fuzzy
-#~ msgid "My plan is not listed…"
-#~ msgstr "我的方案沒有列出…"
-
-#~ msgid "Provider"
-#~ msgstr "供應商"
-
-#~ msgid "Installed GSM device"
-#~ msgstr "已安裝的 GSM 裝置"
-
-#~ msgid "Installed CDMA device"
-#~ msgstr "已安裝的 CDMA 裝置"
-
-#~ msgid "Any device"
-#~ msgstr "任何裝置"
-
-#~ msgid "New Mobile Broadband Connection"
-#~ msgstr "新的行動寬頻連線"
-
-#~ msgid ""
-#~ "This assistant helps you easily set up a mobile broadband connection to a "
-#~ "cellular (3G) network."
-#~ msgstr "這能幫助您輕易地設定行動寬頻連線,連至手機 (3G) 網路。"
-
-#~ msgid "You will need the following information:"
-#~ msgstr "您需要以下資訊:"
-
-#, fuzzy
-#~ msgid "Your broadband provider’s name"
-#~ msgstr "寬頻供應商的名稱"
-
-#~ msgid "Your broadband billing plan name"
-#~ msgstr "寬頻計費方案的名稱"
-
-#~ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-#~ msgstr "(在有些情況下)您的寬頻計費方案的 APN(存取點名稱)"
-
-#~ msgid "Create a connection for _this mobile broadband device:"
-#~ msgstr "為這個行動寬頻裝置建立連線(_T)"
-
-#~ msgid "Set up a Mobile Broadband Connection"
-#~ msgstr "設定行動寬頻連線"
-
-#, fuzzy
-#~ msgid "Country or region:"
-#~ msgstr "國家或地區"
-
-#, fuzzy
-#~ msgid "Choose your Provider’s Country or Region"
-#~ msgstr "選擇您的供應商的國家或地區"
-
-#~ msgid "Select your provider from a _list:"
-#~ msgstr "請從清單裡選擇供應商(_L):"
-
-#, fuzzy
-#~ msgid ""
-#~ "I can’t find my provider and I wish to set up the connection _manually:"
-#~ msgstr "我找不到我的供應商,我想要手動輸入(_M):"
-
-#~ msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-#~ msgstr "我的供應商使用 GSM 技術(GPRS、EDGE、UMTS、HSPA)"
-
-#~ msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-#~ msgstr "我的供應商使用 CDMA 技術(1xRTT、EVDO)"
-
-#~ msgid "Choose your Provider"
-#~ msgstr "選擇您的供應商"
-
-#~ msgid "_Select your plan:"
-#~ msgstr "選擇您的方案(_S):"
-
-#~ msgid "Selected plan _APN (Access Point Name):"
-#~ msgstr "選擇方案的 _APN(Access Point Name,存取點名稱):"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Selecting an incorrect plan may result in billing issues for "
-#~ "your broadband account or may prevent connectivity.\n"
-#~ "\n"
-#~ "If you are unsure of your plan please ask your provider for your plan’s "
-#~ "APN."
-#~ msgstr ""
-#~ "警告:選擇不正確的方案可能會引起寬頻帳號的收費爭議,或讓您無法連線。\n"
-#~ "\n"
-#~ "如果您不確定所使用的方案,請洽詢供應商,以得知方案的 APN 為何。"
-
-#~ msgid "Choose your Billing Plan"
-#~ msgstr "選擇您的計費方案"
-
-#~ msgid ""
-#~ "Your mobile broadband connection is configured with the following "
-#~ "settings:"
-#~ msgstr "行動寬連線已經配置了以下設定:"
-
-#~ msgid "Your Device:"
-#~ msgstr "您的裝置:"
-
-#~ msgid "Your Provider:"
-#~ msgstr "您的供應商:"
-
-#~ msgid "Your Plan:"
-#~ msgstr "您的方案:"
-
-#, fuzzy
-#~ msgid ""
-#~ "A connection will now be made to your mobile broadband provider using the "
-#~ "settings you selected. If the connection fails or you cannot access "
-#~ "network resources, double-check your settings. To modify your mobile "
-#~ "broadband connection settings, choose “Network Connections” from the "
-#~ "System → Preferences menu."
-#~ msgstr ""
-#~ "現在,根據您所選取的設定,電腦將連上您的行動寬頻供應商。如果連線失敗,或是"
-#~ "您無法存取網路資源,請檢查設定。要修改行動寬頻連線的設定,請從「系統」 >> "
-#~ "「偏好設定」中,選擇「網路連線」。"
-
-#~ msgid "Confirm Mobile Broadband Settings"
-#~ msgstr "確認行動寬頻設定"
-
-#~ msgid "(None)"
-#~ msgstr "(無)"
-
-#, c-format
-#~ msgid "Key in %s"
-#~ msgstr "鍵入 %s"
-
-#, fuzzy, c-format
-#~ msgid "Certificate in %s"
-#~ msgstr "C_A 憑證:"
-
-#~ msgid "(Unknown)"
-#~ msgstr "(不明)"
-
-#~ msgid "Select"
-#~ msgstr "選擇"
-
-#~ msgid "Cancel"
-#~ msgstr "取消"
-
-#~ msgid "Select from file…"
-#~ msgstr "從文件中選擇..."
-
-#, fuzzy, c-format
-#~ msgid "Choose a %s Certificate"
-#~ msgstr "選擇 CA 憑證"
-
-#, fuzzy, c-format
-#~ msgid "%s certificate _password"
-#~ msgstr "使用者憑證(_U):"
-
-#~ msgid "Error logging in: "
-#~ msgstr "登錄時出錯: "
-
-#, fuzzy
-#~ msgid "Error opening a session: "
-#~ msgstr "編輯連線時發生錯誤"
-
-#, fuzzy
-#~ msgid "_Unlock token"
-#~ msgstr "解鎖(_U)"
-
-#~ msgid "Issued By"
-#~ msgstr "由...發出"
-
-#, c-format
-#~ msgid "Enter %s PIN"
-#~ msgstr "輸入 %s 銷"
-
-#~ msgid "_Login"
-#~ msgstr "登入(_L)"
-
-#~ msgid "_Remember PIN"
-#~ msgstr "_記住密碼"
-
-#, fuzzy
-#~ msgid "Store the password only for this user"
-#~ msgstr "只儲存這個使用者的密碼(_U)"
-
-#, fuzzy
-#~ msgid "Store the password for all users"
-#~ msgstr "儲存所有使用者的密碼(_A)"
-
-#~ msgid "Ask for this password every time"
-#~ msgstr "每次都詢問此密碼"
-
-#, fuzzy
-#~ msgid "The password is not required"
-#~ msgstr "連線至「%s」需要密碼。"
-
-#~ msgid "Sh_ow passwords"
-#~ msgstr "顯示密碼(_O)"
-
-#, fuzzy
-#~ msgid "_Tertiary Password:"
-#~ msgstr "第二密碼(_S):"
-
-#~ msgid "_Secondary Password:"
-#~ msgstr "第二密碼(_S):"
-
-#~ msgid "_Password:"
-#~ msgstr "密碼(_P):"
-
-#, fuzzy
-#~ msgid "Click to connect"
-#~ msgstr "斷線"
-
-#~ msgid "New…"
-#~ msgstr "新…"
-
-#~ msgctxt "Wifi/wired security"
-#~ msgid "None"
-#~ msgstr "沒有"
-
-#~ msgid "Dynamic WEP (802.1x)"
-#~ msgstr "動態 WEP(802.1x)"
-
-#~ msgid "C_reate"
-#~ msgstr "建立(_R)"
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the Wi-Fi network "
-#~ "“%s”."
-#~ msgstr "需要密碼或是加密金鑰來存取 Wi-Fi 網路「%s」。"
-
-#~ msgid "Wi-Fi Network Authentication Required"
-#~ msgstr "Wi-Fi 網路連線需要驗證"
-
-#~ msgid "Authentication required by Wi-Fi network"
-#~ msgstr "Wi-Fi 網路連線需要驗證"
-
-#~ msgid "Create New Wi-Fi Network"
-#~ msgstr "建立新的 Wi-Fi 網路"
-
-#~ msgid "New Wi-Fi network"
-#~ msgstr "新的 Wi-Fi 網路"
-
-#~ msgid "Enter a name for the Wi-Fi network you wish to create."
-#~ msgstr "輸入您要建立的 Wi-Fi 網路的名稱。"
-
-#~ msgid "Connect to Hidden Wi-Fi Network"
-#~ msgstr "連接到隱藏的 Wi-Fi 網路"
-
-#~ msgid "Hidden Wi-Fi network"
-#~ msgstr "隱藏的 Wi-Fi 網路"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden Wi-Fi network you wish "
-#~ "to connect to."
-#~ msgstr "輸入您要連接的隱藏 Wi-Fi 網路的名稱與安全性詳細資料。"
-
-#, fuzzy
-#~ msgid "Wi-Fi _security"
-#~ msgstr "Wi-Fi 安全性(_S):"
-
-#, fuzzy
-#~ msgid "C_onnection"
-#~ msgstr "連線(_N):"
-
-#, fuzzy
-#~ msgid "Wi-Fi _adapter"
-#~ msgstr "Wi-Fi 介面卡(_A):"
-
-#, fuzzy
-#~ msgid "I can’t find my provider and I wish to enter it _manually:"
-#~ msgstr "我找不到我的供應商,我想要手動輸入(_M):"
-
-#~ msgid "Provider:"
-#~ msgstr "供應商:"
-
-#~ msgid "Country or Region List:"
-#~ msgstr "國家或地區清單:"
-
-#~ msgid "Country or region"
-#~ msgstr "國家或地區"
-
-#~ msgid "Wired"
-#~ msgstr "有線"
-
-#~ msgid "OLPC Mesh"
-#~ msgstr "OLPC Mesh"
-
-#~ msgid "ADSL"
-#~ msgstr "ADSL"
-
-#~ msgid "PCI"
-#~ msgstr "PCI"
-
-#~ msgid "USB"
-#~ msgstr "USB"
-
-#, c-format
-#~ msgctxt "long device name"
-#~ msgid "%s %s"
-#~ msgstr "%s %s"
-
-#~ msgid ""
-#~ "Either a password is missing or the connection is invalid. In the latter "
-#~ "case, you have to edit the connection with nm-connection-editor first"
-#~ msgstr ""
-#~ "密碼丟失或連接無效。在後一種情況下,您必須首先使用nm-connection-editor編輯"
-#~ "連接"
-
-#~ msgid "Wi-Fi _security:"
-#~ msgstr "Wi-Fi 安全性(_S):"
-
-#~ msgid "_Network name:"
-#~ msgstr "網路名稱(_N):"
-
-#~ msgid "C_onnection:"
-#~ msgstr "連線(_N):"
-
-#~ msgid "Wi-Fi _adapter:"
-#~ msgstr "Wi-Fi 介面卡(_A):"
-
 #~ msgid "%s (default)"
 #~ msgstr "%s (預設值)"
 
diff --git a/src/libnma/init.c b/src/libnma/init.c
new file mode 100644
index 00000000..26828592
--- /dev/null
+++ b/src/libnma/init.c
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/*
+ * Copyright 2014 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include <libintl.h>
+
+static void __attribute__((constructor))
+_libnma_init (void)
+{
+       static gboolean initialized = FALSE;
+
+       if (initialized)
+               return;
+       initialized = TRUE;
+
+       bindtextdomain (GETTEXT_PACKAGE, NMALOCALEDIR);
+       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+}
+
diff --git a/src/libnma/libnma-gtk4.pc.in b/src/libnma/libnma-gtk4.pc.in
new file mode 100644
index 00000000..a2cf2b49
--- /dev/null
+++ b/src/libnma/libnma-gtk4.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+libdir=@libdir@
+
+Name: libnma
+Description: NetworkManager UI utilities (gtk4 version)
+Version: @PACKAGE_VERSION@
+Requires: libnm
+Cflags: -I${includedir}/libnma
+Libs: -L${libdir} -lnma-gtk4
diff --git a/src/libnma/libnma.pc.in b/src/libnma/libnma.pc.in
new file mode 100644
index 00000000..9e6f905d
--- /dev/null
+++ b/src/libnma/libnma.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+libdir=@libdir@
+
+Name: libnma
+Description: NetworkManager UI utilities (libnm version)
+Version: @PACKAGE_VERSION@
+Requires: libnm
+Cflags: -I${includedir}/libnma
+Libs: -L${libdir} -lnma
diff --git a/src/libnma/libnma.ver b/src/libnma/libnma.ver
new file mode 100644
index 00000000..9b263d9c
--- /dev/null
+++ b/src/libnma/libnma.ver
@@ -0,0 +1,114 @@
+libnma_1_2_0 {
+global:
+       nma_country_info_get_country_code;
+       nma_country_info_get_country_name;
+       nma_country_info_get_providers;
+       nma_country_info_get_type;
+       nma_country_info_ref;
+       nma_country_info_unref;
+       nma_mobile_access_method_get_3gpp_apn;
+       nma_mobile_access_method_get_dns;
+       nma_mobile_access_method_get_family;
+       nma_mobile_access_method_get_gateway;
+       nma_mobile_access_method_get_name;
+       nma_mobile_access_method_get_password;
+       nma_mobile_access_method_get_type;
+       nma_mobile_access_method_get_username;
+       nma_mobile_access_method_ref;
+       nma_mobile_access_method_unref;
+       nma_mobile_provider_get_3gpp_mcc_mnc;
+       nma_mobile_provider_get_cdma_sid;
+       nma_mobile_provider_get_methods;
+       nma_mobile_provider_get_name;
+       nma_mobile_provider_get_type;
+       nma_mobile_provider_ref;
+       nma_mobile_providers_database_dump;
+       nma_mobile_providers_database_get_countries;
+       nma_mobile_providers_database_get_type;
+       nma_mobile_providers_database_lookup_3gpp_mcc_mnc;
+       nma_mobile_providers_database_lookup_cdma_sid;
+       nma_mobile_providers_database_lookup_country;
+       nma_mobile_providers_database_new;
+       nma_mobile_providers_database_new_finish;
+       nma_mobile_providers_database_new_sync;
+       nma_mobile_providers_split_3gpp_mcc_mnc;
+       nma_mobile_provider_unref;
+       nma_mobile_wizard_destroy;
+       nma_mobile_wizard_new;
+       nma_mobile_wizard_present;
+       nma_utils_menu_to_secret_flags;
+       nma_utils_setup_password_storage;
+       nma_utils_update_password_storage;
+       nma_vpn_password_dialog_focus_password;
+       nma_vpn_password_dialog_focus_password_secondary;
+       nma_vpn_password_dialog_focus_password_ternary;
+       nma_vpn_password_dialog_get_password;
+       nma_vpn_password_dialog_get_password_secondary;
+       nma_vpn_password_dialog_get_password_ternary;
+       nma_vpn_password_dialog_get_type;
+       nma_vpn_password_dialog_new;
+       nma_vpn_password_dialog_run_and_block;
+       nma_vpn_password_dialog_set_password;
+       nma_vpn_password_dialog_set_password_label;
+       nma_vpn_password_dialog_set_password_secondary;
+       nma_vpn_password_dialog_set_password_secondary_label;
+       nma_vpn_password_dialog_set_password_ternary;
+       nma_vpn_password_dialog_set_password_ternary_label;
+       nma_vpn_password_dialog_set_show_password;
+       nma_vpn_password_dialog_set_show_password_secondary;
+       nma_vpn_password_dialog_set_show_password_ternary;
+       nma_wifi_dialog_get_connection;
+       nma_wifi_dialog_get_nag_ignored;
+       nma_wifi_dialog_get_type;
+       nma_wifi_dialog_nag_user;
+       nma_wifi_dialog_new;
+       nma_wifi_dialog_new_for_create;
+       nma_wifi_dialog_new_for_hidden;
+       nma_wifi_dialog_new_for_other;
+       nma_wifi_dialog_set_nag_ignored;
+local:
+       *;
+};
+
+libnma_1_8_0 {
+global:
+       nma_cert_chooser_add_to_size_group;
+       nma_cert_chooser_get_cert;
+       nma_cert_chooser_get_cert_password;
+       nma_cert_chooser_get_cert_password_flags;
+       nma_cert_chooser_get_cert_uri;
+       nma_cert_chooser_get_key;
+       nma_cert_chooser_get_key_password;
+       nma_cert_chooser_get_key_password_flags;
+       nma_cert_chooser_get_key_uri;
+       nma_cert_chooser_get_type;
+       nma_cert_chooser_new;
+       nma_cert_chooser_set_cert;
+       nma_cert_chooser_set_cert_password;
+       nma_cert_chooser_set_cert_uri;
+       nma_cert_chooser_set_key;
+       nma_cert_chooser_set_key_password;
+       nma_cert_chooser_set_key_uri;
+       nma_cert_chooser_setup_cert_password_storage;
+       nma_cert_chooser_setup_key_password_storage;
+       nma_cert_chooser_update_cert_password_storage;
+       nma_cert_chooser_update_key_password_storage;
+       nma_cert_chooser_validate;
+} libnma_1_2_0;
+
+libnma_1_8_12 {
+       nma_mobile_wizard_get_type;
+} libnma_1_8_0;
+
+libnma_1_8_20 {
+       nma_wifi_dialog_new_for_secrets;
+} libnma_1_8_12;
+
+libnma_1_8_22 {
+       nma_bar_code_draw;
+       nma_bar_code_get_size;
+       nma_bar_code_get_type;
+       nma_bar_code_new;
+       nma_bar_code_widget_get_type;
+       nma_bar_code_widget_new;
+} libnma_1_8_12;
diff --git a/src/libnma/meson.build b/src/libnma/meson.build
new file mode 100644
index 00000000..2432be93
--- /dev/null
+++ b/src/libnma/meson.build
@@ -0,0 +1,186 @@
+cert_chooser_headers = files('nma-cert-chooser.h')
+
+cert_chooser_sources = files(
+  'nma-cert-chooser.c',
+  'nma-file-cert-chooser.c'
+)
+
+resource_data = files(
+  'nma-pkcs11-cert-chooser-dialog.ui',
+  'nma-pkcs11-token-login-dialog.ui',
+  'wifi.ui'
+)
+
+built_sources = gnome.compile_resources(
+  'nma-resources',
+  'nma.gresource.xml',
+  dependencies: resource_data
+)
+
+gir_headers = cert_chooser_headers + files(
+  'nma-bar-code-widget.h',
+  'nma-bar-code.h',
+  'nma-mobile-providers.h',
+  'nma-mobile-wizard.h',
+  'nma-ui-utils.h',
+  'nma-vpn-password-dialog.h',
+  'nma-wifi-dialog.h'
+)
+
+install_headers(
+  gir_headers,
+  subdir: 'libnma'
+)
+
+gir_sources = [version_header] + cert_chooser_sources + files(
+  'init.c',
+  'nma-bar-code-widget.c',
+  'nma-bar-code.c',
+  'nma-mobile-providers.c',
+  'nma-mobile-wizard.c',
+  'nma-ui-utils.c',
+  'nma-vpn-password-dialog.c',
+  'nma-wifi-dialog.c'
+)
+
+incs = [
+  top_inc,
+  shared_inc,
+  src_inc,
+  libnma_inc,
+  wireless_security_inc
+]
+
+deps = [
+  gudev_dep,
+  libnm_dep,
+  libutils_libnm_dep,
+]
+
+cflags = [
+  '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB',
+  '-DBINDIR="@0@"'.format(nma_bindir),
+  '-DDATADIR="@0@"'.format(nma_datadir),
+  '-DLIBEXECDIR="@0@"'.format(nma_libexecdir),
+  '-DNMALOCALEDIR="@0@"'.format(nma_localedir),
+  '-DSYSCONFDIR="@0@"'.format(nma_sysconfdir),
+  '-DAUTOSTARTDIR="@0@"'.format(nma_autostartdir),
+  '-DICONDIR="@0@"'.format(nma_icondir)
+]
+
+symbol_map = join_paths(meson.current_source_dir(), 'libnma.ver')
+
+nma_deps = [ deps, gtk_dep ]
+nma_sources = [ gir_sources, built_sources ]
+if enable_gcr
+  nma_sources += files(
+    'nma-cert-chooser-button.c',
+    'nma-pkcs11-cert-chooser.c',
+    'nma-pkcs11-cert-chooser-dialog.c',
+    'nma-pkcs11-token-login-dialog.c'
+  )
+  nma_deps += gcr_dep
+endif
+
+libnma = shared_library(
+  'nma',
+  sources: nma_sources,
+  version: libversion,
+  include_directories: incs,
+  dependencies: nma_deps,
+  c_args: cflags,
+  link_args: '-Wl,--version-script,' + symbol_map,
+  link_depends: symbol_map,
+  link_whole: libwireless_security_libnm,
+  install: true,
+  install_dir: nma_libdir
+)
+
+libnma_dep = declare_dependency(
+  link_with: libnma,
+  include_directories: libnma_inc
+)
+
+if enable_libnma_gtk4
+  libnma_gtk4 = shared_library(
+    'nma-gtk4',
+    sources: gir_sources + built_sources,
+    version: libversion,
+    include_directories: incs,
+    dependencies: [ deps, gtk4_dep ],
+    c_args: cflags,
+    link_args: '-Wl,--version-script,' + symbol_map,
+    link_depends: symbol_map,
+    link_whole: libwireless_security_libnma_gtk4,
+    install: true,
+    install_dir: nma_libdir
+  )
+
+  libnma_gtk4_dep = declare_dependency(
+    link_with: libnma_gtk4,
+    include_directories: libnma_inc
+  )
+endif
+
+subdir('tests')
+
+pkg.generate(
+  libraries: libnma,
+  version: nma_version,
+  name: 'libnma',
+  description: 'NetworkManager UI utilities (libnm version)',
+  filebase: 'libnma',
+  subdirs: 'libnma',
+  requires: 'libnm',
+  variables: 'exec_prefix=' + nma_prefix,
+  install_dir: join_paths(nma_libdir, 'pkgconfig')
+)
+
+if enable_libnma_gtk4
+  pkg.generate(
+    libraries: libnma_gtk4,
+    version: nma_version,
+    name: 'libnma-gtk4',
+    description: 'NetworkManager UI utilities (gtk4 version)',
+    filebase: 'libnma-gtk4',
+    subdirs: 'libnma',
+    requires: 'libnm',
+    variables: 'exec_prefix=' + nma_prefix,
+    install_dir: join_paths(nma_libdir, 'pkgconfig')
+  )
+endif
+
+if enable_introspection
+  gir_dir = join_paths(nma_datadir, 'gir-' + nma_gir_version)
+  typelib_dir = join_paths(nma_libdir, 'girepository-' + nma_gir_version)
+
+  gnome.generate_gir(
+    libnma,
+    sources: gir_sources + gir_headers,
+    nsversion: nma_gir_version,
+    namespace: 'NMA',
+    includes: [ 'Gtk-3.0', 'NM-1.0' ],
+    identifier_prefix: nma_gir_prefix,
+    symbol_prefix: nma_gir_prefix.to_lower(),
+    export_packages: 'libnma',
+    install: true,
+    install_dir_gir: gir_dir,
+    install_dir_typelib: typelib_dir
+  )
+
+  if enable_libnma_gtk4
+    gnome.generate_gir(
+      libnma,
+      sources: gir_sources + gir_headers,
+      nsversion: nma_gir_version,
+      namespace: 'NMA4',
+      includes: [ 'Gtk-4.0', 'NM-1.0' ],
+      identifier_prefix: nma_gir_prefix,
+      symbol_prefix: nma_gir_prefix.to_lower(),
+      export_packages: 'libnma',
+      install: true,
+      install_dir_gir: gir_dir,
+      install_dir_typelib: typelib_dir
+    )
+  endif
+endif
diff --git a/src/libnma/nma-bar-code-widget.c b/src/libnma/nma-bar-code-widget.c
new file mode 100644
index 00000000..0d547f2a
--- /dev/null
+++ b/src/libnma/nma-bar-code-widget.c
@@ -0,0 +1,462 @@
+/* nma-bar-code-widget.h - Renderer of a "QR" code
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the ree Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * Copyright 2018, 2019 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include <stdint.h>
+
+#include "nma-bar-code.h"
+#include "nma-bar-code-widget.h"
+
+#define CARD_WIDTH_PT 252
+#define CARD_HEIGHT_PT 144
+
+struct _NMABarCodeWidget {
+       GtkBox parent;
+};
+
+struct _NMABarCodeWidgetClass {
+       GtkBoxClass parent_class;
+};
+
+typedef struct {
+       NMConnection *connection;
+       GtkWidget *qr_code;
+       NMABarCode *qr;
+} NMABarCodeWidgetPrivate;
+
+/**
+ * SECTION:nma-bar-code-widget
+ * @title: NMABarCodeWidget
+ *
+ * This is a widget that displays a QR code for a connection suitable for
+ * optical recognition, e.g. scanning on a phone to connect to a hotspot.
+ */
+
+G_DEFINE_TYPE_WITH_CODE (NMABarCodeWidget, nma_bar_code_widget, GTK_TYPE_BOX,
+                         G_ADD_PRIVATE (NMABarCodeWidget))
+
+enum {
+       PROP_0,
+       PROP_CONNECTION,
+
+       LAST_PROP
+};
+
+#define NMA_BAR_CODE_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+                                     NMA_TYPE_BAR_CODE_WIDGET, \
+                                     NMABarCodeWidgetPrivate))
+
+static void
+do_qr_code_draw (GtkDrawingArea *area, cairo_t *cr, int width, int height,
+                 gpointer user_data)
+{
+       NMABarCodeWidgetPrivate *priv = NMA_BAR_CODE_WIDGET_GET_PRIVATE (user_data);
+       int size = nma_bar_code_get_size (priv->qr);
+
+       gtk_widget_set_size_request (priv->qr_code, (size + 2) * 3, (size + 2) * 3);
+
+       cairo_set_source_rgba (cr, 1, 1, 1, 1);
+       cairo_fill (cr);
+       cairo_paint (cr);
+       cairo_set_source_rgba (cr, 0, 0, 0, 1);
+       cairo_scale (cr, (float)width / (size + 2), (float)height / (size + 2));
+       cairo_translate (cr, 1, 1);
+       cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
+       nma_bar_code_draw (priv->qr, cr);
+}
+
+static gboolean
+qr_code_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data)
+{
+       do_qr_code_draw (GTK_DRAWING_AREA (widget), cr,
+                        gtk_widget_get_allocated_width (widget),
+                        gtk_widget_get_allocated_height (widget),
+                        user_data);
+
+       return TRUE;
+}
+
+static char *
+shell_escape (const char *to_escape)
+{
+       GString *string = g_string_sized_new (32);
+       gboolean quote = *to_escape == '\0';
+       const char *c;
+
+       for (c = to_escape; *c; c++) {
+               if (strchr ("$\\\"", *c))
+                       g_string_append_c (string, '\\');
+               else if (!g_ascii_isalnum(*c) && !strchr ("@%^+-_[]:", *c))
+                       quote = TRUE;
+               g_string_append_c (string, *c);
+       }
+       if (quote) {
+               g_string_append_c (string, '"');
+               g_string_prepend_c (string, '"');
+       }
+       return g_string_free (string, FALSE);
+}
+
+static void
+draw_one (NMABarCodeWidget *self, cairo_t *cr,
+          const char *psk, const char *ssid,
+          const char *nmcli_line1, const char *nmcli_line2)
+{
+       NMABarCodeWidgetPrivate *priv = NMA_BAR_CODE_WIDGET_GET_PRIVATE (self);
+       int size = nma_bar_code_get_size (priv->qr);
+
+       cairo_save (cr);
+
+       cairo_set_line_width (cr, 0.01);
+       cairo_rectangle (cr, 0, 0, CARD_WIDTH_PT, CARD_HEIGHT_PT);
+       cairo_stroke (cr);
+       cairo_translate (cr, 12, 12);
+
+       cairo_save (cr);
+       cairo_scale (cr, (float)84/(float)size, (float)84/(float)size);
+       cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
+       nma_bar_code_draw (priv->qr, cr);
+       cairo_restore (cr);
+
+       cairo_select_font_face(cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+
+       cairo_move_to (cr, 96, 12);
+       cairo_set_font_size (cr, 12);
+       cairo_show_text(cr, _("Network"));
+
+       cairo_move_to (cr, 96, 30);
+       cairo_set_font_size (cr, 16);
+       cairo_show_text(cr, ssid);
+
+       cairo_select_font_face(cr, "Monospace", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+
+       cairo_move_to (cr, 0, 108);
+       cairo_set_font_size (cr, 10);
+       cairo_show_text(cr, nmcli_line1);
+
+       if (psk) {
+               cairo_select_font_face(cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+
+               cairo_move_to (cr, 96, 60);
+               cairo_set_font_size (cr, 12);
+               cairo_show_text(cr, _("Password"));
+
+               cairo_move_to (cr, 96, 78);
+               cairo_set_font_size (cr, 16);
+               cairo_show_text(cr, psk);
+
+               cairo_select_font_face(cr, "Monospace", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+
+               cairo_move_to (cr, 24, 120);
+               cairo_set_font_size (cr, 10);
+               cairo_show_text(cr, nmcli_line2);
+       }
+
+       cairo_restore (cr);
+}
+
+static void
+draw_page (GtkPrintOperation *operation, GtkPrintContext *context, int page_nr, gpointer user_data)
+{
+       NMABarCodeWidget *self = NMA_BAR_CODE_WIDGET (user_data);
+       NMABarCodeWidgetPrivate *priv = NMA_BAR_CODE_WIDGET_GET_PRIVATE (self);
+       cairo_t *cr = gtk_print_context_get_cairo_context (context);
+       double width = gtk_print_context_get_width (context);
+       double height = gtk_print_context_get_height (context);
+       int count_x = width / CARD_WIDTH_PT;
+       int count_y = height / CARD_HEIGHT_PT;
+       double spacing_x = (width - (count_x * CARD_WIDTH_PT)) / (count_x + 1);
+       double spacing_y = (height - (count_y * CARD_HEIGHT_PT)) / (count_y + 1);
+       NMSettingWireless *s_wireless;
+       NMSettingWirelessSecurity *s_wsec;
+       gs_free char *nmcli_line1 = NULL;
+       gs_free char *nmcli_line2 = NULL;
+       const char *psk = NULL;
+       GBytes *ssid_bytes;
+       char *ssid;
+       char *tmp;
+       int x, y;
+
+       s_wireless = nm_connection_get_setting_wireless (priv->connection);
+       if (!s_wireless) {
+               nma_bar_code_set_text (priv->qr, NULL);
+               gtk_widget_queue_draw (priv->qr_code);
+               return;
+       }
+
+       ssid_bytes = nm_setting_wireless_get_ssid (s_wireless);
+       g_return_if_fail (ssid_bytes);
+       ssid = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid_bytes, NULL),
+                                     g_bytes_get_size (ssid_bytes));
+       g_return_if_fail (ssid);
+
+       s_wsec = nm_connection_get_setting_wireless_security (priv->connection);
+       if (s_wsec)
+               psk = nm_setting_wireless_security_get_psk (s_wsec);
+
+       tmp = shell_escape (ssid);
+       nmcli_line1 = g_strdup_printf ("$ nmcli d wifi con %s%s", tmp, psk ? " \\" : "");
+       g_free (tmp);
+
+       if (psk) {
+               tmp = shell_escape (psk);
+               nmcli_line2 = g_strdup_printf ("password %s", tmp);
+               g_free (tmp);
+       }
+
+       for (y = 0; y < count_y; y++) {
+               cairo_save (cr);
+
+               cairo_translate (cr, spacing_x, spacing_y);
+
+               for (x = 0; x < count_x; x++) {
+                       draw_one (self, cr, psk, ssid, nmcli_line1, nmcli_line2);
+                       cairo_translate (cr, CARD_WIDTH_PT + spacing_x, 0);
+               }
+
+               cairo_restore (cr);
+               cairo_translate (cr, 0, CARD_HEIGHT_PT + spacing_y);
+       }
+}
+
+static gboolean
+link_activated (GtkLabel *label, char *uri, gpointer user_data)
+{
+       NMABarCodeWidget *self = NMA_BAR_CODE_WIDGET (user_data);
+       GtkPrintOperation *print = gtk_print_operation_new ();
+       GtkWidget *window;
+       GError *error = NULL;
+
+       g_return_val_if_fail (strcmp (uri, "nma:print") == 0, FALSE);
+
+       window = gtk_widget_get_ancestor (GTK_WIDGET (self), GTK_TYPE_WINDOW);
+
+       gtk_print_operation_set_n_pages (print, 1);
+       gtk_print_operation_set_use_full_page (print, TRUE);
+       gtk_print_operation_set_unit (print, GTK_UNIT_POINTS);
+       g_signal_connect (print, "draw_page", G_CALLBACK (draw_page), self);
+
+       if (!gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
+                                     window ? GTK_WINDOW (window) : NULL, &error)) {
+               g_printerr ("%s", error->message);
+               g_error_free (error);
+       }
+
+       g_object_unref (print);
+
+       return FALSE;
+}
+
+static void
+string_append_mecard (GString *string, const char *tag, const char *text)
+{
+       const char *p;
+       bool is_hex = TRUE;
+       int start;
+
+       if (!text)
+               return;
+
+       g_string_append (string, tag);
+       start = string->len;
+
+       for (p = text; *p; p++) {
+               if (!g_ascii_isxdigit (*p))
+                       is_hex = FALSE;
+               if (strchr ("\\\":;,", *p))
+                       g_string_append_c (string, '\\');
+               g_string_append_c (string, *p);
+       }
+
+       if (is_hex) {
+               g_string_insert_c (string, start, '\"');
+               g_string_append_c (string, '\"');
+       }
+       g_string_append_c (string, ';');
+}
+
+static void
+update_qr_code (NMABarCodeWidget *self)
+{
+       NMABarCodeWidgetPrivate *priv = NMA_BAR_CODE_WIDGET_GET_PRIVATE (self);
+       NMSettingWireless *s_wireless;
+       NMSettingWirelessSecurity *s_wsec;
+       const char *key_mgmt = NULL;
+       const char *psk = NULL;
+       const char *type = NULL;
+       GBytes *ssid_bytes;
+       char *ssid;
+       GString *string;
+
+       if (!priv->qr)
+               return;
+
+       s_wireless = nm_connection_get_setting_wireless (priv->connection);
+       if (!s_wireless) {
+               nma_bar_code_set_text (priv->qr, NULL);
+               gtk_widget_queue_draw (priv->qr_code);
+               return;
+       }
+
+       ssid_bytes = nm_setting_wireless_get_ssid (s_wireless);
+       g_return_if_fail (ssid_bytes);
+       ssid = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid_bytes, NULL),
+                                     g_bytes_get_size (ssid_bytes));
+       g_return_if_fail (ssid);
+
+       string = g_string_sized_new (64);
+       g_string_append (string, "WIFI:");
+
+       s_wsec = nm_connection_get_setting_wireless_security (priv->connection);
+       if (s_wsec) {
+               key_mgmt = nm_setting_wireless_security_get_key_mgmt (s_wsec);
+               psk = nm_setting_wireless_security_get_psk (s_wsec);
+       }
+
+       if (key_mgmt == NULL) {
+               type = "nopass";
+       } else if (   strcmp (key_mgmt, "none") == 0
+                  || strcmp (key_mgmt, "ieee8021x") == 0) {
+               type = "WEP";
+       } else if (   strcmp (key_mgmt, "wpa-none") == 0
+                  || strcmp (key_mgmt, "wpa-psk") == 0) {
+               type = "WPA";
+       }
+
+       string_append_mecard(string, "T:", type);
+       string_append_mecard(string, "S:", ssid);
+       string_append_mecard(string, "P:", psk);
+
+       if (nm_setting_wireless_get_hidden (s_wireless))
+               g_string_append (string, "H:true;");
+
+       g_string_append_c (string, ';');
+       nma_bar_code_set_text (priv->qr, string->str);
+       gtk_widget_queue_draw (priv->qr_code);
+       g_string_free (string, TRUE);
+}
+
+static void
+set_connection (NMABarCodeWidget *self, NMConnection *connection)
+{
+       NMABarCodeWidgetPrivate *priv = NMA_BAR_CODE_WIDGET_GET_PRIVATE (self);
+
+       if (priv->connection) {
+               g_signal_handlers_disconnect_by_data (priv->connection, self);
+               g_clear_object (&priv->connection);
+       }
+
+       if (connection) {
+               priv->connection = connection;
+               g_signal_connect_swapped (connection, "changed", G_CALLBACK (update_qr_code), self);
+               g_signal_connect_swapped (connection, "secrets-updated", G_CALLBACK (update_qr_code), self);
+       }
+}
+
+static void
+get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+       NMABarCodeWidgetPrivate *priv = NMA_BAR_CODE_WIDGET_GET_PRIVATE (object);
+
+       switch (prop_id) {
+       case PROP_CONNECTION:
+               g_value_set_object (value, priv->connection);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+               break;
+       }
+}
+
+static void
+set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+       NMABarCodeWidget *self = NMA_BAR_CODE_WIDGET (object);
+
+       switch (prop_id) {
+       case PROP_CONNECTION:
+               set_connection (self, g_value_dup_object (value));
+               update_qr_code (self);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+               break;
+       }
+}
+
+static void
+nma_bar_code_widget_init (NMABarCodeWidget *self)
+{
+       NMABarCodeWidgetPrivate *priv = NMA_BAR_CODE_WIDGET_GET_PRIVATE (self);
+
+       gtk_widget_init_template (GTK_WIDGET (self));
+
+       priv->qr = nma_bar_code_new (NULL);
+       g_signal_connect (priv->qr_code, "draw", G_CALLBACK (qr_code_draw), self);
+}
+
+/**
+ * nma_bar_code_widget_new:
+ * @connection: connection to get network details from
+ *
+ * Returns: (transfer full): the bar code widget instance
+ *
+ * Since: 1.8.22
+ */
+GtkWidget *
+nma_bar_code_widget_new (NMConnection *connection)
+{
+       return g_object_new (NMA_TYPE_BAR_CODE_WIDGET,
+                            NMA_BAR_CODE_WIDGET_CONNECTION, connection,
+                            NULL);
+}
+
+static void
+finalize (GObject *object)
+{
+       NMABarCodeWidget *self = NMA_BAR_CODE_WIDGET (object);
+       NMABarCodeWidgetPrivate *priv = NMA_BAR_CODE_WIDGET_GET_PRIVATE (self);
+
+       g_clear_object (&priv->qr);
+       set_connection (self, NULL);
+
+       G_OBJECT_CLASS (nma_bar_code_widget_parent_class)->finalize (object);
+}
+
+static void
+nma_bar_code_widget_class_init (NMABarCodeWidgetClass *klass)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (klass);
+       GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+       object_class->get_property = get_property;
+       object_class->set_property = set_property;
+       object_class->finalize = finalize;
+
+       g_object_class_install_property
+               (object_class, PROP_CONNECTION,
+                g_param_spec_object (NMA_BAR_CODE_WIDGET_CONNECTION, "", "",
+                                     NM_TYPE_CONNECTION,
+                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+
+       gtk_widget_class_set_template_from_resource (widget_class,
+                                                    
"/org/freedesktop/network-manager-applet/nma-bar-code-widget.ui");
+
+       gtk_widget_class_bind_template_child_private (widget_class, NMABarCodeWidget, qr_code);
+       gtk_widget_class_bind_template_callback (widget_class, link_activated);
+}
diff --git a/src/libnma/nma-bar-code-widget.h b/src/libnma/nma-bar-code-widget.h
new file mode 100644
index 00000000..d12782e5
--- /dev/null
+++ b/src/libnma/nma-bar-code-widget.h
@@ -0,0 +1,43 @@
+/* nma-bar-code.h - Widget that renders a "QR" code
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the ree Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * Copyright (C) 2018, 2019 Red Hat, Inc.
+ */
+
+#ifndef __NMA_BAR_CODE_WIDGET_H__
+#define __NMA_BAR_CODE_WIDGET_H__
+
+#include <glib-object.h>
+
+#include "nma-version.h"
+
+#define NMA_TYPE_BAR_CODE_WIDGET            (nma_bar_code_widget_get_type ())
+#define NMA_BAR_CODE_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMA_TYPE_BAR_CODE_WIDGET, 
NMABarCodeWidget))
+#define NMA_BAR_CODE_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NMA_TYPE_BAR_CODE_WIDGET, 
NMABarCodeWidgetClass))
+#define NMA_IS_BAR_CODE_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMA_TYPE_BAR_CODE_WIDGET))
+#define NMA_IS_BAR_CODE_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NMA_TYPE_BAR_CODE_WIDGET))
+#define NMA_BAR_CODE_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NMA_TYPE_BAR_CODE_WIDGET, 
NMABarCodeWidgetClass))
+
+#define NMA_BAR_CODE_WIDGET_CONNECTION "connection"
+
+typedef struct _NMABarCodeWidget       NMABarCodeWidget;
+typedef struct _NMABarCodeWidgetClass  NMABarCodeWidgetClass;
+
+NMA_AVAILABLE_IN_1_8_22
+GType       nma_bar_code_widget_get_type (void) G_GNUC_CONST;
+
+NMA_AVAILABLE_IN_1_8_22
+GtkWidget  *nma_bar_code_widget_new (NMConnection *connection);
+
+#endif /* __NMA_BAR_CODE_WIDGET_H__ */
diff --git a/src/libnma/nma-bar-code-widget.ui b/src/libnma/nma-bar-code-widget.ui
new file mode 100644
index 00000000..d88f17c6
--- /dev/null
+++ b/src/libnma/nma-bar-code-widget.ui
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface domain="nm-applet">
+  <requires lib="gtk+" version="3.20"/>
+  <template class="NMABarCodeWidget" parent="GtkBox">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="margin_start">6</property>
+    <property name="margin_end">6</property>
+    <property name="margin_top">6</property>
+    <property name="margin_bottom">6</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkAspectFrame">
+        <property name="expand">True</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0.5</property>
+        <child>
+          <object class="GtkDrawingArea" id="qr_code">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel">
+        <property name="expand">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Scan with your phone or &lt;a 
href="nma:print"&gt;Print&lt;/a&gt;</property>
+        <property name="use_markup">True</property>
+        <signal name="activate-link" handler="link_activated" swapped="no"/>
+      </object>
+      <packing>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </template>
+</interface>
diff --git a/src/libnma/nma-bar-code.c b/src/libnma/nma-bar-code.c
new file mode 100644
index 00000000..0efa9f12
--- /dev/null
+++ b/src/libnma/nma-bar-code.c
@@ -0,0 +1,222 @@
+/* nma-bar-code.h - Renderer of a "QR" code
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the ree Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * Copyright 2018, 2019 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include <stdint.h>
+
+#include "nma-bar-code.h"
+
+/*
+ * The aim of this class is to provide a GObject-y QR code generator based
+ * on qrcodegen library [1].  We purposefully include it directly instead
+ * of compiling it separately, while providing a much less flexible (and
+ * more straightforward) API. This way we the compiler does a good job at
+ * slimming things down (chopping off half of the library) while allowing
+ * us to leave the original source unmodified for easier maintenance.
+ *
+ * [1] https://github.com/nayuki/QR-Code-generator
+ */
+
+#pragma GCC visibility push(hidden)
+NM_PRAGMA_WARNING_DISABLE("-Wdeclaration-after-statement")
+#define NDEBUG
+#include "qrcodegen.c"
+NM_PRAGMA_WARNING_REENABLE
+#pragma GCC visibility pop
+
+struct _NMABarCode {
+       GObject parent;
+};
+
+struct _NMABarCodeClass {
+       GObjectClass parent_class;
+};
+
+typedef struct {
+       uint8_t qrcode[qrcodegen_BUFFER_LEN_FOR_VERSION (qrcodegen_VERSION_MAX)];
+} NMABarCodePrivate;
+
+/**
+ * SECTION:nma-bar-code
+ * @title: NMABarCode
+ *
+ * A Bar Code object provides the means of drawing a QR code onto a cairo
+ * context. Useful for rendering Wi-Fi network credential in a form that
+ * can be optically scanned with a phone camera.
+ */
+
+G_DEFINE_TYPE_WITH_CODE (NMABarCode, nma_bar_code, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (NMABarCode))
+
+enum {
+       PROP_0,
+       PROP_TEXT,
+       PROP_SIZE,
+
+       LAST_PROP
+};
+
+#define NMA_BAR_CODE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NMA_TYPE_BAR_CODE, NMABarCodePrivate))
+
+/**
+ * nma_bar_code_set_text:
+ * @self: bar code instance
+ * @text: new bar code text
+ *
+ * Regenerates the QR code for a different text.
+ *
+ * Since: 1.8.22
+ */
+
+void
+nma_bar_code_set_text (NMABarCode *self, const char *text)
+{
+       g_object_set (self, NMA_BAR_CODE_TEXT, text, NULL);
+}
+
+/**
+ * nma_bar_code_get_size:
+ * @self: bar code instance
+ *
+ * Returns: the side of a QR code square.
+ *
+ * Since: 1.8.22
+ */
+
+int
+nma_bar_code_get_size (NMABarCode *self)
+{
+       int size;
+
+       g_object_get (self, NMA_BAR_CODE_SIZE, &size, NULL);
+       return size;
+}
+
+/**
+ * nma_bar_code_draw:
+ * @self: bar code instance
+ * @cr: cairo context
+ *
+ * Draws the QR code onto the given context.
+ *
+ * Since: 1.8.22
+ */
+
+void
+nma_bar_code_draw (NMABarCode *self, cairo_t *cr)
+{
+       NMABarCodePrivate *priv = NMA_BAR_CODE_GET_PRIVATE (self);
+       int x, y, size;
+
+       size = qrcodegen_getSize (priv->qrcode);
+       cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
+
+       for (y = 0; y < size; y++) {
+               for (x = 0; x < size; x++) {
+                       if (qrcodegen_getModule (priv->qrcode, x, y)) {
+                               cairo_rectangle (cr, x, y, 1, 1);
+                               cairo_fill (cr);
+                       }
+               }
+       }
+}
+
+static void
+get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+       NMABarCodePrivate *priv = NMA_BAR_CODE_GET_PRIVATE (object);
+
+       switch (prop_id) {
+       case PROP_SIZE:
+               g_value_set_int (value, qrcodegen_getSize (priv->qrcode));
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+               break;
+       }
+}
+
+static void
+set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+       NMABarCodePrivate *priv = NMA_BAR_CODE_GET_PRIVATE (object);
+       uint8_t tempBuffer[qrcodegen_BUFFER_LEN_FOR_VERSION (qrcodegen_VERSION_MAX)];
+       const char *text;
+       bool success = FALSE;
+
+       switch (prop_id) {
+       case PROP_TEXT:
+               text = g_value_get_string (value);
+               if (text) {
+                       success = qrcodegen_encodeText(g_value_get_string (value),
+                                                      tempBuffer,
+                                                      priv->qrcode,
+                                                      qrcodegen_Ecc_LOW,
+                                                      qrcodegen_VERSION_MIN,
+                                                      qrcodegen_VERSION_MAX,
+                                                      qrcodegen_Mask_AUTO,
+                                                      FALSE);
+               }
+               if (!success)
+                       bzero (priv->qrcode, sizeof (priv->qrcode));
+               g_object_notify (object, NMA_BAR_CODE_SIZE);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+               break;
+       }
+}
+
+static void
+nma_bar_code_init (NMABarCode *self)
+{
+}
+
+/**
+ * nma_bar_code_new:
+ * @text: set the bar code text
+ *
+ * Returns: (transfer full): the bar code instance
+ *
+ * Since: 1.8.22
+ */
+
+NMABarCode *
+nma_bar_code_new (const char *text)
+{
+       return g_object_new (NMA_TYPE_BAR_CODE, NMA_BAR_CODE_TEXT, text, NULL);
+}
+
+static void
+nma_bar_code_class_init (NMABarCodeClass *klass)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+       object_class->get_property = get_property;
+       object_class->set_property = set_property;
+
+       g_object_class_install_property
+               (object_class, PROP_TEXT,
+                g_param_spec_string (NMA_BAR_CODE_TEXT, "", "",
+                                     "", G_PARAM_WRITABLE));
+
+       g_object_class_install_property
+               (object_class, PROP_SIZE,
+                g_param_spec_int (NMA_BAR_CODE_SIZE, "", "",
+                                  G_MININT, G_MAXINT, 0, G_PARAM_READABLE));
+}
diff --git a/src/libnma/nma-bar-code.h b/src/libnma/nma-bar-code.h
new file mode 100644
index 00000000..143f2f8a
--- /dev/null
+++ b/src/libnma/nma-bar-code.h
@@ -0,0 +1,54 @@
+/* nma-bar-code.h - Widget that renders a "QR" code
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the ree Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * Copyright (C) 2018, 2019 Red Hat, Inc.
+ */
+
+#ifndef __NMA_BAR_CODE_H__
+#define __NMA_BAR_CODE_H__
+
+#include <glib-object.h>
+#include <cairo.h>
+
+#include "nma-version.h"
+
+#define NMA_TYPE_BAR_CODE            (nma_bar_code_get_type ())
+#define NMA_BAR_CODE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMA_TYPE_BAR_CODE, NMABarCode))
+#define NMA_BAR_CODE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NMA_TYPE_BAR_CODE, NMABarCodeClass))
+#define NMA_IS_BAR_CODE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMA_TYPE_BAR_CODE))
+#define NMA_IS_BAR_CODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NMA_TYPE_BAR_CODE))
+#define NMA_BAR_CODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NMA_TYPE_BAR_CODE, NMABarCodeClass))
+
+#define NMA_BAR_CODE_TEXT "text"
+#define NMA_BAR_CODE_SIZE "size"
+
+typedef struct _NMABarCode       NMABarCode;
+typedef struct _NMABarCodeClass  NMABarCodeClass;
+
+NMA_AVAILABLE_IN_1_8_22
+GType       nma_bar_code_get_type (void) G_GNUC_CONST;
+
+NMA_AVAILABLE_IN_1_8_22
+NMABarCode *nma_bar_code_new (const char *text);
+
+NMA_AVAILABLE_IN_1_8_22
+void        nma_bar_code_set_text (NMABarCode *self, const char *text);
+
+NMA_AVAILABLE_IN_1_8_22
+int         nma_bar_code_get_size (NMABarCode *self);
+
+NMA_AVAILABLE_IN_1_8_22
+void        nma_bar_code_draw (NMABarCode *self, cairo_t *cr);
+
+#endif /* __NMA_BAR_CODE_H__ */
diff --git a/src/libnma/nma-cert-chooser-button.c b/src/libnma/nma-cert-chooser-button.c
new file mode 100644
index 00000000..9d5287f5
--- /dev/null
+++ b/src/libnma/nma-cert-chooser-button.c
@@ -0,0 +1,469 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * Copyright (C) 2016,2017 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+#include "nma-cert-chooser-button.h"
+#include "nma-pkcs11-cert-chooser-dialog.h"
+#include "utils.h"
+
+#include <gck/gck.h>
+
+/**
+ * SECTION:nma-cert-chooser-button
+ * @title: NMACertChooserButton
+ * @short_description: The PKCS\#11 or file certificate chooser button
+ *
+ * #NMACertChooserButton is a button that provides a dropdown of
+ * PKCS\#11 slots present in the system and allows choosing a certificate
+ * from either of them or a file.
+ */
+
+enum {
+       COLUMN_LABEL,
+       COLUMN_SLOT,
+       N_COLUMNS
+};
+
+typedef struct {
+       gchar *title;
+       gchar *uri;
+       gchar *pin;
+       gboolean remember_pin;
+       NMACertChooserButtonFlags flags;
+} NMACertChooserButtonPrivate;
+
+G_DEFINE_TYPE (NMACertChooserButton, nma_cert_chooser_button, GTK_TYPE_COMBO_BOX);
+
+#define NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+                                                NMA_TYPE_CERT_CHOOSER_BUTTON, \
+                                                NMACertChooserButtonPrivate))
+
+static gboolean
+is_this_a_slot_nobody_loves (GckSlot *slot)
+{
+       GckSlotInfo *slot_info;
+       gboolean ret_value = FALSE;
+
+       slot_info = gck_slot_get_info (slot);
+       if (!slot_info)
+               return TRUE;
+
+       /* The p11-kit CA trusts do use their filesystem paths for description. */
+       if (g_str_has_prefix (slot_info->slot_description, "/"))
+               ret_value = TRUE;
+       else if (NM_IN_STRSET (slot_info->slot_description,
+                              "SSH Keys",
+                              "Secret Store",
+                              "User Key Storage"))
+               ret_value = TRUE;
+
+       gck_slot_info_free (slot_info);
+
+       return ret_value;
+}
+
+static void
+modules_initialized (GObject *object, GAsyncResult *res, gpointer user_data)
+{
+       NMACertChooserButton *self = NMA_CERT_CHOOSER_BUTTON (user_data);
+       GList *slots;
+       GList *list_iter;
+       GError *error = NULL;
+       GList *modules;
+       GtkTreeIter iter;
+       GtkListStore *model;
+       GckTokenInfo *info;
+       gchar *label;
+
+       modules = gck_modules_initialize_registered_finish (res, &error);
+       if (error) {
+               /* The Front Fell Off. */
+               g_warning ("Error getting registered modules: %s", error->message);
+               g_clear_error (&error);
+       }
+
+       model = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (self)));
+
+       /* A separator. */
+       gtk_list_store_insert_with_values (model, &iter, 2,
+                                          COLUMN_LABEL, NULL,
+                                          COLUMN_SLOT, NULL, -1);
+
+       slots = gck_modules_get_slots (modules, FALSE);
+       for (list_iter = slots; list_iter; list_iter = list_iter->next) {
+               GckSlot *slot = GCK_SLOT (list_iter->data);
+
+               if (is_this_a_slot_nobody_loves (slot))
+                       continue;
+
+               info = gck_slot_get_token_info (slot);
+               if (!info) {
+                       /* This happens when the slot has no token inserted.
+                        * Don't add this one to the list. The other widgets
+                        * assume gck_slot_get_token_info() don't fail and a slot
+                        * for which it does is essentially useless as it can't be
+                        * used for crafting an URI. */
+                       continue;
+               }
+
+               if ((info->flags & CKF_TOKEN_INITIALIZED) == 0)
+                       continue;
+
+               if (info->label && *info->label) {
+                       label = g_strdup_printf ("%s\342\200\246", info->label);
+               } else if (info->model && *info->model) {
+                       g_warning ("The token doesn't have a valid label");
+                       label = g_strdup_printf ("%s\342\200\246", info->model);
+               } else {
+                       g_warning ("The token has neither valid label nor model");
+                       label = g_strdup ("(Unknown)\342\200\246");
+               }
+               gtk_list_store_insert_with_values (model, &iter, 2,
+                                                  COLUMN_LABEL, label,
+                                                  COLUMN_SLOT, slot, -1);
+               g_free (label);
+               gck_token_info_free (info);
+       }
+
+       gck_list_unref_free (slots);
+       gck_list_unref_free (modules);
+}
+
+static void
+update_title (NMACertChooserButton *button)
+{
+       NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+       GckUriData *data;
+       GtkTreeIter iter;
+       GtkTreeModel *model;
+       gs_free char *label = NULL;
+       GError *error = NULL;
+
+       model = gtk_combo_box_get_model (GTK_COMBO_BOX (button));
+
+       if (!gtk_tree_model_get_iter_first (model, &iter))
+               g_return_if_reached ();
+
+       if (!priv->uri) {
+               label = g_strdup (_("(None)"));
+       } else if (g_str_has_prefix (priv->uri, "pkcs11:")) {
+               data = gck_uri_parse (priv->uri, GCK_URI_FOR_ANY, &error);
+               if (data) {
+                       if (!gck_attributes_find_string (data->attributes, CKA_LABEL, &label)) {
+                               if (data->token_info) {
+                                       g_free (label);
+                                       label = g_strdup_printf (  priv->flags & 
NMA_CERT_CHOOSER_BUTTON_FLAG_KEY
+                                                                ? _("Key in %s")
+                                                                : _("Certificate in %s"),
+                                                                data->token_info->label);
+                               }
+                       }
+                       gck_uri_data_free (data);
+               } else {
+                       g_warning ("Bad URI '%s': %s\n", priv->uri, error->message);
+                       g_error_free (error);
+               }
+       } else {
+               label = priv->uri;
+               if (g_str_has_prefix (label, "file://"))
+                       label += 7;
+               if (g_strrstr (label, "/"))
+                       label = g_strrstr (label, "/") + 1;
+               label = g_strdup (label);
+       }
+
+       gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                           COLUMN_LABEL, label ?: _("(Unknown)"),
+                           -1);
+}
+
+static void
+select_from_token (NMACertChooserButton *button, GckSlot *slot)
+{
+       NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+       GtkWidget *toplevel;
+       GtkWidget *dialog;
+
+       toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
+       if (!gtk_widget_is_toplevel (toplevel) || !GTK_IS_WINDOW (toplevel))
+               toplevel = NULL;
+
+       dialog = nma_pkcs11_cert_chooser_dialog_new (slot,
+                                                      priv->flags & NMA_CERT_CHOOSER_BUTTON_FLAG_KEY
+                                                    ? CKO_PRIVATE_KEY
+                                                    : CKO_CERTIFICATE,
+                                                    priv->title,
+                                                    GTK_WINDOW (toplevel),
+                                                    GTK_FILE_CHOOSER_ACTION_OPEN | GTK_DIALOG_USE_HEADER_BAR,
+                                                    _("Select"), GTK_RESPONSE_ACCEPT,
+                                                    _("Cancel"), GTK_RESPONSE_CANCEL,
+                                                    NULL);
+       if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
+               if (priv->uri)
+                       g_free (priv->uri);
+               priv->uri = nma_pkcs11_cert_chooser_dialog_get_uri (NMA_PKCS11_CERT_CHOOSER_DIALOG (dialog));
+               if (priv->pin)
+                       g_free (priv->pin);
+               priv->pin = nma_pkcs11_cert_chooser_dialog_get_pin (NMA_PKCS11_CERT_CHOOSER_DIALOG (dialog));
+               priv->remember_pin = nma_pkcs11_cert_chooser_dialog_get_remember_pin 
(NMA_PKCS11_CERT_CHOOSER_DIALOG (dialog));
+               update_title (button);
+       }
+       gtk_widget_destroy (dialog);
+}
+
+static void
+select_from_file (NMACertChooserButton *button)
+{
+       NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+       GtkWidget *toplevel;
+       GtkWidget *dialog;
+
+       toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
+       if (!gtk_widget_is_toplevel (toplevel) || !GTK_IS_WINDOW (toplevel))
+               toplevel = NULL;
+
+       dialog = gtk_file_chooser_dialog_new (priv->title,
+                                             GTK_WINDOW (toplevel),
+                                             GTK_FILE_CHOOSER_ACTION_OPEN,
+                                             _("Select"), GTK_RESPONSE_ACCEPT,
+                                             _("Cancel"), GTK_RESPONSE_CANCEL,
+                                             NULL);
+
+       if (priv->flags & NMA_CERT_CHOOSER_BUTTON_FLAG_KEY)
+               gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), utils_key_filter ());
+       else
+               gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), utils_cert_filter ());
+
+       if (priv->uri)
+               gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog), priv->uri);
+       gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+       if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
+               if (priv->uri)
+                       g_free (priv->uri);
+               priv->uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+               if (priv->pin) {
+                       g_free (priv->pin);
+                       priv->pin = NULL;
+               }
+               priv->remember_pin = FALSE;
+               update_title (button);
+       }
+       gtk_widget_destroy (dialog);
+}
+
+static void
+dispose (GObject *object)
+{
+       NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (object);
+
+       nm_clear_g_free (&priv->title);
+       nm_clear_g_free (&priv->uri);
+       nm_clear_g_free (&priv->pin);
+}
+
+static void
+changed (GtkComboBox *combo_box)
+{
+       GtkTreeIter iter;
+       GtkTreeModel *model;
+       gchar *label;
+       GckSlot *slot;
+
+       if (gtk_combo_box_get_active (combo_box) == 0)
+               return;
+
+       g_signal_stop_emission_by_name (combo_box, "changed");
+       gtk_combo_box_get_active_iter (combo_box, &iter);
+
+       model = gtk_combo_box_get_model (combo_box);
+       gtk_tree_model_get (model, &iter,
+                           COLUMN_LABEL, &label,
+                           COLUMN_SLOT, &slot, -1);
+       if (slot)
+               select_from_token (NMA_CERT_CHOOSER_BUTTON (combo_box), slot);
+       else
+               select_from_file (NMA_CERT_CHOOSER_BUTTON (combo_box));
+
+       g_free (label);
+       g_clear_object (&slot);
+       gtk_combo_box_set_active (combo_box, 0);
+}
+
+static void
+nma_cert_chooser_button_class_init (NMACertChooserButtonClass *klass)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (klass);
+       GtkComboBoxClass *combo_box_class = GTK_COMBO_BOX_CLASS (klass);
+
+       g_type_class_add_private (object_class, sizeof (NMACertChooserButtonPrivate));
+
+       object_class->dispose = dispose;
+       combo_box_class->changed = changed;
+}
+
+static void
+nma_cert_chooser_button_init (NMACertChooserButton *self)
+{
+       gck_modules_initialize_registered_async (NULL, modules_initialized, self);
+}
+
+static gboolean
+row_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+       gchar *label;
+       GckSlot *slot;
+
+       gtk_tree_model_get (model, iter, 0, &label, 1, &slot, -1);
+       if (label == NULL && slot == NULL)
+               return TRUE;
+       g_free (label);
+       g_clear_object (&slot);
+
+       return FALSE;
+}
+
+/**
+ * nma_cert_chooser_button_set_title:
+ * @button: the #NMACertChooserButton instance
+ * @title: the title of the token or file chooser dialogs
+ *
+ * Set the title of file or PKCS\#11 object chooser dialogs.
+ */
+void
+nma_cert_chooser_button_set_title (NMACertChooserButton *button, const gchar *title)
+{
+       NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+
+       if (priv->title)
+               g_free (priv->title);
+       priv->title = g_strdup (title);
+}
+
+/**
+ * nma_cert_chooser_button_get_uri:
+ * @button: the #NMACertChooserButton instance
+ *
+ * Obtain the URI of the selected obejct -- either of
+ * "pkcs11" or "file" scheme.
+ *
+ * Returns: the URI or %NULL if none was selected.
+ */
+const gchar *
+nma_cert_chooser_button_get_uri (NMACertChooserButton *button)
+{
+       NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+
+       return priv->uri;
+}
+
+/**
+ * nma_cert_chooser_button_set_uri:
+ * @button: the #NMACertChooserButton instance
+ * @uri: the URI
+ *
+ * Set the chosen URI to given string.
+ */
+void
+nma_cert_chooser_button_set_uri (NMACertChooserButton *button, const gchar *uri)
+{
+       NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+
+       if (priv->uri)
+               g_free (priv->uri);
+       priv->uri = g_strdup (uri);
+       update_title (button);
+}
+
+/**
+ * nma_cert_chooser_button_get_pin:
+ * @button: the #NMACertChooserButton instance
+ *
+ * Obtain the PIN that was used to unlock the token.
+ *
+ * Returns: the PIN, %NULL if the token was not logged into or an emtpy
+ *   string ("") if the protected authentication path was used.
+ */
+gchar *
+nma_cert_chooser_button_get_pin (NMACertChooserButton *button)
+{
+       NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+
+       return g_strdup (priv->pin);
+}
+
+/**
+ * nma_cert_chooser_button_get_remember_pin:
+ * @button: the #NMACertChooserButton instance
+ *
+ * Obtain the value of the "Remember PIN" checkbox during the token login.
+ *
+ * Returns: TRUE if the user chose to remember the PIN, FALSE
+ *   if not or if the tokin was not logged into at all.
+ */
+gboolean
+nma_cert_chooser_button_get_remember_pin (NMACertChooserButton *button)
+{
+       NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+
+       return priv->remember_pin;
+}
+
+/**
+ * nma_cert_chooser_button_new:
+ * @flags: the flags configuring the behavior of the chooser dialogs
+ *
+ * Creates the new button that can select certificates from
+ * files or PKCS\#11 tokens.
+ *
+ * Returns: the newly created #NMACertChooserButton
+ */
+GtkWidget *
+nma_cert_chooser_button_new (NMACertChooserButtonFlags flags)
+{
+       GtkWidget *self;
+       GtkListStore *model;
+       GtkTreeIter iter;
+       GtkCellRenderer *cell;
+       NMACertChooserButtonPrivate *priv;
+
+       model = gtk_list_store_new (2, G_TYPE_STRING, GCK_TYPE_SLOT);
+       self = g_object_new (NMA_TYPE_CERT_CHOOSER_BUTTON,
+                            "model", model,
+                            "popup-fixed-width", TRUE,
+                            NULL);
+       g_object_unref (model);
+
+       priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (self);
+       priv->flags = flags;
+
+       gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (self),
+                                             row_separator,
+                                             NULL,
+                                             NULL);
+
+       /* The first entry with current object name. */
+       gtk_list_store_insert_with_values (model, &iter, 0,
+                                          COLUMN_LABEL, NULL,
+                                          COLUMN_SLOT, NULL, -1);
+       update_title (NMA_CERT_CHOOSER_BUTTON (self));
+
+       /* The separator and the last entry. The tokens will be added in between. */
+       gtk_list_store_insert_with_values (model, &iter, 1,
+                                          COLUMN_LABEL, NULL,
+                                          COLUMN_SLOT, NULL, -1);
+       gtk_list_store_insert_with_values (model, &iter, 2,
+                                          COLUMN_LABEL, _("Select from file\342\200\246"),
+                                          COLUMN_SLOT, NULL, -1);
+
+       cell = gtk_cell_renderer_text_new ();
+       gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), cell, FALSE);
+       gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (self), cell, "text", 0);
+       gtk_combo_box_set_active (GTK_COMBO_BOX (self), 0);
+
+       return self;
+}
diff --git a/src/libnma/nma-cert-chooser-button.h b/src/libnma/nma-cert-chooser-button.h
new file mode 100644
index 00000000..fcc54680
--- /dev/null
+++ b/src/libnma/nma-cert-chooser-button.h
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * Copyright (C) 2016,2017 Red Hat, Inc.
+ */
+
+#ifndef __NMA_CERT_CHOOSER_BUTTON_H__
+#define __NMA_CERT_CHOOSER_BUTTON_H__
+
+#include <gtk/gtk.h>
+
+/**
+ * NMACertChooserButtonFlags:
+ * @NMA_CERT_CHOOSER_BUTTON_FLAG_NONE: defaults
+ * @NMA_CERT_CHOOSER_BUTTON_FLAG_KEY: only allow choosing a key
+ *
+ * Unless NMA_CERT_CHOOSER_BUTTON_FLAG_KEY is chosen, the
+ * choosers allow picking a certificate or a certificate with
+ * key in a single object (PKCS\#11 URI or a PKCS\#12 archive).
+ */
+typedef enum {
+       NMA_CERT_CHOOSER_BUTTON_FLAG_NONE = 0,
+       NMA_CERT_CHOOSER_BUTTON_FLAG_KEY  = 1,
+} NMACertChooserButtonFlags;
+
+typedef struct {
+       GtkComboBox parent;
+} NMACertChooserButton;
+
+typedef struct {
+       GtkComboBoxClass parent;
+} NMACertChooserButtonClass;
+
+#define NMA_TYPE_CERT_CHOOSER_BUTTON            (nma_cert_chooser_button_get_type ())
+#define NMA_CERT_CHOOSER_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
NMA_TYPE_CERT_CHOOSER_BUTTON, NMACertChooserButton))
+#define NMA_CERT_CHOOSER_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), 
NMA_TYPE_CERT_CHOOSER_BUTTON, NMACertChooserButtonClass))
+#define NMA_IS_CERT_CHOOSER_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
NMA_TYPE_CERT_CHOOSER_BUTTON))
+#define NMA_IS_CERT_CHOOSER_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), 
NMA_TYPE_CERT_CHOOSER_BUTTON))
+#define NMA_CERT_CHOOSER_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
NMA_TYPE_CERT_CHOOSER_BUTTON, NMACertChooserButtonClass))
+
+GType nma_cert_chooser_button_get_type (void);
+
+void nma_cert_chooser_button_set_title (NMACertChooserButton *button,
+                                        const gchar *title);
+
+const gchar *nma_cert_chooser_button_get_uri (NMACertChooserButton *button);
+
+void nma_cert_chooser_button_set_uri (NMACertChooserButton *button,
+                                      const gchar *uri);
+
+gchar *nma_cert_chooser_button_get_pin (NMACertChooserButton *button);
+
+gboolean nma_cert_chooser_button_get_remember_pin (NMACertChooserButton *button);
+
+GtkWidget *nma_cert_chooser_button_new (NMACertChooserButtonFlags flags);
+
+#endif /* __NMA_CERT_CHOOSER_BUTTON_H__ */
diff --git a/src/libnma/nma-cert-chooser-private.h b/src/libnma/nma-cert-chooser-private.h
new file mode 100644
index 00000000..dcfc8ccc
--- /dev/null
+++ b/src/libnma/nma-cert-chooser-private.h
@@ -0,0 +1,143 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * Copyright (C) 2015,2017 Red Hat, Inc.
+ */
+
+#ifndef NMA_CERT_CHOOSER_PRIVATE_H
+#define NMA_CERT_CHOOSER_PRIVATE_H
+
+#include "nma-cert-chooser.h"
+
+typedef struct _NMACertChooserVtable NMACertChooserVtable;
+
+typedef struct {
+       GtkWidget *key_button_label;
+       GtkWidget *key_password_label;
+       GtkWidget *cert_button_label;
+       GtkWidget *key_button;
+       GtkWidget *key_password;
+       GtkWidget *cert_button;
+       GtkWidget *show_password;
+} NMAFileCertChooserPrivate;
+
+typedef struct {
+       GtkWidget *key_button_label;
+       GtkWidget *key_password_label;
+       GtkWidget *cert_button_label;
+       GtkWidget *cert_password_label;
+       GtkWidget *key_button;
+       GtkWidget *key_password;
+       GtkWidget *cert_button;
+       GtkWidget *cert_password;
+       GtkWidget *show_password;
+} NMAPkcs11CertChooserPrivate;
+
+typedef struct {
+       const NMACertChooserVtable *vtable;
+
+       struct {
+               union {
+                       NMAFileCertChooserPrivate file;
+                       NMAPkcs11CertChooserPrivate pkcs11;
+               };
+       } _sub;
+} NMACertChooserPrivate;
+
+struct _NMACertChooser {
+       GtkGrid parent;
+       NMACertChooserPrivate _priv;
+};
+
+struct _NMACertChooserClass {
+       GtkGridClass parent_class;
+};
+
+/**
+ * NMACertChooserVtable:
+ * @init: called early to initialize the type.
+ * @set_cert_uri: Set the certificate location for the chooser button.
+ * @get_cert_uri: Get the real certificate location from the chooser button along
+ *   with the scheme.
+ * @set_cert_password: Set the password or a PIN that might be required to
+ *   access the certificate.
+ * @get_cert_password: Obtain the password or a PIN that was be required to
+ *   access the certificate.
+ * @set_key_uri: Set the key location for the chooser button.
+ * @get_key_uri: Get the real key location from the chooser button along with the
+ *   scheme.
+ * @set_key_password: Set the password or a PIN that might be required to
+ *   access the key.
+ * @get_key_password: Obtain the password or a PIN that was be required to
+ *   access the key.
+ * @add_to_size_group: Add the labels to the specified size group so that they
+ *   are aligned.
+ * @validate: Validate whether the chosen values make sense.
+ * @setup_cert_password_storage: Set up certificate password storage.
+ * @update_cert_password_storage: Update certificate password storage.
+ * @get_cert_password_flags: Return secret flags corresponding to the
+ *   certificate password if one is present.
+ * @setup_key_password_storage: Set up key password storage.
+ * @update_key_password_storage: Update key password storage.
+ * @get_key_password_flags: Returns secret flags corresponding to the key
+ *   password if one is present.
+ * @set_title: Setup the title property
+ * @set_flags: Setup the flags property
+ */
+struct _NMACertChooserVtable {
+       void                 (*init)                         (NMACertChooser *cert_chooser);
+       void                 (*set_cert_uri)                 (NMACertChooser *cert_chooser,
+                                                             const gchar *uri);
+       gchar               *(*get_cert_uri)                 (NMACertChooser *cert_chooser);
+       void                 (*set_cert_password)            (NMACertChooser *cert_chooser,
+                                                             const gchar *password);
+       const gchar         *(*get_cert_password)            (NMACertChooser *cert_chooser);
+       void                 (*set_key_uri)                  (NMACertChooser *cert_chooser,
+                                                             const gchar *uri);
+       gchar               *(*get_key_uri)                  (NMACertChooser *cert_chooser);
+       void                 (*set_key_password)             (NMACertChooser *cert_chooser,
+                                                             const gchar *password);
+       const gchar         *(*get_key_password)             (NMACertChooser *cert_chooser);
+
+       void                 (*add_to_size_group)            (NMACertChooser *cert_chooser,
+                                                             GtkSizeGroup *group);
+       gboolean             (*validate)                     (NMACertChooser *cert_chooser,
+                                                             GError **error);
+
+       void                 (*setup_cert_password_storage)  (NMACertChooser *cert_chooser,
+                                                             NMSettingSecretFlags initial_flags,
+                                                             NMSetting *setting,
+                                                             const char *password_flags_name,
+                                                             gboolean with_not_required,
+                                                             gboolean ask_mode);
+       void                 (*update_cert_password_storage) (NMACertChooser *cert_chooser,
+                                                             NMSettingSecretFlags secret_flags,
+                                                             NMSetting *setting,
+                                                             const char *password_flags_name);
+       NMSettingSecretFlags (*get_cert_password_flags)      (NMACertChooser *cert_chooser);
+       void                 (*setup_key_password_storage)   (NMACertChooser *cert_chooser,
+                                                             NMSettingSecretFlags initial_flags,
+                                                             NMSetting *setting,
+                                                             const char *password_flags_name,
+                                                             gboolean with_not_required,
+                                                             gboolean ask_mode);
+       void                 (*update_key_password_storage)  (NMACertChooser *cert_chooser,
+                                                             NMSettingSecretFlags secret_flags,
+                                                             NMSetting *setting,
+                                                             const char *password_flags_name);
+       NMSettingSecretFlags (*get_key_password_flags)       (NMACertChooser *cert_chooser);
+
+       void         (*set_title)                            (NMACertChooser *cert_chooser,
+                                                             const gchar *title);
+       void         (*set_flags)                            (NMACertChooser *cert_chooser,
+                                                             NMACertChooserFlags flags);
+};
+
+extern const NMACertChooserVtable nma_cert_chooser_vtable_file;
+#if LIBNM_BUILD && WITH_GCR
+extern const NMACertChooserVtable nma_cert_chooser_vtable_pkcs11;
+#endif
+
+#endif /* NMA_CERT_CHOOSER_PRIVATE_H */
diff --git a/src/libnma/nma-cert-chooser.c b/src/libnma/nma-cert-chooser.c
new file mode 100644
index 00000000..82d0e00b
--- /dev/null
+++ b/src/libnma/nma-cert-chooser.c
@@ -0,0 +1,788 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * Copyright (C) 2017 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+#include "nma-cert-chooser.h"
+
+#include "nma-cert-chooser-private.h"
+
+#if !LIBNM_BUILD
+#define NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH "file://"
+#endif
+
+/**
+ * SECTION:nma-cert-chooser
+ * @title: NMACertChooser
+ *
+ * Certificate chooser allows for selection of a certificate or
+ * various schemes optionally accompanied with a key and passwords
+ * or PIN.
+ *
+ * The widgets that implement this interface may allow selecting
+ * the certificates from various sources such as files or cryptographic
+ * tokens.
+ */
+
+enum {
+       PROP_0,
+       PROP_TITLE,
+       PROP_FLAGS,
+       LAST_PROP,
+};
+
+static GParamSpec *properties[LAST_PROP];
+
+enum {
+       CERT_VALIDATE,
+       CERT_PASSWORD_VALIDATE,
+       KEY_VALIDATE,
+       KEY_PASSWORD_VALIDATE,
+       CHANGED,
+       LAST_SIGNAL,
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+G_DEFINE_TYPE (NMACertChooser, nma_cert_chooser, GTK_TYPE_GRID)
+
+#define NMA_CERT_CHOOSER_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMACertChooser, NMA_IS_CERT_CHOOSER)
+#define NMA_CERT_CHOOSER_GET_VTABLE(o) (NMA_CERT_CHOOSER_GET_PRIVATE (o)->vtable)
+
+static gboolean
+accu_validation_error (GSignalInvocationHint *ihint,
+                       GValue *return_accu,
+                       const GValue *handler_return,
+                       gpointer data)
+{
+       if (g_value_get_boxed (handler_return)) {
+               g_value_copy (handler_return, return_accu);
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
+static gchar *
+value_with_scheme_to_uri (const gchar *value, NMSetting8021xCKScheme scheme)
+{
+       switch (scheme) {
+       case NM_SETTING_802_1X_CK_SCHEME_PATH:
+               return g_strdup_printf (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH "%s", value);
+#if LIBNM_BUILD
+       case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
+               return g_strdup (value);
+#endif
+       default:
+               g_return_val_if_reached (NULL);
+       }
+}
+
+static gchar *
+uri_to_value_with_scheme (const gchar *uri, NMSetting8021xCKScheme *scheme)
+{
+       if (!uri) {
+               NM_SET_OUT (scheme, NM_SETTING_802_1X_CK_SCHEME_UNKNOWN);
+               return NULL;
+       }
+
+       if (g_str_has_prefix (uri, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) {
+               NM_SET_OUT (scheme, NM_SETTING_802_1X_CK_SCHEME_PATH);
+               return g_uri_unescape_string (uri + NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH), 
NULL);
+       }
+
+#if LIBNM_BUILD
+       if (g_str_has_prefix (uri, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11)) {
+               NM_SET_OUT (scheme, NM_SETTING_802_1X_CK_SCHEME_PKCS11);
+               return g_strdup (uri);
+       }
+#endif
+
+       g_return_val_if_reached (NULL);
+}
+
+/**
+ * nma_cert_chooser_set_cert_uri:
+ * @cert_chooser: certificate chooser button instance
+ * @uri: the path or URI of a certificate
+ *
+ * Sets the certificate URI for the chooser button.
+ *
+ * Since: 1.8.0
+ */
+void
+nma_cert_chooser_set_cert_uri (NMACertChooser *cert_chooser,
+                               const gchar *uri)
+{
+       g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser));
+
+       NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser)->set_cert_uri (cert_chooser, uri);
+}
+
+/**
+ * nma_cert_chooser_set_cert:
+ * @cert_chooser: certificate chooser button instance
+ * @value: the path or URI of a certificate
+ * @scheme: the scheme of the certificate path
+ *
+ * Sets the certificate location for the chooser button.
+ *
+ * Since: 1.8.0
+ */
+void
+nma_cert_chooser_set_cert (NMACertChooser *cert_chooser,
+                           const gchar *value,
+                           NMSetting8021xCKScheme scheme)
+{
+       gs_free gchar *uri = NULL;
+
+       g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser));
+
+       if (!value)
+               return;
+
+       uri = value_with_scheme_to_uri (value, scheme);
+       nma_cert_chooser_set_cert_uri (cert_chooser, uri);
+}
+
+/**
+ * nma_cert_chooser_get_cert_uri:
+ * @cert_chooser: certificate chooser button instance
+ *
+ * Gets the real certificate URI from the chooser button along with the scheme.
+ *
+ * Returns: (transfer full) (nullable): the certificate URI
+ *
+ * Since: 1.8.0
+ */
+gchar *
+nma_cert_chooser_get_cert_uri (NMACertChooser *cert_chooser)
+{
+       g_return_val_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser), NULL);
+
+       return NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser)->get_cert_uri (cert_chooser);
+}
+
+/**
+ * nma_cert_chooser_get_cert:
+ * @cert_chooser: certificate chooser button instance
+ * @scheme: (out): the scheme of the returned certificate path
+ *
+ * Gets the real certificate location from the chooser button along with the scheme.
+ *
+ * Returns: (transfer full) (nullable): the certificate path
+ *
+ * Since: 1.8.0
+ */
+gchar *
+nma_cert_chooser_get_cert (NMACertChooser *cert_chooser, NMSetting8021xCKScheme *scheme)
+{
+       gs_free gchar *uri = NULL;
+
+       g_return_val_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser), NULL);
+
+       uri = nma_cert_chooser_get_cert_uri (cert_chooser);
+       return uri_to_value_with_scheme (uri, scheme);
+}
+
+/**
+ * nma_cert_chooser_set_cert_password:
+ * @cert_chooser: certificate chooser button instance
+ * @password: the certificate PIN or password
+ *
+ * Sets the password or a PIN that might be required to access the certificate.
+ *
+ * Since: 1.8.0
+ */
+void
+nma_cert_chooser_set_cert_password (NMACertChooser *cert_chooser, const gchar *password)
+{
+       const NMACertChooserVtable *vtable;
+
+       g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser));
+       g_return_if_fail (password);
+
+       vtable = NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser);
+       if (vtable->set_cert_password)
+               vtable->set_cert_password (cert_chooser, password);
+       else
+               g_warning ("Can't set certificate password");
+}
+
+/**
+ * nma_cert_chooser_get_cert_password:
+ * @cert_chooser: certificate chooser button instance
+ *
+ * Obtains the password or a PIN that was be required to access the certificate.
+ *
+ * Returns: the certificate PIN or password
+ *
+ * Since: 1.8.0
+ */
+const gchar *
+nma_cert_chooser_get_cert_password (NMACertChooser *cert_chooser)
+{
+       const NMACertChooserVtable *vtable;
+
+       g_return_val_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser), NULL);
+
+       vtable = NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser);
+       if (!vtable->get_cert_password)
+               return NULL;
+       return vtable->get_cert_password (cert_chooser);
+}
+
+/**
+ * nma_cert_chooser_set_key_uri:
+ * @cert_chooser: certificate chooser button instance
+ * @uri: the URI of a key
+ *
+ * Sets the key URI for the chooser button.
+ *
+ * Since: 1.8.0
+ */
+void
+nma_cert_chooser_set_key_uri (NMACertChooser *cert_chooser,
+                              const gchar *uri)
+{
+       g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser));
+
+       return NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser)->set_key_uri (cert_chooser, uri);
+}
+
+/**
+ * nma_cert_chooser_set_key:
+ * @cert_chooser: certificate chooser button instance
+ * @value: the path or URI of a key
+ * @scheme: the scheme of the key path
+ *
+ * Sets the key location for the chooser button.
+ *
+ * Since: 1.8.0
+ */
+void
+nma_cert_chooser_set_key (NMACertChooser *cert_chooser,
+                          const gchar *value,
+                          NMSetting8021xCKScheme scheme)
+{
+       gs_free gchar *uri = NULL;
+
+       g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser));
+
+       if (!value)
+               return;
+
+       uri = value_with_scheme_to_uri (value, scheme);
+       nma_cert_chooser_set_key_uri (cert_chooser, uri);
+}
+
+/**
+ * nma_cert_chooser_get_key:
+ * @cert_chooser: certificate chooser button instance
+ * @scheme: (out): the scheme of the returned key path
+ *
+ * Gets the real key location from the chooser button along with the scheme.
+ *
+ * Returns: (transfer full) (nullable): the key path
+ *
+ * Since: 1.8.0
+ */
+gchar *
+nma_cert_chooser_get_key (NMACertChooser *cert_chooser, NMSetting8021xCKScheme *scheme)
+{
+       gs_free gchar *uri = NULL;
+
+       g_return_val_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser), NULL);
+
+       uri = nma_cert_chooser_get_key_uri (cert_chooser);
+       return uri_to_value_with_scheme (uri, scheme);
+}
+
+/**
+ * nma_cert_chooser_get_key_uri:
+ * @cert_chooser: certificate chooser button instance
+ *
+ * Gets the real key URI from the chooser button along with the scheme.
+ *
+ * Returns: (transfer full) (nullable): the key URI
+ *
+ * Since: 1.8.0
+ */
+gchar *
+nma_cert_chooser_get_key_uri (NMACertChooser *cert_chooser)
+{
+       g_return_val_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser), NULL);
+
+       return NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser)->get_key_uri (cert_chooser);
+}
+
+/**
+ * nma_cert_chooser_set_key_password:
+ * @cert_chooser: certificate chooser button instance
+ * @password: the key PIN or password
+ *
+ * Sets the password or a PIN that might be required to access the key.
+ *
+ * Since: 1.8.0
+ */
+void
+nma_cert_chooser_set_key_password (NMACertChooser *cert_chooser, const gchar *password)
+{
+       g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser));
+       g_return_if_fail (password);
+
+       NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser)->set_key_password (cert_chooser, password);
+}
+
+/**
+ * nma_cert_chooser_get_key_password:
+ * @cert_chooser: certificate chooser button instance
+ *
+ * Obtains the password or a PIN that was be required to access the key.
+ *
+ * Returns: the key PIN or password
+ *
+ * Since: 1.8.0
+ */
+const gchar *
+nma_cert_chooser_get_key_password (NMACertChooser *cert_chooser)
+{
+       g_return_val_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser), NULL);
+
+       return NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser)->get_key_password (cert_chooser);
+}
+
+/**
+ * nma_cert_chooser_add_to_size_group:
+ * @cert_chooser: certificate chooser button instance
+ * @group: a size group
+ *
+ * Adds the labels to the specified size group so that they are aligned
+ * nicely with other entries in a form.
+ *
+ * It is expected that the NMACertChooser is a GtkGrid with two columns
+ * with the labels in the first one.
+ *
+ * Since: 1.8.0
+ */
+void
+nma_cert_chooser_add_to_size_group (NMACertChooser *cert_chooser, GtkSizeGroup *group)
+{
+       g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser));
+
+       NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser)->add_to_size_group (cert_chooser, group);
+}
+
+/**
+ * nma_cert_chooser_validate:
+ * @cert_chooser: certificate chooser button instance
+ * @error: error return location
+ *
+ * Validates whether the chosen values make sense. The users can do further
+ * validation by subscribing to the "*-changed" signals and returning an
+ * error themselves.
+ *
+ * Returns: %TRUE if validation passes, %FALSE otherwise
+ *
+ * Since: 1.8.0
+ */
+gboolean
+nma_cert_chooser_validate (NMACertChooser *cert_chooser, GError **error)
+{
+       g_return_val_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser), TRUE);
+
+       return NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser)->validate (cert_chooser, error);
+}
+
+/**
+ * nma_cert_chooser_setup_cert_password_storage:
+ * @cert_chooser: certificate chooser button instance
+ * @initial_flags: initial secret flags to setup password menu from
+ * @setting: #NMSetting containing the password, or NULL
+ * @password_flags_name: name of the secret flags (like psk-flags), or NULL
+ * @with_not_required: whether to include "Not required" menu item
+ * @ask_mode: %TRUE if the entry is shown in ASK mode
+ *
+ * This method basically calls nma_utils_setup_password_storage()
+ * on the certificate password entry, in case one is present.
+ *
+ * Since: 1.8.0
+ */
+void
+nma_cert_chooser_setup_cert_password_storage (NMACertChooser *cert_chooser,
+                                              NMSettingSecretFlags initial_flags,
+                                              NMSetting *setting,
+                                              const char *password_flags_name,
+                                              gboolean with_not_required,
+                                              gboolean ask_mode)
+{
+       const NMACertChooserVtable *vtable;
+
+       g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser));
+
+       vtable = NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser);
+       if (vtable->setup_cert_password_storage) {
+               vtable->setup_cert_password_storage (cert_chooser,
+                                                    initial_flags,
+                                                    setting,
+                                                    password_flags_name,
+                                                    with_not_required,
+                                                    ask_mode);
+       }
+}
+
+/**
+ * nma_cert_chooser_update_cert_password_storage:
+ * @cert_chooser: certificate chooser button instance
+ * @secret_flags: secret flags to set
+ * @setting: #NMSetting containing the password, or NULL
+ * @password_flags_name: name of the secret flags (like psk-flags), or NULL
+ *
+ * This method basically calls nma_utils_update_password_storage()
+ * on the certificate password entry, in case one is present.
+ *
+ * Since: 1.8.0
+ */
+void
+nma_cert_chooser_update_cert_password_storage (NMACertChooser *cert_chooser,
+                                               NMSettingSecretFlags secret_flags,
+                                               NMSetting *setting,
+                                               const char *password_flags_name)
+{
+       const NMACertChooserVtable *vtable;
+
+       g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser));
+
+       vtable = NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser);
+       if (vtable->update_cert_password_storage) {
+               vtable->update_cert_password_storage (cert_chooser,
+                                                     secret_flags,
+                                                     setting,
+                                                     password_flags_name);
+       }
+}
+
+/**
+ * nma_cert_chooser_get_cert_password_flags:
+ * @cert_chooser: certificate chooser button instance
+ *
+ * Returns secret flags corresponding to the certificate password
+ * if one is present. The chooser would typically call into
+ * nma_utils_menu_to_secret_flags() for the certificate password
+ * entry.
+ *
+ * Returns: secret flags corresponding to the certificate password
+ *
+ * Since: 1.8.0
+ */
+NMSettingSecretFlags
+nma_cert_chooser_get_cert_password_flags (NMACertChooser *cert_chooser)
+{
+       const NMACertChooserVtable *vtable;
+
+       g_return_val_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser),
+                             NM_SETTING_SECRET_FLAG_NONE);
+
+       vtable = NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser);
+       if (!vtable->get_cert_password_flags)
+               return NM_SETTING_SECRET_FLAG_NONE;
+       return vtable->get_cert_password_flags (cert_chooser);
+}
+
+
+/**
+ * nma_cert_chooser_setup_key_password_storage:
+ * @cert_chooser: certificate chooser button instance
+ * @initial_flags: initial secret flags to setup password menu from
+ * @setting: #NMSetting containing the password, or NULL
+ * @password_flags_name: name of the secret flags (like psk-flags), or NULL
+ * @with_not_required: whether to include "Not required" menu item
+ * @ask_mode: %TRUE if the entry is shown in ASK mode
+ *
+ * This method basically calls nma_utils_setup_password_storage()
+ * on the key password entry, in case one is present.
+ *
+ * Since: 1.8.0
+ */
+void
+nma_cert_chooser_setup_key_password_storage (NMACertChooser *cert_chooser,
+                                             NMSettingSecretFlags initial_flags,
+                                             NMSetting *setting,
+                                             const char *password_flags_name,
+                                             gboolean with_not_required,
+                                             gboolean ask_mode)
+{
+       g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser));
+
+       NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser)->setup_key_password_storage (cert_chooser,
+                                                                               initial_flags,
+                                                                               setting,
+                                                                               password_flags_name,
+                                                                               with_not_required,
+                                                                               ask_mode);
+}
+
+/**
+ * nma_cert_chooser_update_key_password_storage:
+ * @cert_chooser: certificate chooser button instance
+ * @secret_flags: secret flags to set
+ * @setting: #NMSetting containing the password, or NULL
+ * @password_flags_name: name of the secret flags (like psk-flags), or NULL
+ *
+ * This method basically calls nma_utils_update_password_storage()
+ * on the key password entry, in case one is present.
+ *
+ * Since: 1.8.0
+ */
+void
+nma_cert_chooser_update_key_password_storage (NMACertChooser *cert_chooser,
+                                               NMSettingSecretFlags secret_flags,
+                                               NMSetting *setting,
+                                               const char *password_flags_name)
+{
+       g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser));
+
+       NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser)->update_key_password_storage (cert_chooser,
+                                                                                secret_flags,
+                                                                                setting,
+                                                                                password_flags_name);
+}
+
+/**
+ * nma_cert_chooser_get_key_password_flags:
+ * @cert_chooser: certificate chooser button instance
+ *
+ * Returns secret flags corresponding to the key password
+ * if one is present. The chooser would typically call into
+ * nma_utils_menu_to_secret_flags() for the key password
+ * entry.
+ *
+ * Returns: secret flags corresponding to the key password
+ *
+ * Since: 1.8.0
+ */
+NMSettingSecretFlags
+nma_cert_chooser_get_key_password_flags (NMACertChooser *cert_chooser)
+{
+       g_return_val_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser),
+                             NM_SETTING_SECRET_FLAG_NONE);
+
+       return NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser)->get_key_password_flags (cert_chooser);
+}
+
+static GObject *
+constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)
+{
+       GObject *object;
+       NMACertChooser *cert_chooser;
+       NMACertChooserFlags flags = NMA_CERT_CHOOSER_FLAG_NONE;
+       NMACertChooserPrivate *priv;
+       int i;
+       const gchar *title = NULL;
+
+       object = G_OBJECT_CLASS (nma_cert_chooser_parent_class)->constructor (type,
+                                                                             n_construct_properties,
+                                                                             construct_properties);
+       cert_chooser = NMA_CERT_CHOOSER (object);
+       priv = NMA_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       for (i = 0; i < n_construct_properties; i++) {
+               if (strcmp (construct_properties[i].pspec->name, "title") == 0)
+                       title = g_value_get_string (construct_properties[i].value);
+               if (strcmp (construct_properties[i].pspec->name, "flags") == 0)
+                       flags |= g_value_get_uint (construct_properties[i].value);
+       }
+       priv->vtable = &nma_cert_chooser_vtable_file;
+#if LIBNM_BUILD && (GTK_CHECK_VERSION(3,90,0) ? WITH_GCR_GTK4 : WITH_GCR)
+       if ((flags & NMA_CERT_CHOOSER_FLAG_PEM) == 0)
+               priv->vtable = &nma_cert_chooser_vtable_pkcs11;
+#endif
+
+       /* Initialize the vtable and construct-time properties */
+       priv->vtable->init (cert_chooser);
+       priv->vtable->set_flags (cert_chooser, flags);
+       priv->vtable->set_title (cert_chooser, title);
+
+       return object;
+}
+
+static void
+set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+{
+       NMACertChooser *cert_chooser = NMA_CERT_CHOOSER (object);
+
+       g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser));
+
+       switch (property_id) {
+       case PROP_TITLE:
+       case PROP_FLAGS:
+               /* Just ignore these, should be set at construct time */
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+               break;
+       }
+}
+
+static void
+nma_cert_chooser_class_init (NMACertChooserClass *klass)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+       g_type_class_add_private (object_class, sizeof (NMACertChooserPrivate));
+
+       object_class->constructor = constructor;
+       object_class->set_property = set_property;
+
+       /**
+        * NMACertChooser::title:
+        *
+        * Name of the certificate or certificate/key pair to be chosen.
+        * Used in labels and chooser dialog titles.
+        *
+        * Since: 1.8.0
+        */
+       properties[PROP_TITLE] = g_param_spec_string ("title",
+                                                    "Title",
+                                                    "Certificate Chooser Title",
+                                                    NULL,
+                                                      G_PARAM_WRITABLE
+                                                    | G_PARAM_CONSTRUCT_ONLY
+                                                    | G_PARAM_STATIC_STRINGS);
+
+       /**
+        * NMACertChooser::flags:
+        *
+        * The #NMACertChooserFlags flags that influnce which chooser
+        * implementation is used and configure its behavior.
+        *
+        * Since: 1.8.0
+        */
+       properties[PROP_FLAGS] = g_param_spec_uint ("flags",
+                                                   "Flags",
+                                                   "Certificate Chooser Flags",
+                                                   NMA_CERT_CHOOSER_FLAG_NONE,
+                                                     NMA_CERT_CHOOSER_FLAG_CERT
+                                                   | NMA_CERT_CHOOSER_FLAG_PASSWORDS
+                                                   | NMA_CERT_CHOOSER_FLAG_PEM,
+                                                   NMA_CERT_CHOOSER_FLAG_NONE,
+                                                     G_PARAM_WRITABLE
+                                                   | G_PARAM_CONSTRUCT_ONLY
+                                                   | G_PARAM_STATIC_STRINGS);
+
+       g_object_class_install_properties (object_class, LAST_PROP, properties);
+
+       /**
+        * NMACertChooser::cert-validate:
+        *
+        * Emitted when the certificate needs validation. The handlers can indicate that
+        * the certificate is invalid by returning an error, which blocks further
+        * signal processing and causes a call to nma_cert_chooser_validate()
+        * to fail.
+        *
+        * Since: 1.8.0
+        */
+       signals[CERT_VALIDATE] = g_signal_new ("cert-validate",
+                                              NMA_TYPE_CERT_CHOOSER,
+                                              G_SIGNAL_RUN_LAST,
+                                              0,
+                                              accu_validation_error, NULL, NULL,
+                                              G_TYPE_ERROR, 0);
+
+       /**
+        * NMACertChooser::cert-password-validate:
+        *
+        * Emitted when the certificate password needs validation. The handlers
+        * can indicate that the password is invalid by returning an error, which blocks further
+        * signal processing and causes a call to nma_cert_chooser_validate()
+        * to fail.
+        *
+        * Since: 1.8.0
+        */
+       signals[CERT_PASSWORD_VALIDATE] = g_signal_new ("cert-password-validate",
+                                                       NMA_TYPE_CERT_CHOOSER,
+                                                       G_SIGNAL_RUN_LAST,
+                                                       0,
+                                                       accu_validation_error, NULL, NULL,
+                                                       G_TYPE_ERROR, 0);
+
+       /**
+        * NMACertChooser::key-validate:
+        *
+        * Emitted when the key needs validation. The handlers can indicate that
+        * the key is invalid by returning an error, which blocks further
+        * signal processing and causes a call to nma_cert_chooser_validate()
+        * to fail.
+        *
+        * Since: 1.8.0
+        */
+       signals[KEY_VALIDATE] = g_signal_new ("key-validate",
+                                             NMA_TYPE_CERT_CHOOSER,
+                                             G_SIGNAL_RUN_LAST,
+                                             0,
+                                             accu_validation_error, NULL, NULL,
+                                             G_TYPE_ERROR, 0);
+
+       /**
+        * NMACertChooser::key-password-validate:
+        *
+        * Emitted when the key password needs validation. The handlers can indicate
+        * that the password is invalid by returning an error, which blocks further
+        * signal processing and causes a call to nma_cert_chooser_validate()
+        * to fail.
+        *
+        * Since: 1.8.0
+        */
+       signals[KEY_PASSWORD_VALIDATE] = g_signal_new ("key-password-validate",
+                                                      NMA_TYPE_CERT_CHOOSER,
+                                                      G_SIGNAL_RUN_LAST,
+                                                      0,
+                                                      accu_validation_error, NULL, NULL,
+                                                      G_TYPE_ERROR, 0);
+
+       /**
+        * NMACertChooser::changed:
+        *
+        * Emitted when anything changes in the certificate chooser, be it a certificate,
+        * a key or associated passwords.
+        *
+        * Since: 1.8.0
+        */
+       signals[CHANGED] = g_signal_new ("changed",
+                                        NMA_TYPE_CERT_CHOOSER,
+                                        G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
+                                        0,
+                                        NULL, NULL, NULL,
+                                        G_TYPE_NONE, 0);
+
+}
+
+static void
+nma_cert_chooser_init (NMACertChooser *file_cert_chooser)
+{
+}
+
+/**
+ * nma_cert_chooser_new:
+ * @title: title of the certificate chooser dialog
+ * @flags: the flags that configure the capabilities of the button
+ *
+ * Constructs the button that is capable of selecting a certificate
+ * and a key.
+ *
+ * Returns: (transfer full): the certificate chooser button instance
+ *
+ * Since: 1.8.0
+ */
+GtkWidget *
+nma_cert_chooser_new (const gchar *title, NMACertChooserFlags flags)
+{
+       return g_object_new (NMA_TYPE_CERT_CHOOSER,
+                            "title", title,
+                            "flags", flags,
+                            NULL);
+}
diff --git a/src/libnma/nma-cert-chooser.h b/src/libnma/nma-cert-chooser.h
new file mode 100644
index 00000000..c4c0ad54
--- /dev/null
+++ b/src/libnma/nma-cert-chooser.h
@@ -0,0 +1,151 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * Copyright (C) 2015,2017 Red Hat, Inc.
+ */
+
+#ifndef NMA_CERT_CHOOSER_H
+#define NMA_CERT_CHOOSER_H
+
+#include <gtk/gtk.h>
+#include <NetworkManager.h>
+
+#include "nma-version.h"
+
+G_BEGIN_DECLS
+
+/**
+ * NMACertChooserFlags:
+ * @NMA_CERT_CHOOSER_FLAG_NONE: No flags
+ * @NMA_CERT_CHOOSER_FLAG_CERT: Only pick a certificate, not a key
+ * @NMA_CERT_CHOOSER_FLAG_PASSWORDS: Hide all controls but the secrets entries
+ * @NMA_CERT_CHOOSER_FLAG_PEM: Ensure the chooser only selects regular PEM files
+ *
+ * Flags that controls what is the certificate chooser button able to pick.
+ * Currently only local files are supported, but might be extended to use URIs,
+ * such as PKCS\#11 certificate URIs in future as well.
+ *
+ * Since: 1.8.0
+ */
+NMA_AVAILABLE_IN_1_8
+typedef enum {
+       NMA_CERT_CHOOSER_FLAG_NONE      = 0x0,
+       NMA_CERT_CHOOSER_FLAG_CERT      = 0x1,
+       NMA_CERT_CHOOSER_FLAG_PASSWORDS = 0x2,
+       NMA_CERT_CHOOSER_FLAG_PEM       = 0x4,
+} NMACertChooserFlags;
+
+#define NMA_TYPE_CERT_CHOOSER                   (nma_cert_chooser_get_type ())
+#define NMA_CERT_CHOOSER(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMA_TYPE_CERT_CHOOSER, 
NMACertChooser))
+#define NMA_CERT_CHOOSER_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass), NMA_TYPE_CERT_CHOOSER, 
NMACertChooserClass))
+#define NMA_IS_CERT_CHOOSER(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMA_TYPE_CERT_CHOOSER))
+#define NMA_IS_CERT_CHOOSER_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), NMA_TYPE_CERT_CHOOSER))
+#define NMA_CERT_CHOOSER_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), NMA_TYPE_CERT_CHOOSER, 
NMACertChooserClass))
+
+NMA_AVAILABLE_IN_1_8
+typedef struct _NMACertChooser NMACertChooser;
+
+NMA_AVAILABLE_IN_1_8
+typedef struct _NMACertChooserClass NMACertChooserClass;
+
+NMA_AVAILABLE_IN_1_8
+GType                nma_cert_chooser_get_type                     (void);
+
+NMA_AVAILABLE_IN_1_8
+void                 nma_cert_chooser_set_cert                     (NMACertChooser *cert_chooser,
+                                                                    const gchar *value,
+                                                                    NMSetting8021xCKScheme scheme);
+
+NMA_AVAILABLE_IN_1_8
+void                 nma_cert_chooser_set_cert_uri                 (NMACertChooser *cert_chooser,
+                                                                    const gchar *uri);
+
+NMA_AVAILABLE_IN_1_8
+gchar               *nma_cert_chooser_get_cert                     (NMACertChooser *cert_chooser,
+                                                                    NMSetting8021xCKScheme *scheme);
+
+NMA_AVAILABLE_IN_1_8
+gchar               *nma_cert_chooser_get_cert_uri                 (NMACertChooser *cert_chooser);
+
+NMA_AVAILABLE_IN_1_8
+void                 nma_cert_chooser_set_cert_password            (NMACertChooser *cert_chooser,
+                                                                    const gchar *password);
+
+NMA_AVAILABLE_IN_1_8
+const gchar         *nma_cert_chooser_get_cert_password            (NMACertChooser *cert_chooser);
+
+NMA_AVAILABLE_IN_1_8
+void                 nma_cert_chooser_set_key                      (NMACertChooser *cert_chooser,
+                                                                    const gchar *value,
+                                                                    NMSetting8021xCKScheme scheme);
+
+NMA_AVAILABLE_IN_1_8
+void                 nma_cert_chooser_set_key_uri                  (NMACertChooser *cert_chooser,
+                                                                    const gchar *uri);
+
+NMA_AVAILABLE_IN_1_8
+gchar               *nma_cert_chooser_get_key                      (NMACertChooser *cert_chooser,
+                                                                    NMSetting8021xCKScheme *scheme);
+
+NMA_AVAILABLE_IN_1_8
+gchar               *nma_cert_chooser_get_key_uri                  (NMACertChooser *cert_chooser);
+
+NMA_AVAILABLE_IN_1_8
+void                 nma_cert_chooser_set_key_password             (NMACertChooser *cert_chooser,
+                                                                    const gchar *password);
+
+NMA_AVAILABLE_IN_1_8
+const gchar         *nma_cert_chooser_get_key_password             (NMACertChooser *cert_chooser);
+
+NMA_AVAILABLE_IN_1_8
+GtkWidget           *nma_cert_chooser_new                          (const gchar *title,
+                                                                    NMACertChooserFlags flags);
+
+
+NMA_AVAILABLE_IN_1_8
+void                 nma_cert_chooser_add_to_size_group            (NMACertChooser *cert_chooser,
+                                                                    GtkSizeGroup *group);
+
+NMA_AVAILABLE_IN_1_8
+gboolean             nma_cert_chooser_validate                     (NMACertChooser *cert_chooser,
+                                                                    GError **error);
+
+NMA_AVAILABLE_IN_1_8
+void                 nma_cert_chooser_setup_cert_password_storage  (NMACertChooser *cert_chooser,
+                                                                    NMSettingSecretFlags initial_flags,
+                                                                    NMSetting *setting,
+                                                                    const char *password_flags_name,
+                                                                    gboolean with_not_required,
+                                                                    gboolean ask_mode);
+
+NMA_AVAILABLE_IN_1_8
+void                 nma_cert_chooser_update_cert_password_storage (NMACertChooser *cert_chooser,
+                                                                    NMSettingSecretFlags secret_flags,
+                                                                    NMSetting *setting,
+                                                                    const char *password_flags_name);
+
+NMA_AVAILABLE_IN_1_8
+NMSettingSecretFlags nma_cert_chooser_get_cert_password_flags      (NMACertChooser *cert_chooser);
+
+NMA_AVAILABLE_IN_1_8
+void                 nma_cert_chooser_setup_key_password_storage   (NMACertChooser *cert_chooser,
+                                                                    NMSettingSecretFlags initial_flags,
+                                                                    NMSetting *setting,
+                                                                    const char *password_flags_name,
+                                                                    gboolean with_not_required,
+                                                                    gboolean ask_mode);
+
+NMA_AVAILABLE_IN_1_8
+void                 nma_cert_chooser_update_key_password_storage  (NMACertChooser *cert_chooser,
+                                                                    NMSettingSecretFlags secret_flags,
+                                                                    NMSetting *setting,
+                                                                    const char *password_flags_name);
+
+NMA_AVAILABLE_IN_1_8
+NMSettingSecretFlags nma_cert_chooser_get_key_password_flags       (NMACertChooser *cert_chooser);
+
+G_END_DECLS
+
+#endif /* NMA_CERT_CHOOSER_H */
diff --git a/src/libnma/nma-file-cert-chooser.c b/src/libnma/nma-file-cert-chooser.c
new file mode 100644
index 00000000..8f24c826
--- /dev/null
+++ b/src/libnma/nma-file-cert-chooser.c
@@ -0,0 +1,399 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Dan Williams <dcbw redhat com>
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * Copyright (C) 2015,2017 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+#include "nma-private.h"
+#include "nma-cert-chooser-private.h"
+#include "utils.h"
+#ifdef LIBNM_BUILD
+#include "nma-ui-utils.h"
+#else
+#include "nm-ui-utils.h"
+#endif
+
+#define NMA_FILE_CERT_CHOOSER_GET_PRIVATE(self) (&(_NM_GET_PRIVATE (self, NMACertChooser, 
NMA_IS_CERT_CHOOSER)->_sub.file))
+
+#if GTK_CHECK_VERSION(3,90,0)
+#define gtk3_widget_set_no_show_all(widget, show)
+#else
+#define gtk3_widget_set_no_show_all(widget, show) gtk_widget_set_no_show_all (widget, show);
+#endif
+
+static void
+set_key_password (NMACertChooser *cert_chooser, const gchar *password)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       g_return_if_fail (priv->key_password != NULL);
+       gtk_editable_set_text (GTK_EDITABLE (priv->key_password), password);
+}
+
+static const gchar *
+get_key_password (NMACertChooser *cert_chooser)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       g_return_val_if_fail (priv->key_password != NULL, NULL);
+       return gtk_editable_get_text (GTK_EDITABLE (priv->key_password));
+}
+
+static void
+set_key_uri (NMACertChooser *cert_chooser, const gchar *uri)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       if (uri)
+               gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (priv->key_button), uri);
+}
+
+static gchar *
+get_key_uri (NMACertChooser *cert_chooser)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       return gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (priv->key_button));
+}
+
+static void
+set_cert_uri (NMACertChooser *cert_chooser, const gchar *uri)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       if (uri)
+               gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (priv->cert_button), uri);
+}
+
+static gchar *
+get_cert_uri (NMACertChooser *cert_chooser)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       return gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (priv->cert_button));
+}
+
+static void
+add_to_size_group (NMACertChooser *cert_chooser, GtkSizeGroup *group)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       gtk_size_group_add_widget (group, priv->cert_button_label);
+       gtk_size_group_add_widget (group, priv->key_button_label);
+       gtk_size_group_add_widget (group, priv->key_password_label);
+}
+
+static gboolean
+validate (NMACertChooser *cert_chooser, GError **error)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+       GError *local = NULL;
+       char *tmp;
+
+       tmp = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (priv->cert_button));
+       if (tmp) {
+               g_free (tmp);
+       } else {
+               g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("No certificate set"));
+               return FALSE;
+       }
+
+       g_signal_emit_by_name (cert_chooser, "cert-validate", &local);
+       if (local) {
+               widget_set_error (priv->cert_button);
+               g_propagate_error (error, local);
+               return FALSE;
+       } else {
+               widget_unset_error (priv->cert_button);
+       }
+
+       if (gtk_widget_get_visible (priv->key_button)) {
+               tmp = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (priv->key_button));
+               if (tmp) {
+                       g_free (tmp);
+               } else {
+                       g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("No key set"));
+                       return FALSE;
+               }
+
+               g_signal_emit_by_name (cert_chooser, "key-validate", &local);
+               if (local) {
+                       widget_set_error (priv->key_button);
+                       g_propagate_error (error, local);
+                       return FALSE;
+               } else {
+                       widget_unset_error (priv->key_button);
+               }
+
+               g_signal_emit_by_name (cert_chooser, "key-password-validate", &local);
+               if (local) {
+                       widget_set_error (priv->key_password);
+                       g_propagate_error (error, local);
+                       return FALSE;
+               } else {
+                       widget_unset_error (priv->key_password);
+               }
+       }
+
+       return TRUE;
+}
+
+static void
+setup_key_password_storage (NMACertChooser *cert_chooser,
+                            NMSettingSecretFlags initial_flags,
+                            NMSetting *setting,
+                            const char *password_flags_name,
+                            gboolean with_not_required,
+                            gboolean ask_mode)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       nma_utils_setup_password_storage (priv->key_password,
+                                         initial_flags,
+                                         setting,
+                                         password_flags_name,
+                                         with_not_required,
+                                         ask_mode);
+}
+
+static void
+update_key_password_storage (NMACertChooser *cert_chooser,
+                             NMSettingSecretFlags secret_flags,
+                             NMSetting *setting,
+                             const char *password_flags_name)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       nma_utils_update_password_storage (priv->key_password,
+                                          secret_flags,
+                                          setting,
+                                          password_flags_name);
+}
+
+
+static NMSettingSecretFlags
+get_key_password_flags (NMACertChooser *cert_chooser)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       return nma_utils_menu_to_secret_flags (priv->key_password);
+}
+
+static void
+reset_filter (GtkWidget *widget, GParamSpec *spec, gpointer user_data)
+{
+       if (!gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (widget))) {
+               g_signal_handlers_block_by_func (widget, reset_filter, user_data);
+               gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (widget), GTK_FILE_FILTER (user_data));
+               g_signal_handlers_unblock_by_func (widget, reset_filter, user_data);
+       }
+}
+
+static void
+cert_changed_cb (GtkFileChooserButton *file_chooser_button, gpointer user_data)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (NMA_CERT_CHOOSER (user_data));
+
+       if (gtk_widget_get_visible (priv->key_button)) {
+               gtk_widget_set_sensitive (priv->key_button, TRUE);
+               gtk_widget_set_sensitive (priv->key_button_label, TRUE);
+       }
+       g_signal_emit_by_name (user_data, "changed");
+}
+
+static void
+key_changed_cb (GtkFileChooserButton *file_chooser_button, gpointer user_data)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (NMA_CERT_CHOOSER (user_data));
+
+       gtk_widget_set_sensitive (priv->key_password, TRUE);
+       gtk_widget_set_sensitive (priv->key_password_label, TRUE);
+       g_signal_emit_by_name (user_data, "changed");
+}
+
+static void
+key_password_changed_cb (GtkEntry *entry, gpointer user_data)
+{
+       g_signal_emit_by_name (user_data, "changed");
+}
+
+static void
+show_toggled_cb (GtkCheckButton *button, gpointer user_data)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (NMA_CERT_CHOOSER (user_data));
+
+       gtk_entry_set_visibility (GTK_ENTRY (priv->key_password),
+                                 gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)));
+}
+
+static void
+set_title (NMACertChooser *cert_chooser, const gchar *title)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+       gchar *text;
+
+       text = g_strdup_printf (_("Choose a key for %s Certificate"), title);
+       gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (priv->key_button), text);
+       g_free (text);
+
+       text = g_strdup_printf (_("%s private _key"), title);
+       gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->key_button_label), text);
+       g_free (text);
+
+       text = g_strdup_printf (_("%s key _password"), title);
+       gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->key_password_label), text);
+       g_free (text);
+
+       text = g_strdup_printf (_("Choose %s Certificate"), title);
+       gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (priv->cert_button), text);
+       g_free (text);
+
+       text = g_strdup_printf (_("%s _certificate"), title);
+       gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->cert_button_label), text);
+       g_free (text);
+}
+
+static void
+set_flags (NMACertChooser *cert_chooser, NMACertChooserFlags flags)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       if (flags & NMA_CERT_CHOOSER_FLAG_CERT) {
+               gtk_widget_hide (priv->key_button);
+               gtk_widget_hide (priv->key_button_label);
+               gtk_widget_hide (priv->key_password);
+               gtk_widget_hide (priv->key_password_label);
+               gtk_widget_hide (priv->show_password);
+       }
+
+       if (flags & NMA_CERT_CHOOSER_FLAG_PASSWORDS) {
+               gtk_widget_hide (priv->cert_button);
+               gtk_widget_hide (priv->cert_button_label);
+               gtk_widget_hide (priv->key_button);
+               gtk_widget_hide (priv->key_button_label);
+       }
+}
+
+static void
+init (NMACertChooser *cert_chooser)
+{
+       NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+       GtkFileFilter *filter;
+
+       gtk_grid_insert_column (GTK_GRID (cert_chooser), 2);
+       gtk_grid_set_row_spacing (GTK_GRID (cert_chooser), 6);
+       gtk_grid_set_column_spacing (GTK_GRID (cert_chooser), 6);
+
+       /* The key chooser */
+       gtk_grid_insert_row (GTK_GRID (cert_chooser), 0);
+
+       priv->key_button = g_object_new (GTK_TYPE_FILE_CHOOSER_BUTTON,
+                                         "action", GTK_FILE_CHOOSER_ACTION_OPEN,
+                                         "filter", utils_key_filter (),
+                                         "local-only", TRUE,
+                                         NULL);
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_button, 1, 0, 1, 1);
+       gtk_widget_set_hexpand (priv->key_button, TRUE);
+       gtk_widget_set_sensitive (priv->key_button, FALSE);
+       gtk_widget_show (priv->key_button);
+       gtk3_widget_set_no_show_all (priv->key_button, TRUE);
+
+       g_signal_connect (priv->key_button, "selection-changed",
+                         G_CALLBACK (key_changed_cb), cert_chooser);
+
+       priv->key_button_label = gtk_label_new (NULL);
+       g_object_set (priv->key_button_label, "xalign", (gfloat) 1, NULL);
+       gtk_label_set_mnemonic_widget (GTK_LABEL (priv->key_button_label), priv->key_button);
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_button_label, 0, 0, 1, 1);
+       gtk_widget_set_sensitive (priv->key_button_label, FALSE);
+       gtk_widget_show (priv->key_button_label);
+       gtk3_widget_set_no_show_all (priv->key_button_label, TRUE);
+
+       /* The key password entry */
+       gtk_grid_insert_row (GTK_GRID (cert_chooser), 1);
+
+       priv->key_password = gtk_entry_new ();
+       gtk_entry_set_visibility (GTK_ENTRY (priv->key_password), FALSE);
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_password, 1, 1, 1, 1);
+       gtk_widget_set_hexpand (priv->key_password, TRUE);
+       gtk_widget_set_sensitive (priv->key_password, FALSE);
+       gtk_widget_show (priv->key_password);
+       gtk3_widget_set_no_show_all (priv->key_password, TRUE);
+
+       g_signal_connect (priv->key_password, "changed",
+                         G_CALLBACK (key_password_changed_cb), cert_chooser);
+
+       priv->key_password_label = gtk_label_new (NULL);
+       g_object_set (priv->key_password_label, "xalign", (gfloat) 1, NULL);
+       gtk_label_set_mnemonic_widget (GTK_LABEL (priv->key_password_label), priv->key_password);
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_password_label, 0, 1, 1, 1);
+       gtk_widget_set_sensitive (priv->key_password_label, FALSE);
+       gtk_widget_show (priv->key_password_label);
+       gtk3_widget_set_no_show_all (priv->key_password_label, TRUE);
+
+       /* Show password */
+       gtk_grid_insert_row (GTK_GRID (cert_chooser), 2);
+       priv->show_password = gtk_check_button_new_with_mnemonic _("Sho_w password");
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->show_password, 1, 2, 1, 1);
+       gtk_widget_show (priv->show_password);
+       gtk3_widget_set_no_show_all (priv->show_password, TRUE);
+       g_signal_connect (priv->show_password, "toggled",
+                         G_CALLBACK (show_toggled_cb), cert_chooser);
+
+       /* The certificate chooser */
+       gtk_grid_insert_row (GTK_GRID (cert_chooser), 0);
+
+       filter = utils_cert_filter ();
+       priv->cert_button = g_object_new (GTK_TYPE_FILE_CHOOSER_BUTTON,
+                                         "action", GTK_FILE_CHOOSER_ACTION_OPEN,
+                                         "filter", filter,
+                                         "local-only", TRUE,
+                                         NULL);
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_button, 1, 0, 1, 1);
+       gtk_widget_set_hexpand (priv->cert_button, TRUE);
+       gtk_widget_show (priv->cert_button);
+       gtk3_widget_set_no_show_all (priv->cert_button, TRUE);
+
+       /* For some reason, GTK+ calls set_current_filter (..., NULL) from
+        * gtkfilechooserdefault.c::show_and_select_files_finished_loading() on our
+        * dialog; so force-reset the filter to what we want it to be whenever
+        * it gets cleared.
+        */
+       g_signal_connect (priv->cert_button, "notify::filter",
+                         G_CALLBACK (reset_filter), filter);
+
+       g_signal_connect (priv->cert_button, "selection-changed",
+                         G_CALLBACK (cert_changed_cb), cert_chooser);
+
+       priv->cert_button_label = gtk_label_new (NULL);
+       g_object_set (priv->cert_button_label, "xalign", (gfloat) 1, NULL);
+       gtk_label_set_mnemonic_widget (GTK_LABEL (priv->cert_button_label), priv->cert_button);
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_button_label, 0, 0, 1, 1);
+       gtk_widget_show (priv->cert_button_label);
+       gtk3_widget_set_no_show_all (priv->cert_button_label, TRUE);
+}
+
+const NMACertChooserVtable nma_cert_chooser_vtable_file = {
+       .init = init,
+
+       .set_title = set_title,
+       .set_flags = set_flags,
+
+       .set_cert_uri = set_cert_uri,
+       .get_cert_uri = get_cert_uri,
+       .set_key_uri = set_key_uri,
+       .get_key_uri = get_key_uri,
+       .set_key_password = set_key_password,
+       .get_key_password = get_key_password,
+
+       .add_to_size_group = add_to_size_group,
+       .validate = validate,
+
+       .setup_key_password_storage = setup_key_password_storage,
+       .update_key_password_storage = update_key_password_storage,
+       .get_key_password_flags = get_key_password_flags,
+};
diff --git a/src/libnma/nma-mobile-providers.c b/src/libnma/nma-mobile-providers.c
new file mode 100644
index 00000000..e69378b3
--- /dev/null
+++ b/src/libnma/nma-mobile-providers.c
@@ -0,0 +1,1600 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/*
+ * Copyright (C) 2009 Novell, Inc.
+ * Author: Tambet Ingo (tambet gmail com).
+ *
+ * Copyright (C) 2009 - 2012 Red Hat, Inc.
+ * Copyright (C) 2012 Lanedo GmbH
+ */
+
+#include "nm-default.h"
+
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#include "nma-mobile-providers.h"
+
+#define MOBILE_BROADBAND_PROVIDER_INFO "/mobile-broadband-provider-info/serviceproviders.xml"
+#define ISO_3166_COUNTRY_CODES "/xml/iso-codes/iso_3166.xml"
+
+/******************************************************************************/
+/* Access method type */
+
+G_DEFINE_BOXED_TYPE (NMAMobileAccessMethod,
+                     nma_mobile_access_method,
+                     nma_mobile_access_method_ref,
+                     nma_mobile_access_method_unref)
+
+struct _NMAMobileAccessMethod {
+       volatile gint refs;
+
+       char *name;
+       /* maps lang (char *) -> name (char *) */
+       GHashTable *lcl_names;
+
+       char *username;
+       char *password;
+       char *gateway;
+       GPtrArray *dns; /* GPtrArray of 'char *' */
+
+       /* Only used with 3GPP family type providers */
+       char *apn;
+
+       NMAMobileFamily family;
+};
+
+static NMAMobileAccessMethod *
+access_method_new (void)
+{
+       NMAMobileAccessMethod *method;
+
+       method = g_slice_new0 (NMAMobileAccessMethod);
+       method->refs = 1;
+       method->lcl_names = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                                  (GDestroyNotify) g_free,
+                                                  (GDestroyNotify) g_free);
+
+       return method;
+}
+
+NMAMobileAccessMethod *
+nma_mobile_access_method_ref (NMAMobileAccessMethod *method)
+{
+       g_return_val_if_fail (method != NULL, NULL);
+       g_return_val_if_fail (method->refs > 0, NULL);
+
+       g_atomic_int_inc (&method->refs);
+
+       return method;
+}
+
+void
+nma_mobile_access_method_unref (NMAMobileAccessMethod *method)
+{
+       g_return_if_fail (method != NULL);
+       g_return_if_fail (method->refs > 0);
+
+       if (g_atomic_int_dec_and_test (&method->refs)) {
+               g_free (method->name);
+               g_hash_table_destroy (method->lcl_names);
+               g_free (method->username);
+               g_free (method->password);
+               g_free (method->gateway);
+               g_free (method->apn);
+
+               if (method->dns)
+                       g_ptr_array_unref (method->dns);
+
+               g_slice_free (NMAMobileAccessMethod, method);
+       }
+}
+
+/**
+ * nma_mobile_access_method_get_name:
+ * @method: a #NMAMobileAccessMethod
+ *
+ * Returns: (transfer none): the name of the method.
+ */
+const gchar *
+nma_mobile_access_method_get_name (NMAMobileAccessMethod *method)
+{
+       g_return_val_if_fail (method != NULL, NULL);
+
+       return method->name;
+}
+
+/**
+ * nma_mobile_access_method_get_username:
+ * @method: a #NMAMobileAccessMethod
+ *
+ * Returns: (transfer none): the username.
+ */
+const gchar *
+nma_mobile_access_method_get_username (NMAMobileAccessMethod *method)
+{
+       g_return_val_if_fail (method != NULL, NULL);
+
+       return method->username;
+}
+
+/**
+ * nma_mobile_access_method_get_password:
+ * @method: a #NMAMobileAccessMethod
+ *
+ * Returns: (transfer none): the password.
+ */
+const gchar *
+nma_mobile_access_method_get_password (NMAMobileAccessMethod *method)
+{
+       g_return_val_if_fail (method != NULL, NULL);
+
+       return method->password;
+}
+
+/**
+ * nma_mobile_access_method_get_gateway:
+ * @method: a #NMAMobileAccessMethod
+ *
+ * Returns: (transfer none): the gateway.
+ */
+const gchar *
+nma_mobile_access_method_get_gateway (NMAMobileAccessMethod *method)
+{
+       g_return_val_if_fail (method != NULL, NULL);
+
+       return method->gateway;
+}
+
+/**
+ * nma_mobile_access_method_get_dns:
+ * @method: a #NMAMobileAccessMethod
+ *
+ * Returns: (transfer none) (array zero-terminated=1) (element-type utf8): the list of DNS.
+ */
+const gchar **
+nma_mobile_access_method_get_dns (NMAMobileAccessMethod *method)
+{
+       g_return_val_if_fail (method != NULL, NULL);
+
+       return method->dns ? (const gchar **)method->dns->pdata : NULL;
+}
+
+/**
+ * nma_mobile_access_method_get_3gpp_apn:
+ * @method: a #NMAMobileAccessMethod
+ *
+ * Returns: (transfer none): the 3GPP APN.
+ */
+const gchar *
+nma_mobile_access_method_get_3gpp_apn (NMAMobileAccessMethod *method)
+{
+       g_return_val_if_fail (method != NULL, NULL);
+
+       return method->apn;
+}
+
+/**
+ * nma_mobile_access_method_get_family:
+ * @method: a #NMAMobileAccessMethod
+ *
+ * Returns: a #NMAMobileFamily.
+ */
+NMAMobileFamily
+nma_mobile_access_method_get_family (NMAMobileAccessMethod *method)
+{
+       g_return_val_if_fail (method != NULL, NMA_MOBILE_FAMILY_UNKNOWN);
+
+       return method->family;
+}
+
+/******************************************************************************/
+/* Mobile provider type */
+
+G_DEFINE_BOXED_TYPE (NMAMobileProvider,
+                     nma_mobile_provider,
+                     nma_mobile_provider_ref,
+                     nma_mobile_provider_unref)
+
+struct _NMAMobileProvider {
+       volatile gint refs;
+
+       char *name;
+       /* maps lang (char *) -> name (char *) */
+       GHashTable *lcl_names;
+
+       GSList *methods; /* GSList of NmaMobileAccessMethod */
+
+       GPtrArray *mcc_mnc;  /* GPtrArray of strings */
+       GArray *cdma_sid; /* GArray of guint32 */
+};
+
+static NMAMobileProvider *
+provider_new (void)
+{
+       NMAMobileProvider *provider;
+
+       provider = g_slice_new0 (NMAMobileProvider);
+       provider->refs = 1;
+       provider->lcl_names = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                                    (GDestroyNotify) g_free,
+                                                    (GDestroyNotify) g_free);
+
+       return provider;
+}
+
+NMAMobileProvider *
+nma_mobile_provider_ref (NMAMobileProvider *provider)
+{
+       g_return_val_if_fail (provider != NULL, NULL);
+       g_return_val_if_fail (provider->refs > 0, NULL);
+
+       g_atomic_int_inc (&provider->refs);
+
+       return provider;
+}
+
+void
+nma_mobile_provider_unref (NMAMobileProvider *provider)
+{
+       if (g_atomic_int_dec_and_test (&provider->refs)) {
+               g_free (provider->name);
+               g_hash_table_destroy (provider->lcl_names);
+
+               g_slist_free_full (provider->methods, (GDestroyNotify) nma_mobile_access_method_unref);
+
+               if (provider->mcc_mnc)
+                       g_ptr_array_unref (provider->mcc_mnc);
+
+               if (provider->cdma_sid)
+                       g_array_unref (provider->cdma_sid);
+
+               g_slice_free (NMAMobileProvider, provider);
+       }
+}
+
+/**
+ * nma_mobile_provider_get_name:
+ * @provider: a #NMAMobileProvider
+ *
+ * Returns: (transfer none): the name of the provider.
+ */
+const gchar *
+nma_mobile_provider_get_name (NMAMobileProvider *provider)
+{
+       g_return_val_if_fail (provider != NULL, NULL);
+
+       return provider->name;
+}
+
+/**
+ * nma_mobile_provider_get_methods:
+ * @provider: a #NMAMobileProvider
+ *
+ * Returns: (element-type NMAMobileAccessMethod) (transfer none): the
+ *      list of #NMAMobileAccessMethod this provider exposes.
+ */
+GSList *
+nma_mobile_provider_get_methods (NMAMobileProvider *provider)
+{
+       g_return_val_if_fail (provider != NULL, NULL);
+
+       return provider->methods;
+}
+
+/**
+ * nma_mobile_provider_get_3gpp_mcc_mnc:
+ * @provider: a #NMAMobileProvider
+ *
+ * Returns: (transfer none) (array zero-terminated=1) (element-type utf8): a
+ *      list of strings with the MCC and MNC codes this provider exposes.
+ */
+const gchar **
+nma_mobile_provider_get_3gpp_mcc_mnc (NMAMobileProvider *provider)
+{
+       g_return_val_if_fail (provider != NULL, NULL);
+
+       return provider->mcc_mnc ? (const gchar **)provider->mcc_mnc->pdata : NULL;
+}
+
+/**
+ * nma_mobile_provider_get_cdma_sid:
+ * @provider: a #NMAMobileProvider
+ *
+ * Returns: (transfer none) (array zero-terminated=1) (element-type guint32): the
+ *      list of CDMA SIDs this provider exposes
+ */
+const guint32 *
+nma_mobile_provider_get_cdma_sid (NMAMobileProvider *provider)
+{
+       g_return_val_if_fail (provider != NULL, NULL);
+
+       return provider->cdma_sid ? (const guint32 *)provider->cdma_sid->data : NULL;
+}
+
+/******************************************************************************/
+/* Country Info type */
+
+G_DEFINE_BOXED_TYPE (NMACountryInfo,
+                     nma_country_info,
+                     nma_country_info_ref,
+                     nma_country_info_unref)
+
+struct _NMACountryInfo {
+       volatile gint refs;
+
+       char *country_code;
+       char *country_name;
+       GSList *providers;
+};
+
+static NMACountryInfo *
+country_info_new (const char *country_code,
+                  const gchar *country_name)
+{
+       NMACountryInfo *country_info;
+
+       country_info = g_slice_new0 (NMACountryInfo);
+       country_info->refs = 1;
+       country_info->country_code = g_strdup (country_code);
+       country_info->country_name = g_strdup (country_name);
+       return country_info;
+}
+
+NMACountryInfo *
+nma_country_info_ref (NMACountryInfo *country_info)
+{
+       g_return_val_if_fail (country_info != NULL, NULL);
+       g_return_val_if_fail (country_info->refs > 0, NULL);
+
+       g_atomic_int_inc (&country_info->refs);
+
+       return country_info;
+}
+
+void
+nma_country_info_unref (NMACountryInfo *country_info)
+{
+       if (g_atomic_int_dec_and_test (&country_info->refs)) {
+               g_free (country_info->country_code);
+               g_free (country_info->country_name);
+               g_slist_free_full (country_info->providers,
+                                  (GDestroyNotify) nma_mobile_provider_unref);
+               g_slice_free (NMACountryInfo, country_info);
+       }
+}
+
+/**
+ * nma_country_info_get_country_code:
+ * @country_info: a #NMACountryInfo
+ *
+ * Returns: (transfer none): the code of the country or %NULL for "Unknown".
+ */
+const gchar *
+nma_country_info_get_country_code (NMACountryInfo *country_info)
+{
+       g_return_val_if_fail (country_info != NULL, NULL);
+
+       if (country_info->country_code[0] == '\0')
+               return NULL;
+
+       return country_info->country_code;
+}
+
+/**
+ * nma_country_info_get_country_name:
+ * @country_info: a #NMACountryInfo
+ *
+ * Returns: (transfer none): the name of the country.
+ */
+const gchar *
+nma_country_info_get_country_name (NMACountryInfo *country_info)
+{
+       g_return_val_if_fail (country_info != NULL, NULL);
+
+       return country_info->country_name;
+}
+
+/**
+ * nma_country_info_get_providers:
+ * @country_info: a #NMACountryInfo
+ *
+ * Returns: (element-type NMAMobileProvider) (transfer none): the
+ *      list of #NMAMobileProvider this country exposes.
+ */
+GSList *
+nma_country_info_get_providers (NMACountryInfo *country_info)
+{
+       g_return_val_if_fail (country_info != NULL, NULL);
+
+       return country_info->providers;
+}
+
+/******************************************************************************/
+/* XML Parser for iso_3166.xml */
+
+static void
+iso_3166_parser_start_element (GMarkupParseContext *context,
+                               const gchar *element_name,
+                               const gchar **attribute_names,
+                               const gchar **attribute_values,
+                               gpointer data,
+                               GError **error)
+{
+       int i;
+       const char *country_code = NULL;
+       const char *common_name = NULL;
+       const char *name = NULL;
+       GHashTable *table = (GHashTable *) data;
+
+       if (!strcmp (element_name, "iso_3166_entry")) {
+               NMACountryInfo *country_info;
+
+               for (i = 0; attribute_names && attribute_names[i]; i++) {
+                       if (!strcmp (attribute_names[i], "alpha_2_code"))
+                               country_code = attribute_values[i];
+                       else if (!strcmp (attribute_names[i], "common_name"))
+                               common_name = attribute_values[i];
+                       else if (!strcmp (attribute_names[i], "name"))
+                               name = attribute_values[i];
+               }
+               if (!country_code) {
+                       g_warning ("%s: missing mandatory 'alpha_2_code' atribute in '%s'"
+                                  " element.", __func__, element_name);
+                       return;
+               }
+               if (!name) {
+                       g_warning ("%s: missing mandatory 'name' atribute in '%s'"
+                                  " element.", __func__, element_name);
+                       return;
+               }
+
+               country_info = country_info_new (country_code,
+                                                dgettext ("iso_3166", common_name ? common_name : name));
+
+               g_hash_table_insert (table, g_strdup (country_code), country_info);
+       }
+}
+
+static const GMarkupParser iso_3166_parser = {
+       iso_3166_parser_start_element,
+       NULL, /* end element */
+       NULL, /* text */
+       NULL, /* passthrough */
+       NULL  /* error */
+};
+
+static gboolean
+read_country_codes (GHashTable *table,
+                    const gchar *country_codes_file,
+                    GCancellable *cancellable,
+                    GError **error)
+{
+       GMarkupParseContext *ctx;
+       char *buf;
+       gsize buf_len;
+
+       /* Set domain to iso_3166 for country name translation */
+       bindtextdomain ("iso_3166", ISO_CODES_PREFIX "/locale");
+       bind_textdomain_codeset ("iso_3166", "UTF-8");
+
+       if (!g_file_get_contents (country_codes_file, &buf, &buf_len, error)) {
+               g_prefix_error (error,
+                               "Failed to load '%s' from 'iso-codes': ",
+                               country_codes_file);
+               return FALSE;
+       }
+
+       ctx = g_markup_parse_context_new (&iso_3166_parser, 0, table, NULL);
+       if (!g_markup_parse_context_parse (ctx, buf, buf_len, error)) {
+               g_prefix_error (error,
+                               "Failed to parse '%s' from 'iso-codes': ",
+                               country_codes_file);
+               return FALSE;
+       }
+
+       g_markup_parse_context_free (ctx);
+       g_free (buf);
+       return TRUE;
+}
+
+/******************************************************************************/
+/* XML Parser for serviceproviders.xml */
+
+typedef enum {
+       PARSER_TOPLEVEL = 0,
+       PARSER_COUNTRY,
+       PARSER_PROVIDER,
+       PARSER_METHOD_GSM,
+       PARSER_METHOD_GSM_APN,
+       PARSER_METHOD_CDMA,
+       PARSER_ERROR
+} MobileContextState;
+
+typedef struct {
+       GHashTable *table;
+
+       NMACountryInfo *current_country;
+       char *country_code;
+       NMAMobileProvider *current_provider;
+       NMAMobileAccessMethod *current_method;
+
+       char *text_buffer;
+       MobileContextState state;
+} MobileParser;
+
+static NMACountryInfo *
+lookup_country (GHashTable *table, const char *country_code)
+{
+       NMACountryInfo *country_info;
+
+       country_info = g_hash_table_lookup (table, country_code);
+       if (!country_info) {
+               g_warning ("%s: adding providers for unknown country '%s'", __func__, country_code);
+               country_info = g_hash_table_lookup (table, "");
+       }
+
+       return country_info;
+}
+
+static void
+parser_toplevel_start (MobileParser *parser,
+                       const char *name,
+                       const char **attribute_names,
+                       const char **attribute_values)
+{
+       int i;
+
+       if (!strcmp (name, "serviceproviders")) {
+               for (i = 0; attribute_names && attribute_names[i]; i++) {
+                       if (!strcmp (attribute_names[i], "format")) {
+                               if (strcmp (attribute_values[i], "2.0")) {
+                                       g_warning ("%s: mobile broadband provider database format '%s'"
+                                                  " not supported.", __func__, attribute_values[i]);
+                                       parser->state = PARSER_ERROR;
+                                       break;
+                               }
+                       }
+               }
+       } else if (!strcmp (name, "country")) {
+               for (i = 0; attribute_names && attribute_names[i]; i++) {
+                       if (!strcmp (attribute_names[i], "code")) {
+                               g_free (parser->country_code);
+                               parser->country_code = g_ascii_strup (attribute_values[i], -1);
+                               parser->current_country = lookup_country (parser->table, 
parser->country_code);
+                               parser->state = PARSER_COUNTRY;
+                               break;
+                       }
+               }
+       }
+}
+
+static void
+parser_country_start (MobileParser *parser,
+                      const char *name,
+                      const char **attribute_names,
+                      const char **attribute_values)
+{
+       if (!strcmp (name, "provider")) {
+               parser->state = PARSER_PROVIDER;
+               parser->current_provider = provider_new ();
+       }
+}
+
+static void
+parser_provider_start (MobileParser *parser,
+                       const char *name,
+                       const char **attribute_names,
+                       const char **attribute_values)
+{
+       if (!strcmp (name, "gsm"))
+               parser->state = PARSER_METHOD_GSM;
+       else if (!strcmp (name, "cdma")) {
+               parser->state = PARSER_METHOD_CDMA;
+               parser->current_method = access_method_new ();
+       }
+}
+
+static void
+parser_gsm_start (MobileParser *parser,
+                  const char *name,
+                  const char **attribute_names,
+                  const char **attribute_values)
+{
+       if (!strcmp (name, "network-id")) {
+               const char *mcc = NULL, *mnc = NULL;
+               int i;
+
+               for (i = 0; attribute_names && attribute_names[i]; i++) {
+                       if (!strcmp (attribute_names[i], "mcc"))
+                               mcc = attribute_values[i];
+                       else if (!strcmp (attribute_names[i], "mnc"))
+                               mnc = attribute_values[i];
+
+                       if (mcc && strlen (mcc) && mnc && strlen (mnc)) {
+                               gchar *mccmnc;
+
+                               if (!parser->current_provider->mcc_mnc)
+                                       parser->current_provider->mcc_mnc = g_ptr_array_new_full (2, g_free);
+
+                               mccmnc = g_strdup_printf ("%s%s", mcc, mnc);
+                               g_ptr_array_add (parser->current_provider->mcc_mnc, mccmnc);
+                               break;
+                       }
+               }
+       } else if (!strcmp (name, "apn")) {
+               int i;
+
+               for (i = 0; attribute_names && attribute_names[i]; i++) {
+                       if (!strcmp (attribute_names[i], "value")) {
+
+                               parser->state = PARSER_METHOD_GSM_APN;
+                               parser->current_method = access_method_new ();
+                               parser->current_method->apn = g_strstrip (g_strdup (attribute_values[i]));
+                               break;
+                       }
+               }
+       }
+}
+
+static void
+parser_cdma_start (MobileParser *parser,
+                   const char *name,
+                   const char **attribute_names,
+                   const char **attribute_values)
+{
+       if (!strcmp (name, "sid")) {
+               int i;
+
+               for (i = 0; attribute_names && attribute_names[i]; i++) {
+                       if (!strcmp (attribute_names[i], "value")) {
+                               guint32 tmp;
+
+                               errno = 0;
+                               tmp = (guint32) strtoul (attribute_values[i], NULL, 10);
+                               if (errno == 0 && tmp > 0) {
+                                       if (!parser->current_provider->cdma_sid)
+                                               parser->current_provider->cdma_sid = g_array_sized_new (TRUE, 
FALSE, sizeof (guint32), 2);
+                                       g_array_append_val (parser->current_provider->cdma_sid, tmp);
+                               }
+                               break;
+                       }
+               }
+       }
+}
+
+static void
+mobile_parser_start_element (GMarkupParseContext *context,
+                             const gchar *element_name,
+                             const gchar **attribute_names,
+                             const gchar **attribute_values,
+                             gpointer data,
+                             GError **error)
+{
+       MobileParser *parser = (MobileParser *) data;
+
+       if (parser->text_buffer) {
+               g_free (parser->text_buffer);
+               parser->text_buffer = NULL;
+       }
+
+       switch (parser->state) {
+       case PARSER_TOPLEVEL:
+               parser_toplevel_start (parser, element_name, attribute_names, attribute_values);
+               break;
+       case PARSER_COUNTRY:
+               parser_country_start (parser, element_name, attribute_names, attribute_values);
+               break;
+       case PARSER_PROVIDER:
+               parser_provider_start (parser, element_name, attribute_names, attribute_values);
+               break;
+       case PARSER_METHOD_GSM:
+               parser_gsm_start (parser, element_name, attribute_names, attribute_values);
+               break;
+       case PARSER_METHOD_CDMA:
+               parser_cdma_start (parser, element_name, attribute_names, attribute_values);
+               break;
+       default:
+               break;
+       }
+}
+
+static void
+parser_country_end (MobileParser *parser,
+                    const char *name)
+{
+       if (!strcmp (name, "country")) {
+               parser->current_country = NULL;
+               g_free (parser->country_code);
+               parser->country_code = NULL;
+               g_free (parser->text_buffer);
+               parser->text_buffer = NULL;
+               parser->state = PARSER_TOPLEVEL;
+       }
+}
+
+static void
+parser_provider_end (MobileParser *parser,
+                     const char *name)
+{
+       if (!strcmp (name, "name")) {
+               if (!parser->current_provider->name) {
+                       /* Use the first one. */
+                       if (nma_country_info_get_country_code (parser->current_country)) {
+                               parser->current_provider->name = parser->text_buffer;
+                       } else {
+                               parser->current_provider->name = g_strdup_printf ("%s (%s)",
+                                                                                 parser->text_buffer,
+                                                                                 parser->country_code);
+                               g_free (parser->text_buffer);
+                       }
+                       parser->text_buffer = NULL;
+               }
+       } else if (!strcmp (name, "provider")) {
+               if (parser->current_provider->mcc_mnc)
+                       g_ptr_array_add (parser->current_provider->mcc_mnc, NULL);
+
+               parser->current_provider->methods = g_slist_reverse (parser->current_provider->methods);
+
+               parser->current_country->providers = g_slist_prepend (parser->current_country->providers,
+                                                                     parser->current_provider);
+               parser->current_provider = NULL;
+               g_free (parser->text_buffer);
+               parser->text_buffer = NULL;
+               parser->state = PARSER_COUNTRY;
+       }
+}
+
+static void
+parser_gsm_end (MobileParser *parser,
+                const char *name)
+{
+       if (!strcmp (name, "gsm")) {
+               g_free (parser->text_buffer);
+               parser->text_buffer = NULL;
+               parser->state = PARSER_PROVIDER;
+       }
+}
+
+static void
+parser_gsm_apn_end (MobileParser *parser,
+                    const char *name)
+{
+       if (!strcmp (name, "name")) {
+               if (!parser->current_method->name) {
+                       /* Use the first one. */
+                       parser->current_method->name = parser->text_buffer;
+                       parser->text_buffer = NULL;
+               }
+       } else if (!strcmp (name, "username")) {
+               parser->current_method->username = parser->text_buffer;
+               parser->text_buffer = NULL;
+       } else if (!strcmp (name, "password")) {
+               parser->current_method->password = parser->text_buffer;
+               parser->text_buffer = NULL;
+       } else if (!strcmp (name, "dns")) {
+               if (!parser->current_method->dns)
+                       parser->current_method->dns = g_ptr_array_new_full (2, g_free);
+               g_ptr_array_add (parser->current_method->dns, parser->text_buffer);
+               parser->text_buffer = NULL;
+       } else if (!strcmp (name, "gateway")) {
+               parser->current_method->gateway = parser->text_buffer;
+               parser->text_buffer = NULL;
+       } else if (!strcmp (name, "apn")) {
+               parser->current_method->family = NMA_MOBILE_FAMILY_3GPP;
+
+               if (!parser->current_method->name)
+                       parser->current_method->name = g_strdup (_("Default"));
+
+               if (parser->current_method->dns)
+                       g_ptr_array_add (parser->current_method->dns, NULL);
+
+               parser->current_provider->methods = g_slist_prepend (parser->current_provider->methods,
+                                                                    parser->current_method);
+               parser->current_method = NULL;
+               g_free (parser->text_buffer);
+               parser->text_buffer = NULL;
+               parser->state = PARSER_METHOD_GSM;
+       }
+}
+
+static void
+parser_cdma_end (MobileParser *parser,
+                 const char *name)
+{
+       if (!strcmp (name, "username")) {
+               parser->current_method->username = parser->text_buffer;
+               parser->text_buffer = NULL;
+       } else if (!strcmp (name, "password")) {
+               parser->current_method->password = parser->text_buffer;
+               parser->text_buffer = NULL;
+       } else if (!strcmp (name, "dns")) {
+               if (!parser->current_method->dns)
+                       parser->current_method->dns = g_ptr_array_new_full (2, g_free);
+               g_ptr_array_add (parser->current_method->dns, parser->text_buffer);
+               parser->text_buffer = NULL;
+       } else if (!strcmp (name, "gateway")) {
+               parser->current_method->gateway = parser->text_buffer;
+               parser->text_buffer = NULL;
+       } else if (!strcmp (name, "cdma")) {
+               parser->current_method->family = NMA_MOBILE_FAMILY_CDMA;
+
+               if (!parser->current_method->name)
+                       parser->current_method->name = g_strdup (parser->current_provider->name);
+
+               if (parser->current_method->dns)
+                       g_ptr_array_add (parser->current_method->dns, NULL);
+
+               parser->current_provider->methods = g_slist_prepend (parser->current_provider->methods,
+                                                                    parser->current_method);
+               parser->current_method = NULL;
+               g_free (parser->text_buffer);
+               parser->text_buffer = NULL;
+               parser->state = PARSER_PROVIDER;
+       }
+}
+
+static void
+mobile_parser_end_element (GMarkupParseContext *context,
+                           const gchar *element_name,
+                           gpointer data,
+                           GError **error)
+{
+       MobileParser *parser = (MobileParser *) data;
+
+       switch (parser->state) {
+       case PARSER_COUNTRY:
+               parser_country_end (parser, element_name);
+               break;
+       case PARSER_PROVIDER:
+               parser_provider_end (parser, element_name);
+               break;
+       case PARSER_METHOD_GSM:
+               parser_gsm_end (parser, element_name);
+               break;
+       case PARSER_METHOD_GSM_APN:
+               parser_gsm_apn_end (parser, element_name);
+               break;
+       case PARSER_METHOD_CDMA:
+               parser_cdma_end (parser, element_name);
+               break;
+       default:
+               break;
+       }
+}
+
+static void
+mobile_parser_characters (GMarkupParseContext *context,
+                          const gchar *text,
+                          gsize text_len,
+                          gpointer data,
+                          GError **error)
+{
+       MobileParser *parser = (MobileParser *) data;
+
+       g_free (parser->text_buffer);
+       parser->text_buffer = g_strdup (text);
+}
+
+static const GMarkupParser mobile_parser = {
+       mobile_parser_start_element,
+       mobile_parser_end_element,
+       mobile_parser_characters,
+       NULL, /* passthrough */
+       NULL /* error */
+};
+
+static gboolean
+read_service_providers (GHashTable *countries,
+                        const gchar *service_providers,
+                        GCancellable *cancellable,
+                        GError **error)
+{
+       GMarkupParseContext *ctx;
+       GIOChannel *channel;
+       MobileParser parser;
+       char buffer[4096];
+       GIOStatus status;
+       gsize len = 0;
+
+       memset (&parser, 0, sizeof (MobileParser));
+       parser.table = countries;
+
+       channel = g_io_channel_new_file (service_providers, "r", error);
+       if (!channel) {
+               g_prefix_error (error,
+                               "Could not read '%s': ",
+                               service_providers);
+               return FALSE;
+       }
+
+       parser.state = PARSER_TOPLEVEL;
+
+       ctx = g_markup_parse_context_new (&mobile_parser, 0, &parser, NULL);
+
+       status = G_IO_STATUS_NORMAL;
+       while (status == G_IO_STATUS_NORMAL) {
+               status = g_io_channel_read_chars (channel, buffer, sizeof (buffer), &len, error);
+
+               switch (status) {
+               case G_IO_STATUS_NORMAL:
+                       if (!g_markup_parse_context_parse (ctx, buffer, len, error)) {
+                               status = G_IO_STATUS_ERROR;
+                               g_prefix_error (error,
+                                               "Error while parsing XML at '%s': ",
+                                               service_providers);
+                       }
+                       break;
+               case G_IO_STATUS_EOF:
+                       break;
+               case G_IO_STATUS_ERROR:
+                       g_prefix_error (error,
+                                       "Error while reading '%s': ",
+                                       service_providers);
+                       break;
+               case G_IO_STATUS_AGAIN:
+                       /* FIXME: Try again a few times, but really, it never happens, right? */
+                       break;
+               }
+
+               if (g_cancellable_set_error_if_cancelled (cancellable, error))
+                       status = G_IO_STATUS_ERROR;
+       }
+
+       g_io_channel_unref (channel);
+       g_markup_parse_context_free (ctx);
+
+       if (parser.current_provider) {
+               g_warning ("pending current provider");
+               nma_mobile_provider_unref (parser.current_provider);
+       }
+
+       g_free (parser.text_buffer);
+
+       return (status == G_IO_STATUS_EOF);
+}
+
+static GHashTable *
+mobile_providers_parse_sync (const gchar *country_codes,
+                             const gchar *service_providers,
+                             GCancellable *cancellable,
+                             GError **error)
+{
+       GHashTable *countries;
+       char *path;
+       const gchar * const *dirs;
+       int i;
+       gboolean success;
+
+       dirs = g_get_system_data_dirs ();
+       countries = g_hash_table_new_full (g_str_hash,
+                                           g_str_equal,
+                                           g_free,
+                                           (GDestroyNotify)nma_country_info_unref);
+
+       g_hash_table_insert (countries, g_strdup (""),
+                            country_info_new ("", _("My country is not listed")));
+
+       /* Use default paths if none given */
+       if (country_codes) {
+               if (!read_country_codes (countries, country_codes, cancellable, error)) {
+                       g_hash_table_unref (countries);
+                       return FALSE;
+               }
+       } else {
+               /* First try the user override file. */
+               path = g_build_filename (g_get_user_data_dir (), ISO_3166_COUNTRY_CODES, NULL);
+               success = read_country_codes (countries, path, cancellable, NULL);
+               g_free (path);
+
+               /* Look in system locations. */
+               for (i = 0; dirs[i] && !success; i++) {
+                       path = g_build_filename (dirs[i], ISO_3166_COUNTRY_CODES, NULL);
+                       success = read_country_codes (countries, path, cancellable, NULL);
+                       g_free (path);
+               }
+
+               if (!success) {
+                       path = g_build_filename (ISO_CODES_PREFIX, "share", ISO_3166_COUNTRY_CODES, NULL);
+                       success = read_country_codes (countries, path, cancellable, NULL);
+                       g_free (path);
+               }
+
+               if (!success) {
+                       g_warning ("Could not find the country codes file (%s): check your installation\n",
+                                  ISO_3166_COUNTRY_CODES);
+               }
+       }
+
+       if (service_providers) {
+               if (!read_service_providers (countries, service_providers, cancellable, error)) {
+                       g_hash_table_unref (countries);
+                       return FALSE;
+               }
+       } else {
+               /* First try the user override file. */
+               path = g_build_filename (g_get_user_data_dir (), MOBILE_BROADBAND_PROVIDER_INFO, NULL);
+               success = read_service_providers (countries, path, cancellable, NULL);
+               g_free (path);
+
+               /* Look in system locations. */
+               for (i = 0; dirs[i] && !success; i++) {
+                       path = g_build_filename (dirs[i], MOBILE_BROADBAND_PROVIDER_INFO, NULL);
+                       success = read_service_providers (countries, path, cancellable, NULL);
+                       g_free (path);
+               }
+
+               if (!success) {
+                       success = read_service_providers (countries, MOBILE_BROADBAND_PROVIDER_INFO_DATABASE, 
cancellable, NULL);
+               }
+
+               if (!success) {
+                       g_warning ("Could not find the provider data (%s): check your installation\n",
+                                  MOBILE_BROADBAND_PROVIDER_INFO);
+               }
+       }
+
+       return countries;
+}
+
+/******************************************************************************/
+/* Dump to stdout contents */
+
+static void
+dump_generic (NMAMobileAccessMethod *method)
+{
+       g_print ("                username: %s\n", method->username ? method->username : "");
+       g_print ("                password: %s\n", method->password ? method->password : "");
+
+       if (method->dns) {
+               guint i;
+               const gchar **dns;
+               GString *dns_str;
+
+               dns = nma_mobile_access_method_get_dns (method);
+               dns_str = g_string_new (NULL);
+               for (i = 0; dns[i]; i++)
+                       g_string_append_printf (dns_str, "%s%s", i == 0 ? "" : ", ", dns[i]);
+               g_print ("                dns     : %s\n", dns_str->str);
+               g_string_free (dns_str, TRUE);
+       }
+
+       g_print ("                gateway : %s\n", method->gateway ? method->gateway : "");
+}
+
+static void
+dump_cdma (NMAMobileAccessMethod *method)
+{
+       g_print ("         CDMA: %s\n", method->name);
+
+       dump_generic (method);
+}
+
+static void
+dump_3gpp (NMAMobileAccessMethod *method)
+{
+       g_print ("         APN: %s (%s)\n", method->name, method->apn);
+
+       dump_generic (method);
+}
+
+static void
+dump_country (gpointer key, gpointer value, gpointer user_data)
+{
+       GSList *miter, *citer;
+       NMACountryInfo *country_info = value;
+
+       g_print ("Country: %s (%s)\n",
+                country_info->country_code,
+                country_info->country_name);
+
+       for (citer = country_info->providers; citer; citer = g_slist_next (citer)) {
+               NMAMobileProvider *provider = citer->data;
+               const gchar **mcc_mnc;
+               const guint *sid;
+               guint n;
+
+               g_print ("        Provider: %s (%s)\n", provider->name, (const char *) key);
+
+               mcc_mnc = nma_mobile_provider_get_3gpp_mcc_mnc (provider);
+               if (mcc_mnc) {
+                       for (n = 0; mcc_mnc[n]; n++)
+                               g_print ("                MCC/MNC: %s\n", mcc_mnc[n]);
+               }
+
+               sid = nma_mobile_provider_get_cdma_sid (provider);
+               if (sid) {
+                       for (n = 0; sid[n]; n++)
+                               g_print ("                SID: %u\n", sid[n]);
+               }
+
+               for (miter = provider->methods; miter; miter = g_slist_next (miter)) {
+                       NMAMobileAccessMethod *method = miter->data;
+
+                       switch (method->family) {
+                       case NMA_MOBILE_FAMILY_CDMA:
+                               dump_cdma (method);
+                               break;
+                       case NMA_MOBILE_FAMILY_3GPP:
+                               dump_3gpp (method);
+                               break;
+                       default:
+                               break;
+                       }
+                       g_print ("\n");
+               }
+       }
+}
+
+/******************************************************************************/
+/* Mobile providers database type */
+
+static void initable_iface_init       (GInitableIface      *iface);
+static void async_initable_iface_init (GAsyncInitableIface *iface);
+
+G_DEFINE_TYPE_EXTENDED (NMAMobileProvidersDatabase, nma_mobile_providers_database, G_TYPE_OBJECT, 0,
+                        G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init)
+                        G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init))
+
+enum {
+       PROP_0,
+       PROP_COUNTRY_CODES_PATH,
+       PROP_SERVICE_PROVIDERS_PATH,
+       PROP_LAST
+};
+
+static GParamSpec *properties[PROP_LAST];
+
+struct _NMAMobileProvidersDatabasePrivate {
+       /* Paths to input files */
+       gchar *country_codes_path;
+       gchar *service_providers_path;
+
+       /* The HT with country code as key and NMACountryInfo as value. */
+       GHashTable *countries;
+};
+
+/**********************************/
+
+/**
+ * nma_mobile_providers_database_get_countries:
+ * @self: a #NMAMobileProvidersDatabase.
+ *
+ * Returns: (element-type utf8 NMACountryInfo) (transfer none): a
+ *      hash table where keys are country names #gchar and values are #NMACountryInfo.
+ */
+GHashTable *
+nma_mobile_providers_database_get_countries (NMAMobileProvidersDatabase *self)
+{
+       g_return_val_if_fail (NMA_IS_MOBILE_PROVIDERS_DATABASE (self), NULL);
+
+       /* Warn if the object hasn't been initialized */
+       g_return_val_if_fail (self->priv->countries != NULL, NULL);
+
+       return self->priv->countries;
+}
+
+/**
+ * nma_mobile_providers_database_dump:
+ * @self: a #NMAMobileProvidersDatabase.
+ *
+ */
+void
+nma_mobile_providers_database_dump (NMAMobileProvidersDatabase *self)
+{
+       g_return_if_fail (NMA_IS_MOBILE_PROVIDERS_DATABASE (self));
+
+       /* Warn if the object hasn't been initialized */
+       g_return_if_fail (self->priv->countries != NULL);
+
+       g_hash_table_foreach (self->priv->countries, dump_country, NULL);
+}
+
+/**
+ * nma_mobile_providers_database_lookup_country:
+ * @self: a #NMAMobileProvidersDatabase.
+ * @country_code: the country code string to look for.
+ *
+ * Returns: (transfer none): a #NMACountryInfo or %NULL if not found.
+ */
+NMACountryInfo *
+nma_mobile_providers_database_lookup_country (NMAMobileProvidersDatabase *self,
+                                              const gchar *country_code)
+{
+       g_return_val_if_fail (NMA_IS_MOBILE_PROVIDERS_DATABASE (self), NULL);
+
+       /* Warn if the object hasn't been initialized */
+       g_return_val_if_fail (self->priv->countries != NULL, NULL);
+
+       return (NMACountryInfo *) g_hash_table_lookup (self->priv->countries, country_code);
+}
+
+/**
+ * nma_mobile_providers_database_lookup_3gpp_mcc_mnc:
+ * @self: a #NMAMobileProvidersDatabase.
+ * @mccmnc: the MCC/MNC string to look for.
+ *
+ * Returns: (transfer none): a #NMAMobileProvider or %NULL if not found.
+ */
+NMAMobileProvider *
+nma_mobile_providers_database_lookup_3gpp_mcc_mnc (NMAMobileProvidersDatabase *self,
+                                                   const gchar *mccmnc)
+{
+       GHashTableIter iter;
+       gpointer value;
+       GSList *piter;
+       NMAMobileProvider *provider_match_2mnc = NULL;
+       guint mccmnc_len;
+
+       g_return_val_if_fail (NMA_IS_MOBILE_PROVIDERS_DATABASE (self), NULL);
+       g_return_val_if_fail (mccmnc != NULL, NULL);
+       /* Warn if the object hasn't been initialized */
+       g_return_val_if_fail (self->priv->countries != NULL, NULL);
+
+       /* Expect only 5 or 6 digit MCCMNC strings */
+       mccmnc_len = strlen (mccmnc);
+       if (mccmnc_len != 5 && mccmnc_len != 6)
+               return NULL;
+
+       g_hash_table_iter_init (&iter, self->priv->countries);
+       /* Search through each country */
+       while (g_hash_table_iter_next (&iter, NULL, &value)) {
+               NMACountryInfo *country_info = value;
+
+               /* Search through each country's providers */
+               for (piter = nma_country_info_get_providers (country_info);
+                    piter;
+                    piter = g_slist_next (piter)) {
+                       NMAMobileProvider *provider = piter->data;
+                       const gchar **mccmnc_list;
+                       guint i;
+
+                       /* Search through MCC/MNC list */
+                       mccmnc_list = nma_mobile_provider_get_3gpp_mcc_mnc (provider);
+                       if (!mccmnc_list)
+                               continue;
+
+                       for (i = 0; mccmnc_list[i]; i++) {
+                               const gchar *mccmnc_iter;
+                               guint mccmnc_iter_len;
+
+                               mccmnc_iter = mccmnc_list[i];
+                               mccmnc_iter_len = strlen (mccmnc_iter);
+
+                               /* Match both 2-digit and 3-digit MNC; prefer a
+                                * 3-digit match if found, otherwise a 2-digit one.
+                                */
+
+                               if (strncmp (mccmnc_iter, mccmnc, 3))
+                                       /* MCC was wrong */
+                                       continue;
+
+                               /* Now we have the following match cases, examples given:
+                                *  a) input: 123/456 --> iter: 123/456 (3-digit match)
+                                *  b) input: 123/45  --> iter: 123/045 (3-digit match)
+                                *  c) input: 123/045 --> iter: 123/45  (2-digit match)
+                                *  d) input: 123/45  --> iter: 123/45  (2-digit match)
+                                */
+
+                               if (mccmnc_iter_len == 6) {
+                                       /* Covers cases a) and b) */
+                                       if (   (mccmnc_len == 6 && !strncmp (mccmnc + 3, mccmnc_iter + 3, 3))
+                                           || (mccmnc_len == 5 && mccmnc_iter[3] == '0' && !strncmp (mccmnc 
+ 3, mccmnc_iter + 4, 2)))
+                                               /* 3-digit MNC match! */
+                                               return provider;
+
+                                       /* MNC was wrong */
+                                       continue;
+                               }
+
+                               if (   !provider_match_2mnc
+                                   && mccmnc_iter_len == 5) {
+                                       if (   (mccmnc_len == 5 && !strncmp (mccmnc + 3, mccmnc_iter + 3, 2))
+                                           || (mccmnc_len == 6 && mccmnc[3] == '0' && !strncmp (mccmnc + 4, 
mccmnc_iter + 3, 2))) {
+                                               /* Store the 2-digit MNC match, but keep looking,
+                                                * we may have a 3-digit MNC match */
+                                               provider_match_2mnc = provider;
+                                               continue;
+                                       }
+
+                                       /* MNC was wrong */
+                                       continue;
+                               }
+                       }
+               }
+       }
+
+       return provider_match_2mnc;
+}
+
+/**
+ * nma_mobile_providers_database_lookup_cdma_sid:
+ * @self: a #NMAMobileProvidersDatabase.
+ * @sid: the SID to look for.
+ *
+ * Returns: (transfer none): a #NMAMobileProvider, or %NULL if not found.
+ */
+NMAMobileProvider *
+nma_mobile_providers_database_lookup_cdma_sid (NMAMobileProvidersDatabase *self,
+                                               guint32 sid)
+{
+       GHashTableIter iter;
+       gpointer value;
+       GSList *piter;
+
+       g_return_val_if_fail (NMA_IS_MOBILE_PROVIDERS_DATABASE (self), NULL);
+       g_return_val_if_fail (sid > 0, NULL);
+       /* Warn if the object hasn't been initialized */
+       g_return_val_if_fail (self->priv->countries != NULL, NULL);
+
+       g_hash_table_iter_init (&iter, self->priv->countries);
+       /* Search through each country */
+       while (g_hash_table_iter_next (&iter, NULL, &value)) {
+               NMACountryInfo *country_info = value;
+
+               /* Search through each country's providers */
+               for (piter = nma_country_info_get_providers (country_info);
+                    piter;
+                    piter = g_slist_next (piter)) {
+                       NMAMobileProvider *provider = piter->data;
+                       const guint32 *sid_list;
+                       guint i;
+
+                       /* Search through CDMA SID list */
+                       sid_list = nma_mobile_provider_get_cdma_sid (provider);
+                       if (!sid_list)
+                               continue;
+
+                       for (i = 0; sid_list[i]; i++) {
+                               if (sid == sid_list[i])
+                                       return provider;
+                       }
+               }
+       }
+
+       return NULL;
+}
+
+/**********************************/
+
+static gboolean
+initable_init_sync (GInitable     *initable,
+                    GCancellable  *cancellable,
+                    GError       **error)
+{
+       NMAMobileProvidersDatabase *self = NMA_MOBILE_PROVIDERS_DATABASE (initable);
+
+       /* Parse the files */
+       self->priv->countries = mobile_providers_parse_sync (self->priv->country_codes_path,
+                                                            self->priv->service_providers_path,
+                                                            cancellable,
+                                                            error);
+       if (!self->priv->countries)
+               return FALSE;
+
+       /* All good */
+       return TRUE;
+}
+
+/**********************************/
+
+/**
+ * nma_mobile_providers_database_new:
+ * @country_codes: (allow-none): Path to the country codes file.
+ * @service_providers: (allow-none): Path to the service providers file.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
+ * @user_data: User data to pass to @callback.
+ *
+ */
+void
+nma_mobile_providers_database_new (const gchar *country_codes,
+                                   const gchar *service_providers,
+                                   GCancellable *cancellable,
+                                   GAsyncReadyCallback callback,
+                                   gpointer user_data)
+{
+       g_async_initable_new_async (NMA_TYPE_MOBILE_PROVIDERS_DATABASE,
+                                   G_PRIORITY_DEFAULT,
+                                   cancellable,
+                                   callback,
+                                   user_data,
+                                   "country-codes",     country_codes,
+                                   "service-providers", service_providers,
+                                   NULL);
+}
+
+/**
+ * nma_mobile_providers_database_new_finish:
+ * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to 
nma_mobile_providers_database_new().
+ * @error: Return location for error or %NULL.
+ *
+ * Returns: (transfer full) (type NMAMobileProvidersDatabase): The constructed object or %NULL if @error is 
set.
+ */
+NMAMobileProvidersDatabase *
+nma_mobile_providers_database_new_finish (GAsyncResult *res,
+                                          GError **error)
+{
+       GObject *initable;
+       GObject *out;
+
+       initable = g_async_result_get_source_object (res);
+       out = g_async_initable_new_finish (G_ASYNC_INITABLE (initable), res, error);
+       g_object_unref (initable);
+
+       return out ? NMA_MOBILE_PROVIDERS_DATABASE (out) : NULL;
+}
+
+/**
+ * nma_mobile_providers_database_new_sync:
+ * @country_codes: (allow-none): Path to the country codes file.
+ * @service_providers: (allow-none): Path to the service providers file.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Returns: (transfer full) (type NMAMobileProvidersDatabase): The constructed object or %NULL if @error is 
set.
+ */
+NMAMobileProvidersDatabase *
+nma_mobile_providers_database_new_sync (const gchar *country_codes,
+                                        const gchar *service_providers,
+                                        GCancellable *cancellable,
+                                        GError **error)
+{
+       GObject *out;
+
+       out = g_initable_new (NMA_TYPE_MOBILE_PROVIDERS_DATABASE,
+                             cancellable,
+                             error,
+                             "country-codes",     country_codes,
+                             "service-providers", service_providers,
+                             NULL);
+
+       return out ? NMA_MOBILE_PROVIDERS_DATABASE (out) : NULL;
+}
+
+/**********************************/
+
+static void
+set_property (GObject *object,
+              guint prop_id,
+              const GValue *value,
+              GParamSpec *pspec)
+{
+       NMAMobileProvidersDatabase *self = NMA_MOBILE_PROVIDERS_DATABASE (object);
+
+       switch (prop_id) {
+       case PROP_COUNTRY_CODES_PATH:
+               self->priv->country_codes_path = g_value_dup_string (value);
+               break;
+       case PROP_SERVICE_PROVIDERS_PATH:
+               self->priv->service_providers_path = g_value_dup_string (value);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+               break;
+       }
+}
+
+static void
+get_property (GObject *object,
+              guint prop_id,
+              GValue *value,
+              GParamSpec *pspec)
+{
+       NMAMobileProvidersDatabase *self = NMA_MOBILE_PROVIDERS_DATABASE (object);
+
+       switch (prop_id) {
+       case PROP_COUNTRY_CODES_PATH:
+               g_value_set_string (value, self->priv->country_codes_path);
+               break;
+       case PROP_SERVICE_PROVIDERS_PATH:
+               g_value_set_string (value, self->priv->service_providers_path);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+               break;
+       }
+}
+
+static void
+nma_mobile_providers_database_init (NMAMobileProvidersDatabase *self)
+{
+       /* Setup private data */
+       self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+                                                 NMA_TYPE_MOBILE_PROVIDERS_DATABASE,
+                                                 NMAMobileProvidersDatabasePrivate);
+}
+
+static void
+finalize (GObject *object)
+{
+       NMAMobileProvidersDatabase *self = NMA_MOBILE_PROVIDERS_DATABASE (object);
+
+       g_free (self->priv->country_codes_path);
+       g_free (self->priv->service_providers_path);
+
+       if (self->priv->countries)
+               g_hash_table_unref (self->priv->countries);
+
+       G_OBJECT_CLASS (nma_mobile_providers_database_parent_class)->finalize (object);
+}
+
+static void
+initable_iface_init (GInitableIface *iface)
+{
+       iface->init = initable_init_sync;
+}
+
+static void
+async_initable_iface_init (GAsyncInitableIface *iface)
+{
+       /* Just use defaults (run sync init() in a thread) */
+}
+
+static void
+nma_mobile_providers_database_class_init (NMAMobileProvidersDatabaseClass *klass)
+{
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+    g_type_class_add_private (object_class, sizeof (NMAMobileProvidersDatabasePrivate));
+
+    /* Virtual methods */
+    object_class->get_property = get_property;
+    object_class->set_property = set_property;
+    object_class->finalize = finalize;
+
+    properties[PROP_COUNTRY_CODES_PATH] =
+           g_param_spec_string ("country-codes",
+                             "Country Codes",
+                             "Path to the country codes file",
+                                NULL,
+                             G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+    g_object_class_install_property (object_class, PROP_COUNTRY_CODES_PATH, 
properties[PROP_COUNTRY_CODES_PATH]);
+
+    properties[PROP_SERVICE_PROVIDERS_PATH] =
+           g_param_spec_string ("service-providers",
+                                "Service Providers",
+                                "Path to the service providers file",
+                                NULL,
+                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+    g_object_class_install_property (object_class, PROP_SERVICE_PROVIDERS_PATH, 
properties[PROP_SERVICE_PROVIDERS_PATH]);
+}
+
+/******************************************************************************/
+/* Utils */
+
+/**
+ * nma_mobile_providers_split_3gpp_mcc_mnc:
+ * @mccmnc: input MCCMNC string.
+ * @mcc: (out) (transfer full): the MCC.
+ * @mnc: (out) (transfer full): the MNC.
+ *
+ * Splits the input MCCMNC string into separate MCC and MNC strings.
+ *
+ * Returns: %TRUE if correctly split and @mcc and @mnc are set; %FALSE otherwise.
+ */
+gboolean
+nma_mobile_providers_split_3gpp_mcc_mnc (const gchar *mccmnc,
+                                         gchar **mcc,
+                                         gchar **mnc)
+{
+       gint len;
+
+       g_return_val_if_fail (mccmnc != NULL, FALSE);
+       g_return_val_if_fail (mcc != NULL, FALSE);
+       g_return_val_if_fail (mnc != NULL, FALSE);
+
+       len = strlen (mccmnc);
+       if (len != 5 && len != 6)
+               return FALSE;
+
+       /* MCCMNC is all digits */
+       while (len > 0) {
+               if (!g_ascii_isdigit (mccmnc[--len]))
+                       return FALSE;
+       }
+
+       *mcc = g_strndup (mccmnc, 3);
+       *mnc = g_strdup (mccmnc + 3);
+       return TRUE;
+}
diff --git a/src/libnma/nma-mobile-providers.h b/src/libnma/nma-mobile-providers.h
new file mode 100644
index 00000000..913aada8
--- /dev/null
+++ b/src/libnma/nma-mobile-providers.h
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/*
+ * Copyright (C) 2009 Novell, Inc.
+ * Author: Tambet Ingo (tambet gmail com).
+ *
+ * Copyright (C) 2009 - 2012 Red Hat, Inc.
+ * Copyright (C) 2012 Lanedo GmbH.
+ */
+
+#ifndef NM_MOBILE_PROVIDERS_H
+#define NM_MOBILE_PROVIDERS_H
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gio/gio.h>
+
+/******************************************************************************/
+/* Access method type */
+
+/**
+ * NMAMobileFamily:
+ * @NMA_MOBILE_FAMILY_UNKNOWN: Unknown or invalid network access method
+ * @NMA_MOBILE_FAMILY_3GPP: 3rd Generation Partnership Project (3GPP) network
+ * @NMA_MOBILE_FAMILY_CDMA: A CDMA network
+ */
+typedef enum {
+    NMA_MOBILE_FAMILY_UNKNOWN = 0,
+    NMA_MOBILE_FAMILY_3GPP,
+    NMA_MOBILE_FAMILY_CDMA
+} NMAMobileFamily;
+
+#define NMA_TYPE_MOBILE_ACCESS_METHOD (nma_mobile_access_method_get_type ())
+
+typedef struct _NMAMobileAccessMethod NMAMobileAccessMethod;
+
+GType                   nma_mobile_access_method_get_type     (void);
+NMAMobileAccessMethod  *nma_mobile_access_method_ref          (NMAMobileAccessMethod *method);
+void                    nma_mobile_access_method_unref        (NMAMobileAccessMethod *method);
+const gchar            *nma_mobile_access_method_get_name     (NMAMobileAccessMethod *method);
+const gchar            *nma_mobile_access_method_get_username (NMAMobileAccessMethod *method);
+const gchar            *nma_mobile_access_method_get_password (NMAMobileAccessMethod *method);
+const gchar            *nma_mobile_access_method_get_gateway  (NMAMobileAccessMethod *method);
+const gchar           **nma_mobile_access_method_get_dns      (NMAMobileAccessMethod *method);
+const gchar            *nma_mobile_access_method_get_3gpp_apn (NMAMobileAccessMethod *method);
+NMAMobileFamily         nma_mobile_access_method_get_family   (NMAMobileAccessMethod *method);
+
+/******************************************************************************/
+/* Mobile provider type */
+
+#define NMA_TYPE_MOBILE_PROVIDER (nma_mobile_provider_get_type ())
+
+typedef struct _NMAMobileProvider NMAMobileProvider;
+
+GType               nma_mobile_provider_get_type         (void);
+NMAMobileProvider  *nma_mobile_provider_ref              (NMAMobileProvider *provider);
+void                nma_mobile_provider_unref            (NMAMobileProvider *provider);
+const gchar        *nma_mobile_provider_get_name         (NMAMobileProvider *provider);
+GSList             *nma_mobile_provider_get_methods      (NMAMobileProvider *provider);
+const gchar       **nma_mobile_provider_get_3gpp_mcc_mnc (NMAMobileProvider *provider);
+const guint32      *nma_mobile_provider_get_cdma_sid     (NMAMobileProvider *provider);
+
+/******************************************************************************/
+/* Country Info type */
+
+#define NMA_TYPE_COUNTRY_INFO (nma_country_info_get_type ())
+
+typedef struct _NMACountryInfo NMACountryInfo;
+
+GType           nma_country_info_get_type         (void);
+NMACountryInfo *nma_country_info_ref              (NMACountryInfo *country_info);
+void            nma_country_info_unref            (NMACountryInfo *country_info);
+const gchar    *nma_country_info_get_country_code (NMACountryInfo *country_info);
+const gchar    *nma_country_info_get_country_name (NMACountryInfo *country_info);
+GSList         *nma_country_info_get_providers    (NMACountryInfo *country_info);
+
+/******************************************************************************/
+/* Mobile providers database type */
+
+#define NMA_TYPE_MOBILE_PROVIDERS_DATABASE            (nma_mobile_providers_database_get_type ())
+#define NMA_MOBILE_PROVIDERS_DATABASE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
NMA_TYPE_MOBILE_PROVIDERS_DATABASE, NMAMobileProvidersDatabase))
+#define NMA_MOBILE_PROVIDERS_DATABASE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), 
NMA_TYPE_MOBILE_PROVIDERS_DATABASE, NMAMobileProvidersDatabaseClass))
+#define NMA_IS_MOBILE_PROVIDERS_DATABASE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
NMA_TYPE_MOBILE_PROVIDERS_DATABASE))
+#define NMA_IS_MOBILE_PROVIDERS_DATABASE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), 
NMA_TYPE_MOBILE_PROVIDERS_DATABASE))
+#define NMA_MOBILE_PROVIDERS_DATABASE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
NMA_TYPE_MOBILE_PROVIDERS_DATABASE, NMAMobileProvidersDatabaseClass))
+
+typedef struct _NMAMobileProvidersDatabase NMAMobileProvidersDatabase;
+typedef struct _NMAMobileProvidersDatabaseClass NMAMobileProvidersDatabaseClass;
+typedef struct _NMAMobileProvidersDatabasePrivate NMAMobileProvidersDatabasePrivate;
+
+struct _NMAMobileProvidersDatabase {
+       GObject parent;
+       NMAMobileProvidersDatabasePrivate *priv;
+};
+
+struct _NMAMobileProvidersDatabaseClass {
+       GObjectClass parent;
+};
+
+GType nma_mobile_providers_database_get_type (void);
+
+void                        nma_mobile_providers_database_new        (const gchar *country_codes,
+                                                                      const gchar *service_providers,
+                                                                      GCancellable *cancellable,
+                                                                      GAsyncReadyCallback callback,
+                                                                      gpointer user_data);
+NMAMobileProvidersDatabase *nma_mobile_providers_database_new_finish (GAsyncResult *res,
+                                                                      GError **error);
+NMAMobileProvidersDatabase *nma_mobile_providers_database_new_sync   (const gchar *country_codes,
+                                                                      const gchar *service_providers,
+                                                                      GCancellable *cancellable,
+                                                                      GError **error);
+
+GHashTable        *nma_mobile_providers_database_get_countries       (NMAMobileProvidersDatabase *self);
+
+void               nma_mobile_providers_database_dump                (NMAMobileProvidersDatabase *self);
+
+NMACountryInfo    *nma_mobile_providers_database_lookup_country      (NMAMobileProvidersDatabase *self,
+                                                                      const gchar *country_code);
+NMAMobileProvider *nma_mobile_providers_database_lookup_3gpp_mcc_mnc (NMAMobileProvidersDatabase *self,
+                                                                      const gchar *mccmnc);
+NMAMobileProvider *nma_mobile_providers_database_lookup_cdma_sid     (NMAMobileProvidersDatabase *self,
+                                                                      guint32 sid);
+
+/******************************************************************************/
+/* Utils */
+
+gboolean nma_mobile_providers_split_3gpp_mcc_mnc (const gchar *mccmnc,
+                                                  gchar **mcc,
+                                                  gchar **mnc);
+
+#endif /* NM_MOBILE_PROVIDERS_H */
diff --git a/src/libnma/nma-mobile-wizard.c b/src/libnma/nma-mobile-wizard.c
new file mode 100644
index 00000000..9a4e753b
--- /dev/null
+++ b/src/libnma/nma-mobile-wizard.c
@@ -0,0 +1,1560 @@
+// SPDX-License-Identifier: GPL-2.0+
+/* NetworkManager Connection editor -- Connection editor for NetworkManager
+ *
+ * Dan Williams <dcbw redhat com>
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * (C) Copyright 2008 - 2018 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+#include "nma-private.h"
+
+#include <stdlib.h>
+
+#if GTK_CHECK_VERSION(3,90,0)
+#include <gdk/x11/gdkx.h>
+#else
+#include <gdk/gdkx.h>
+#endif
+
+#include <NetworkManager.h>
+#include <nm-setting-gsm.h>
+#include <nm-setting-cdma.h>
+#include <nm-client.h>
+#include <nm-device-modem.h>
+
+#include "nma-mobile-wizard.h"
+#include "nma-mobile-providers.h"
+#include "utils.h"
+
+#define DEVICE_TAG "device"
+#define TYPE_TAG "setting-type"
+
+#define INTRO_PAGE_IDX      0
+#define COUNTRY_PAGE_IDX    1
+#define PROVIDERS_PAGE_IDX  2
+#define PLAN_PAGE_IDX       3
+#define CONFIRM_PAGE_IDX    4
+
+static NMACountryInfo *get_selected_country (NMAMobileWizard *self);
+static NMAMobileProvider *get_selected_provider (NMAMobileWizard *self);
+static NMAMobileFamily get_provider_unlisted_type (NMAMobileWizard *self);
+static NMAMobileAccessMethod *get_selected_method (NMAMobileWizard *self, gboolean *manual);
+
+#include "nm-default.h"
+
+struct _NMAMobileWizard {
+        GtkAssistant parent;
+};
+
+struct _NMAMobileWizardClass {
+        GtkAssistantClass parent;
+};
+
+typedef struct {
+       NMAMobileWizardCallback callback;
+       gpointer user_data;
+       NMAMobileProvidersDatabase *mobile_providers_database;
+       NMAMobileFamily family;
+       gboolean initial_family;
+       gboolean will_connect_after;
+
+       /* Intro page */
+       GtkLabel *dev_combo_label;
+       GtkComboBox *dev_combo;
+       GtkLabel *provider_name_label;
+       GtkLabel *plan_name_label;
+       GtkLabel *apn_label;
+       GtkTreeStore *dev_store;
+       char *dev_desc;
+       NMClient *client;
+
+       /* Country page */
+       NMACountryInfo *country;
+       GtkWidget *country_page;
+       GtkTreeView *country_view;
+       GtkTreeStore *country_store;
+       GtkTreeModelSort *country_sort;
+       guint32 country_focus_id;
+
+       /* Providers page */
+       GtkWidget *providers_page;
+       GtkTreeView *providers_view;
+       GtkTreeStore *providers_store;
+       GtkTreeModel *providers_sort;
+       guint32 providers_focus_id;
+       GtkToggleButton *providers_view_radio;
+
+       GtkToggleButton *provider_unlisted_radio;
+       GtkComboBox *provider_unlisted_type_combo;
+
+       gboolean provider_only_cdma;
+
+       /* Plan page */
+       GtkWidget *plan_page;
+       GtkComboBox *plan_combo;
+       GtkTreeStore *plan_store;
+       guint32 plan_focus_id;
+
+       GtkEditable *plan_apn_entry;
+
+       /* Confirm page */
+       GtkWidget *confirm_page;
+       GtkLabel *confirm_provider;
+       GtkLabel *confirm_plan;
+       GtkLabel *confirm_apn;
+       GtkLabel *confirm_plan_label;
+       GtkLabel *confirm_device;
+       GtkLabel *confirm_device_label;
+       GtkWidget *confirm_connect_after_label;
+} NMAMobileWizardPrivate;
+
+#define NMA_MOBILE_WIZARD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+                                          NMA_TYPE_MOBILE_WIZARD, \
+                                          NMAMobileWizardPrivate))
+
+G_DEFINE_TYPE_WITH_CODE (NMAMobileWizard, nma_mobile_wizard, GTK_TYPE_ASSISTANT,
+                         G_ADD_PRIVATE (NMAMobileWizard))
+
+static void
+assistant_closed (GtkButton *button, gpointer user_data)
+{
+       NMAMobileWizard *self = NMA_MOBILE_WIZARD (user_data);
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       NMAMobileProvider *provider;
+       NMAMobileAccessMethod *method;
+       NMAMobileWizardAccessMethod *wiz_method;
+       NMAMobileFamily family = priv->family;
+
+       wiz_method = g_malloc0 (sizeof (NMAMobileWizardAccessMethod));
+
+       provider = get_selected_provider (self);
+       if (!provider) {
+               if (family == NMA_MOBILE_FAMILY_UNKNOWN)
+                       family = get_provider_unlisted_type (self);
+
+               switch (family) {
+               case NMA_MOBILE_FAMILY_3GPP:
+                       wiz_method->provider_name = g_strdup (_("GSM"));
+                       break;
+               case NMA_MOBILE_FAMILY_CDMA:
+                       wiz_method->provider_name = g_strdup (_("CDMA"));
+                       break;
+               case NMA_MOBILE_FAMILY_UNKNOWN:
+                       g_return_if_reached ();
+                       break;
+               }
+       } else {
+               gboolean manual = FALSE;
+
+               wiz_method->provider_name = g_strdup (nma_mobile_provider_get_name (provider));
+               method = get_selected_method (self, &manual);
+               if (method) {
+                       family = nma_mobile_access_method_get_family (method);
+                       wiz_method->plan_name = g_strdup (nma_mobile_access_method_get_name (method));
+                       wiz_method->username = g_strdup (nma_mobile_access_method_get_username (method));
+                       wiz_method->password = g_strdup (nma_mobile_access_method_get_password (method));
+                       if (family == NMA_MOBILE_FAMILY_3GPP)
+                               wiz_method->gsm_apn = g_strdup (nma_mobile_access_method_get_3gpp_apn 
(method));
+               } else {
+                       if (priv->provider_only_cdma) {
+                               GSList *methods;
+
+                               family = NMA_MOBILE_FAMILY_CDMA;
+
+                               methods = nma_mobile_provider_get_methods (provider);
+                               /* Take username and password from the first (only) method for CDMA only 
provider */
+                               if (methods) {
+                                       method = methods->data;
+                                       wiz_method->username = g_strdup 
(nma_mobile_access_method_get_username (method));
+                                       wiz_method->password = g_strdup 
(nma_mobile_access_method_get_password (method));
+                               }
+                       } else {
+                               family = NMA_MOBILE_FAMILY_3GPP;
+                               wiz_method->gsm_apn = g_strdup (gtk_editable_get_text (priv->plan_apn_entry));
+                       }
+               }
+       }
+
+       switch (family) {
+       case NMA_MOBILE_FAMILY_3GPP:
+               wiz_method->devtype = NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS;
+               break;
+       case NMA_MOBILE_FAMILY_CDMA:
+               wiz_method->devtype = NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO;
+               break;
+       default:
+               g_return_if_reached ();
+               break;
+       }
+
+       (*(priv->callback)) (self, FALSE, wiz_method, priv->user_data);
+
+       if (provider)
+               nma_mobile_provider_unref (provider);
+       g_free (wiz_method->provider_name);
+       g_free (wiz_method->plan_name);
+       g_free (wiz_method->username);
+       g_free (wiz_method->password);
+       g_free (wiz_method->gsm_apn);
+       g_free (wiz_method);
+}
+
+static void
+assistant_cancel (GtkButton *button, gpointer user_data)
+{
+       NMAMobileWizard *self = user_data;
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       (*(priv->callback)) (self, TRUE, NULL, priv->user_data);
+}
+
+/**********************************************************/
+/* Confirm page */
+/**********************************************************/
+
+static void
+confirm_setup (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       if (priv->will_connect_after)
+               gtk_widget_show (priv->confirm_connect_after_label);
+}
+
+static void
+confirm_prepare (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       NMAMobileProvider *provider = NULL;
+       NMAMobileAccessMethod *method = NULL;
+       const char *apn = NULL;
+       NMACountryInfo *country_info;
+       gboolean manual = FALSE;
+       GString *str;
+
+       provider = get_selected_provider (self);
+       if (provider)
+               method = get_selected_method (self, &manual);
+
+       /* Provider */
+       str = g_string_new (NULL);
+       if (provider) {
+               g_string_append (str, nma_mobile_provider_get_name (provider));
+               nma_mobile_provider_unref (provider);
+       } else {
+               g_string_append (str, _("Unlisted"));
+       }
+
+       country_info = get_selected_country (self);
+       if (nma_country_info_get_country_code (country_info))
+               g_string_append_printf (str, ", %s", nma_country_info_get_country_name (country_info));
+       nma_country_info_unref (country_info);
+
+       gtk_label_set_text (priv->confirm_provider, str->str);
+       gtk_widget_show (GTK_WIDGET (priv->confirm_provider));
+       g_string_free (str, TRUE);
+
+       if (priv->dev_desc) {
+               gtk_label_set_text (priv->confirm_device, priv->dev_desc);
+               gtk_widget_show (GTK_WIDGET (priv->confirm_device_label));
+               gtk_widget_show (GTK_WIDGET (priv->confirm_device));
+       } else {
+               gtk_widget_hide (GTK_WIDGET (priv->confirm_device_label));
+               gtk_widget_hide (GTK_WIDGET (priv->confirm_device));
+       }
+
+       if (priv->provider_only_cdma) {
+               gtk_widget_hide (GTK_WIDGET (priv->confirm_plan_label));
+               gtk_widget_hide (GTK_WIDGET (priv->confirm_plan));
+       } else {
+               /* Plan */
+               gtk_widget_show (GTK_WIDGET (priv->confirm_plan_label));
+               gtk_widget_show (GTK_WIDGET (priv->confirm_plan));
+
+               if (method)
+                       gtk_label_set_text (priv->confirm_plan, nma_mobile_access_method_get_name (method));
+               else
+                       gtk_label_set_text (priv->confirm_plan, _("Unlisted"));
+
+               apn = gtk_editable_get_text (priv->plan_apn_entry);
+       }
+
+       if (apn) {
+               str = g_string_new (NULL);
+               g_string_append_printf (str, "<span color=\"#999999\">APN: %s</span>", apn);
+               gtk_label_set_markup (priv->confirm_apn, str->str);
+               g_string_free (str, TRUE);
+               gtk_widget_show (GTK_WIDGET (priv->confirm_apn));
+       } else {
+               gtk_widget_hide (GTK_WIDGET (priv->confirm_apn));
+       }
+}
+
+/**********************************************************/
+/* Plan page */
+/**********************************************************/
+
+#define PLAN_COL_NAME 0
+#define PLAN_COL_METHOD 1
+#define PLAN_COL_MANUAL 2
+
+static NMAMobileAccessMethod *
+get_selected_method (NMAMobileWizard *self, gboolean *manual)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkTreeModel *model;
+       NMAMobileAccessMethod *method = NULL;
+       GtkTreeIter iter;
+       gboolean is_manual = FALSE;
+
+       if (!gtk_combo_box_get_active_iter (priv->plan_combo, &iter))
+               return NULL;
+
+       model = gtk_combo_box_get_model (priv->plan_combo);
+       if (!model)
+               return NULL;
+
+       gtk_tree_model_get (model, &iter,
+                           PLAN_COL_METHOD, &method,
+                           PLAN_COL_MANUAL, &is_manual,
+                           -1);
+       if (is_manual) {
+               if (manual)
+                       *manual = is_manual;
+               if (method)
+                       nma_mobile_access_method_unref (method);
+               method = NULL;
+       }
+
+       return method;
+}
+
+static void
+plan_update_complete (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkAssistant *assistant = GTK_ASSISTANT (self);
+       gboolean is_manual = FALSE;
+       NMAMobileAccessMethod *method;
+
+       method = get_selected_method (self, &is_manual);
+       if (method) {
+               gtk_assistant_set_page_complete (assistant, priv->plan_page, TRUE);
+               nma_mobile_access_method_unref (method);
+       } else {
+               const char *manual_apn;
+
+               manual_apn = gtk_editable_get_text (priv->plan_apn_entry);
+               gtk_assistant_set_page_complete (assistant, priv->plan_page,
+                                                (manual_apn && strlen (manual_apn)));
+       }
+}
+
+static void
+plan_combo_changed (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       NMAMobileAccessMethod *method = NULL;
+       gboolean is_manual = FALSE;
+
+       method = get_selected_method (self, &is_manual);
+       if (method) {
+               gtk_editable_set_text (priv->plan_apn_entry, nma_mobile_access_method_get_3gpp_apn (method));
+               gtk_widget_set_sensitive (GTK_WIDGET (priv->plan_apn_entry), FALSE);
+       } else {
+               gtk_editable_set_text (priv->plan_apn_entry, "");
+               gtk_widget_set_sensitive (GTK_WIDGET (priv->plan_apn_entry), TRUE);
+               gtk_widget_grab_focus (GTK_WIDGET (priv->plan_apn_entry));
+       }
+
+       if (method)
+               nma_mobile_access_method_unref (method);
+
+       plan_update_complete (self);
+}
+
+static gboolean
+plan_row_separator_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+       NMAMobileAccessMethod *method = NULL;
+       gboolean is_manual = FALSE;
+       gboolean draw_separator = FALSE;
+
+       gtk_tree_model_get (model, iter,
+                           PLAN_COL_METHOD, &method,
+                           PLAN_COL_MANUAL, &is_manual,
+                           -1);
+       if (!method && !is_manual)
+               draw_separator = TRUE;
+       if (method)
+               nma_mobile_access_method_unref (method);
+       return draw_separator;
+}
+
+static void
+apn_filter_cb (GtkEditable *editable,
+               gchar *text,
+               gint length,
+               gint *position,
+               gpointer user_data)
+{
+       utils_filter_editable_on_insert_text (editable,
+                                             text, length, position, user_data,
+                                             utils_char_is_ascii_apn,
+                                             apn_filter_cb);
+}
+
+static void
+plan_setup (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkCellRenderer *renderer;
+
+       gtk_combo_box_set_row_separator_func (priv->plan_combo,
+                                             plan_row_separator_func,
+                                             NULL,
+                                             NULL);
+
+       renderer = gtk_cell_renderer_text_new ();
+       gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (priv->plan_combo), renderer, TRUE);
+       gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (priv->plan_combo), renderer, "text", PLAN_COL_NAME);
+}
+
+static gboolean
+focus_plan_apn_entry (gpointer user_data)
+{
+       NMAMobileWizard *self = user_data;
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       priv->plan_focus_id = 0;
+       gtk_widget_grab_focus (GTK_WIDGET (priv->plan_apn_entry));
+       return FALSE;
+}
+
+static void
+plan_prepare (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       NMAMobileProvider *provider;
+       GtkTreeIter method_iter;
+       guint32 count = 0;
+
+       gtk_tree_store_clear (priv->plan_store);
+
+       provider = get_selected_provider (self);
+       if (provider) {
+               GSList *iter;
+
+               for (iter = nma_mobile_provider_get_methods (provider); iter; iter = g_slist_next (iter)) {
+                       NMAMobileAccessMethod *method = iter->data;
+
+                       if (   (priv->family != NMA_MOBILE_FAMILY_UNKNOWN)
+                           && (nma_mobile_access_method_get_family (method) != priv->family))
+                               continue;
+
+                       gtk_tree_store_append (priv->plan_store, &method_iter, NULL);
+                       gtk_tree_store_set (priv->plan_store,
+                                           &method_iter,
+                                           PLAN_COL_NAME,
+                                           nma_mobile_access_method_get_name (method),
+                                           PLAN_COL_METHOD,
+                                           method,
+                                           -1);
+                       count++;
+               }
+               nma_mobile_provider_unref (provider);
+
+               /* Draw the separator */
+               if (count)
+                       gtk_tree_store_append (priv->plan_store, &method_iter, NULL);
+       }
+
+       /* Add the "My plan is not listed..." item */
+       gtk_tree_store_append (priv->plan_store, &method_iter, NULL);
+       gtk_tree_store_set (priv->plan_store,
+                           &method_iter,
+                           PLAN_COL_NAME,
+                           _("My plan is not listed…"),
+                           PLAN_COL_MANUAL,
+                           TRUE,
+                           -1);
+       /* Select the first item by default if nothing is yet selected */
+       if (gtk_combo_box_get_active (priv->plan_combo) < 0)
+               gtk_combo_box_set_active (priv->plan_combo, 0);
+
+       gtk_widget_set_sensitive (GTK_WIDGET (priv->plan_combo), count > 0);
+       if (count == 0) {
+               if (!priv->plan_focus_id)
+                       priv->plan_focus_id = g_idle_add (focus_plan_apn_entry, self);
+       }
+
+       plan_combo_changed (self);
+}
+
+/**********************************************************/
+/* Providers page */
+/**********************************************************/
+
+#define PROVIDER_COL_NAME 0
+#define PROVIDER_COL_PROVIDER 1
+
+static gboolean
+providers_search_func (GtkTreeModel *model,
+                       gint column,
+                       const char *key,
+                       GtkTreeIter *iter,
+                       gpointer search_data)
+{
+       gboolean unmatched = TRUE;
+       char *provider = NULL;
+
+       if (!key)
+               return TRUE;
+
+       gtk_tree_model_get (model, iter, column, &provider, -1);
+       if (!provider)
+               return TRUE;
+
+       unmatched = !!g_ascii_strncasecmp (provider, key, strlen (key));
+       g_free (provider);
+       return unmatched;
+}
+
+static NMAMobileProvider *
+get_selected_provider (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkTreeSelection *selection;
+       GtkTreeModel *model = NULL;
+       GtkTreeIter iter;
+       NMAMobileProvider *provider = NULL;
+
+       if (!gtk_toggle_button_get_active (priv->providers_view_radio))
+               return NULL;
+
+       selection = gtk_tree_view_get_selection (priv->providers_view);
+       g_assert (selection);
+
+       if (!gtk_tree_selection_get_selected (GTK_TREE_SELECTION (selection), &model, &iter))
+               return NULL;
+
+       gtk_tree_model_get (model, &iter, PROVIDER_COL_PROVIDER, &provider, -1);
+       return provider;
+}
+
+static void
+providers_update_complete (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkAssistant *assistant = GTK_ASSISTANT (self);
+       gboolean use_view;
+
+       use_view = gtk_toggle_button_get_active (priv->providers_view_radio);
+       if (use_view) {
+               NMAMobileProvider *provider;
+
+               provider = get_selected_provider (self);
+               gtk_assistant_set_page_complete (assistant, priv->providers_page, !!provider);
+               if (provider)
+                       nma_mobile_provider_unref (provider);
+       } else {
+               gtk_assistant_set_page_complete (assistant, priv->providers_page, TRUE);
+       }
+}
+
+static void
+providers_update_continue (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       gtk_assistant_set_page_complete (GTK_ASSISTANT (self),
+                                        priv->providers_page,
+                                        TRUE);
+
+       gtk_assistant_next_page (GTK_ASSISTANT (self));
+}
+
+static gboolean
+focus_providers_view (gpointer user_data)
+{
+       NMAMobileWizard *self = user_data;
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       priv->providers_focus_id = 0;
+       gtk_widget_grab_focus (GTK_WIDGET (priv->providers_view));
+       return FALSE;
+}
+
+static gboolean
+focus_provider_unlisted_type_combo (gpointer user_data)
+{
+       NMAMobileWizard *self = user_data;
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       priv->providers_focus_id = 0;
+       gtk_widget_grab_focus (GTK_WIDGET (priv->provider_unlisted_type_combo));
+       return FALSE;
+}
+
+static void
+providers_radio_toggled (GtkToggleButton *button, gpointer user_data)
+{
+       NMAMobileWizard *self = user_data;
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       gboolean use_view;
+
+       use_view = gtk_toggle_button_get_active (priv->providers_view_radio);
+       if (use_view) {
+               if (!priv->providers_focus_id)
+                       priv->providers_focus_id = g_idle_add (focus_providers_view, self);
+               gtk_widget_set_sensitive (GTK_WIDGET (priv->providers_view), TRUE);
+               gtk_widget_set_sensitive (GTK_WIDGET (priv->provider_unlisted_type_combo), FALSE);
+       } else if (priv->family == NMA_MOBILE_FAMILY_UNKNOWN) {
+               if (!priv->providers_focus_id)
+                       priv->providers_focus_id = g_idle_add (focus_provider_unlisted_type_combo, self);
+               gtk_widget_set_sensitive (GTK_WIDGET (priv->providers_view), FALSE);
+               gtk_widget_set_sensitive (GTK_WIDGET (priv->provider_unlisted_type_combo), TRUE);
+       }
+
+       providers_update_complete (self);
+}
+
+static NMAMobileFamily
+get_provider_unlisted_type (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       switch (gtk_combo_box_get_active (priv->provider_unlisted_type_combo)) {
+       case 0:
+               return NMA_MOBILE_FAMILY_3GPP;
+       case 1:
+               return NMA_MOBILE_FAMILY_CDMA;
+       default:
+               g_return_val_if_reached (NMA_MOBILE_FAMILY_UNKNOWN);
+       }
+}
+
+static void
+providers_setup (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkCellRenderer *renderer;
+       GtkTreeViewColumn *column;
+       GtkTreeSelection *selection;
+
+       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->providers_sort),
+                                             PROVIDER_COL_NAME, GTK_SORT_ASCENDING);
+
+       renderer = gtk_cell_renderer_text_new ();
+       column = gtk_tree_view_column_new_with_attributes (_("Provider"),
+                                                          renderer,
+                                                          "text", PROVIDER_COL_NAME,
+                                                          NULL);
+       gtk_tree_view_append_column (priv->providers_view, column);
+       gtk_tree_view_column_set_clickable (column, TRUE);
+
+       selection = gtk_tree_view_get_selection (priv->providers_view);
+       g_assert (selection);
+
+       switch (priv->family) {
+       case NMA_MOBILE_FAMILY_3GPP:
+               gtk_combo_box_set_active (priv->provider_unlisted_type_combo, 0);
+               gtk_widget_set_sensitive (GTK_WIDGET (priv->provider_unlisted_type_combo), FALSE);
+               break;
+       case NMA_MOBILE_FAMILY_CDMA:
+               gtk_combo_box_set_active (priv->provider_unlisted_type_combo, 1);
+               gtk_widget_set_sensitive (GTK_WIDGET (priv->provider_unlisted_type_combo), FALSE);
+               break;
+       case NMA_MOBILE_FAMILY_UNKNOWN:
+               gtk_widget_set_sensitive (GTK_WIDGET (priv->provider_unlisted_type_combo), TRUE);
+               break;
+       }
+}
+
+static void
+providers_prepare (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkTreeSelection *selection;
+       NMACountryInfo *country_info;
+       GSList *piter;
+
+       gtk_tree_store_clear (priv->providers_store);
+
+       country_info = get_selected_country (self);
+       for (piter = nma_country_info_get_providers (country_info);
+            piter;
+            piter = g_slist_next (piter)) {
+               NMAMobileProvider *provider = piter->data;
+               GtkTreeIter provider_iter;
+
+               /* Ignore providers that don't match the current device type */
+               if (priv->family != NMA_MOBILE_FAMILY_UNKNOWN) {
+                       GSList *miter;
+                       guint32 count = 0;
+
+                       for (miter = nma_mobile_provider_get_methods (provider); miter; miter = g_slist_next 
(miter)) {
+                               NMAMobileAccessMethod *method = miter->data;
+
+                               if (priv->family == nma_mobile_access_method_get_family (method))
+                                       count++;
+                       }
+
+                       if (!count)
+                               continue;
+               }
+
+               gtk_tree_store_append (priv->providers_store, &provider_iter, NULL);
+               gtk_tree_store_set (priv->providers_store,
+                                   &provider_iter,
+                                   PROVIDER_COL_NAME,
+                                   nma_mobile_provider_get_name (provider),
+                                   PROVIDER_COL_PROVIDER,
+                                   provider,
+                                   -1);
+       }
+       nma_country_info_unref (country_info);
+
+       gtk_tree_view_set_search_column (priv->providers_view, PROVIDER_COL_NAME);
+       gtk_tree_view_set_search_equal_func (priv->providers_view,
+                                            providers_search_func, self, NULL);
+
+       /* If no row has focus yet, focus the first row so that the user can start
+        * incremental search without clicking.
+        */
+       selection = gtk_tree_view_get_selection (priv->providers_view);
+       g_assert (selection);
+       if (!gtk_tree_selection_count_selected_rows (selection)) {
+               GtkTreeIter first_iter;
+               GtkTreePath *first_path;
+
+               if (gtk_tree_model_get_iter_first (priv->providers_sort, &first_iter)) {
+                       first_path = gtk_tree_model_get_path (priv->providers_sort, &first_iter);
+                       if (first_path) {
+                               gtk_tree_selection_select_path (selection, first_path);
+                               gtk_tree_path_free (first_path);
+                       }
+               }
+       }
+
+       if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (priv->providers_store), NULL) == 0) {
+               /* No providers to choose from. */
+               gtk_toggle_button_set_active (priv->provider_unlisted_radio, TRUE);
+               gtk_widget_set_sensitive (GTK_WIDGET (priv->providers_view_radio), FALSE);
+       } else {
+               gtk_toggle_button_set_active (priv->providers_view_radio, TRUE);
+               gtk_widget_set_sensitive (GTK_WIDGET (priv->providers_view_radio), TRUE);
+       }
+
+       providers_radio_toggled (NULL, self);
+
+       /* Initial completeness state */
+       providers_update_complete (self);
+}
+
+/**********************************************************/
+/* Country page */
+/**********************************************************/
+
+#define COUNTRIES_COL_NAME 0
+#define COUNTRIES_COL_INFO 1
+
+static gboolean
+country_search_func (GtkTreeModel *model,
+                     gint column,
+                     const char *key,
+                     GtkTreeIter *iter,
+                     gpointer search_data)
+{
+       gboolean unmatched = TRUE;
+       char *country = NULL;
+
+       if (!key)
+               return TRUE;
+
+       gtk_tree_model_get (model, iter, column, &country, -1);
+       if (!country)
+               return TRUE;
+
+       unmatched = !!g_ascii_strncasecmp (country, key, strlen (key));
+       g_free (country);
+       return unmatched;
+}
+
+static void
+add_one_country (gpointer key, gpointer value, gpointer user_data)
+{
+       NMAMobileWizard *self = user_data;
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       NMACountryInfo *country_info = value;
+       GtkTreeIter country_iter;
+       GtkTreePath *country_path, *country_view_path;
+
+       g_assert (key);
+
+       if (   nma_country_info_get_country_code (country_info)
+           && !nma_country_info_get_providers (country_info))
+               return;
+
+       gtk_tree_store_append (priv->country_store, &country_iter, NULL);
+       gtk_tree_store_set (priv->country_store,
+                           &country_iter,
+                           COUNTRIES_COL_NAME,
+                           nma_country_info_get_country_name (country_info),
+                           COUNTRIES_COL_INFO,
+                           country_info,
+                           -1);
+
+       /* If this country is the same country as the user's current locale,
+        * select it by default.
+        */
+       if (priv->country != country_info)
+               return;
+
+       country_path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->country_store), &country_iter);
+       if (!country_path)
+               return;
+
+       country_view_path = gtk_tree_model_sort_convert_child_path_to_path (priv->country_sort, country_path);
+       if (country_view_path) {
+               GtkTreeSelection *selection;
+
+               gtk_tree_view_expand_row (priv->country_view, country_view_path, TRUE);
+
+               selection = gtk_tree_view_get_selection (priv->country_view);
+               g_assert (selection);
+               gtk_tree_selection_select_path (selection, country_view_path);
+               gtk_tree_view_scroll_to_cell (priv->country_view,
+                                             country_view_path, NULL, TRUE, 0, 0);
+               gtk_tree_path_free (country_view_path);
+       }
+       gtk_tree_path_free (country_path);
+}
+
+static NMACountryInfo *
+get_selected_country (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkTreeSelection *selection;
+       GtkTreeModel *model = NULL;
+       GtkTreeIter iter;
+       NMACountryInfo *country_info = NULL;
+
+       selection = gtk_tree_view_get_selection (priv->country_view);
+       g_assert (selection);
+
+       if (!gtk_tree_selection_get_selected (GTK_TREE_SELECTION (selection), &model, &iter))
+               return NULL;
+
+       gtk_tree_model_get (model, &iter, COUNTRIES_COL_INFO, &country_info, -1);
+       return country_info;
+}
+
+static void
+country_update_complete (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkTreeSelection *selection;
+
+       selection = gtk_tree_view_get_selection (priv->country_view);
+       g_assert (selection);
+
+       gtk_assistant_set_page_complete (GTK_ASSISTANT (self),
+                                        priv->country_page,
+                                        gtk_tree_selection_get_selected (selection, NULL, NULL));
+}
+
+static void
+country_update_continue (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       gtk_assistant_set_page_complete (GTK_ASSISTANT (self),
+                                        priv->country_page,
+                                        TRUE);
+
+       gtk_assistant_next_page (GTK_ASSISTANT (self));
+}
+
+static gint
+country_sort_func (GtkTreeModel *model,
+                   GtkTreeIter *a,
+                   GtkTreeIter *b,
+                   gpointer user_data)
+{
+       char *a_str = NULL, *b_str = NULL;
+       NMACountryInfo *a_country_info = NULL, *b_country_info = NULL;
+       gint ret = 0;
+
+       gtk_tree_model_get (model, a, COUNTRIES_COL_NAME, &a_str, COUNTRIES_COL_INFO, &a_country_info, -1);
+       gtk_tree_model_get (model, b, COUNTRIES_COL_NAME, &b_str, COUNTRIES_COL_INFO, &b_country_info, -1);
+
+       if (!a_country_info || !nma_country_info_get_country_code (a_country_info)) {
+               ret = -1;
+               goto out;
+       } else if (!b_country_info || !nma_country_info_get_country_code (b_country_info)) {
+               ret = 1;
+               goto out;
+       }
+
+       if (a_str && !b_str)
+               ret = -1;
+       else if (!a_str && b_str)
+               ret = 1;
+       else if (!a_str && !b_str)
+               ret = 0;
+       else
+               ret = g_utf8_collate (a_str, b_str);
+
+out:
+       if (a_country_info)
+               nma_country_info_unref (a_country_info);
+       if (b_country_info)
+               nma_country_info_unref (b_country_info);
+       g_free (a_str);
+       g_free (b_str);
+       return ret;
+}
+
+static void
+country_setup (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkCellRenderer *renderer;
+       GtkTreeViewColumn *column;
+       GtkTreeSelection *selection;
+
+       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->country_sort),
+                                             COUNTRIES_COL_NAME, GTK_SORT_ASCENDING);
+
+       gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (priv->country_sort),
+                                        COUNTRIES_COL_NAME,
+                                        country_sort_func,
+                                        NULL,
+                                        NULL);
+
+       renderer = gtk_cell_renderer_text_new ();
+       column = gtk_tree_view_column_new_with_attributes (NULL,
+                                                          renderer,
+                                                          "text", COUNTRIES_COL_NAME,
+                                                          NULL);
+       gtk_tree_view_append_column (priv->country_view, column);
+       gtk_tree_view_column_set_clickable (column, TRUE);
+
+       /* Add the rest of the providers */
+       if (priv->mobile_providers_database) {
+               GHashTable *countries;
+
+               countries = nma_mobile_providers_database_get_countries (priv->mobile_providers_database);
+               g_hash_table_foreach (countries, add_one_country, self);
+       }
+
+       /* If no row has focus yet, focus the first row so that the user can start
+        * incremental search without clicking.
+        */
+       selection = gtk_tree_view_get_selection (priv->country_view);
+       g_assert (selection);
+       if (!gtk_tree_selection_count_selected_rows (selection)) {
+               GtkTreeIter first_iter;
+               GtkTreePath *first_path;
+
+               if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->country_sort), &first_iter)) {
+                       first_path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->country_sort), 
&first_iter);
+                       if (first_path) {
+                               gtk_tree_selection_select_path (selection, first_path);
+                               gtk_tree_path_free (first_path);
+                       }
+               }
+       }
+
+       /* Initial completeness state */
+       country_update_complete (self);
+}
+
+static gboolean
+focus_country_view (gpointer user_data)
+{
+       NMAMobileWizard *self = user_data;
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       priv->country_focus_id = 0;
+       gtk_widget_grab_focus (GTK_WIDGET (priv->country_view));
+       return FALSE;
+}
+
+static void
+country_prepare (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       gtk_tree_view_set_search_column (priv->country_view, COUNTRIES_COL_NAME);
+       gtk_tree_view_set_search_equal_func (priv->country_view, country_search_func, self, NULL);
+
+       if (!priv->country_focus_id)
+               priv->country_focus_id = g_idle_add (focus_country_view, self);
+
+       country_update_complete (self);
+}
+
+/**********************************************************/
+/* Intro page */
+/**********************************************************/
+
+#define INTRO_COL_NAME 0
+#define INTRO_COL_DEVICE 1
+#define INTRO_COL_SEPARATOR 2
+
+static gboolean
+__intro_device_added (NMAMobileWizard *self, NMDevice *device, gboolean select_it)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkTreeIter iter;
+       const char *desc = nm_device_get_description (device);
+       NMDeviceModemCapabilities caps;
+
+       if (!NM_IS_DEVICE_MODEM (device))
+               return FALSE;
+
+       caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
+       if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
+               if (!desc)
+                       desc = _("Installed GSM device");
+       } else if (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO) {
+               if (!desc)
+                       desc = _("Installed CDMA device");
+       } else
+               return FALSE;
+
+       gtk_tree_store_append (priv->dev_store, &iter, NULL);
+       gtk_tree_store_set (priv->dev_store,
+                           &iter,
+                           INTRO_COL_NAME, desc,
+                           INTRO_COL_DEVICE, device,
+                           -1);
+
+       /* Select the device just added */
+       if (select_it)
+               gtk_combo_box_set_active_iter (priv->dev_combo, &iter);
+
+       gtk_widget_set_sensitive (GTK_WIDGET (priv->dev_combo), TRUE);
+       return TRUE;
+}
+
+static void
+intro_device_added_cb (NMClient *client, NMDevice *device, NMAMobileWizard *self)
+{
+       __intro_device_added (self, device, TRUE);
+}
+
+static void
+intro_device_removed_cb (NMClient *client, NMDevice *device, NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkTreeIter iter;
+       gboolean have_device = FALSE, removed = FALSE;
+
+       if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->dev_store), &iter))
+               return;
+
+       do {
+               NMDevice *candidate = NULL;
+
+               gtk_tree_model_get (GTK_TREE_MODEL (priv->dev_store), &iter,
+                                   INTRO_COL_DEVICE, &candidate, -1);
+               if (candidate) {
+                       if (candidate == device) {
+                               gtk_tree_store_remove (priv->dev_store, &iter);
+                               removed = TRUE;
+                       }
+                       g_object_unref (candidate);
+               }
+       } while (!removed && gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->dev_store), &iter));
+
+       /* There's already a selected device item; nothing more to do */
+       if (gtk_combo_box_get_active (priv->dev_combo) > 1)
+               return;
+
+       /* If there are no more devices, select the "Any" item and disable the
+        * combo box.  If there is no selected item and there is at least one device
+        * item, select the first one.
+        */
+       if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->dev_store), &iter))
+               return;
+
+       do {
+               NMDevice *candidate = NULL;
+
+               gtk_tree_model_get (GTK_TREE_MODEL (priv->dev_store), &iter,
+                                   INTRO_COL_DEVICE, &candidate, -1);
+               if (candidate) {
+                       have_device = TRUE;
+                       g_object_unref (candidate);
+               }
+       } while (!have_device && gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->dev_store), &iter));
+
+       if (have_device) {
+               /* Iter should point to the last device item in the combo */
+               gtk_combo_box_set_active_iter (priv->dev_combo, &iter);
+       } else {
+               gtk_combo_box_set_active (priv->dev_combo, 0);
+               gtk_widget_set_sensitive (GTK_WIDGET (priv->dev_combo), FALSE);
+       }
+}
+
+static void
+intro_add_initial_devices (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       const GPtrArray *devices;
+       gboolean selected_first = FALSE;
+       int i;
+
+       devices = priv->client ? nm_client_get_devices (priv->client) : NULL;
+       for (i = 0; devices && (i < devices->len); i++) {
+               if (__intro_device_added (self, g_ptr_array_index (devices, i), !selected_first)) {
+                       if (selected_first == FALSE)
+                               selected_first = TRUE;
+               }
+       }
+
+       /* Otherwise the "Any device" item */
+       if (!selected_first) {
+               /* Select the first device item by default */
+               gtk_combo_box_set_active (priv->dev_combo, 0);
+               gtk_widget_set_sensitive (GTK_WIDGET (priv->dev_combo), FALSE);
+       }
+}
+
+static void
+intro_remove_all_devices (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       gtk_tree_store_clear (priv->dev_store);
+
+       /* Select the "Any device" item */
+       gtk_combo_box_set_active (priv->dev_combo, 0);
+}
+
+static void
+intro_manager_running_cb (NMClient *client, GParamSpec *pspec, NMAMobileWizard *self)
+{
+       if (nm_client_get_nm_running (client))
+               intro_add_initial_devices (self);
+       else
+               intro_remove_all_devices (self);
+}
+
+static gboolean
+intro_row_separator_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+       gboolean separator = FALSE;
+       gtk_tree_model_get (model, iter, INTRO_COL_SEPARATOR, &separator, -1);
+       return separator;
+}
+
+static void
+intro_combo_changed (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkTreeIter iter;
+       NMDevice *selected = NULL;
+       NMDeviceModemCapabilities caps;
+
+       g_free (priv->dev_desc);
+       priv->dev_desc = NULL;
+
+       if (!gtk_combo_box_get_active_iter (priv->dev_combo, &iter))
+               return;
+
+       gtk_tree_model_get (GTK_TREE_MODEL (priv->dev_store), &iter,
+                           INTRO_COL_DEVICE, &selected, -1);
+       if (selected) {
+               priv->dev_desc = g_strdup (nm_device_get_description (selected));
+               caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (selected));
+               if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS)
+                       priv->family = NMA_MOBILE_FAMILY_3GPP;
+               else if (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO)
+                       priv->family = NMA_MOBILE_FAMILY_CDMA;
+               else
+                       g_warning ("%s: unknown modem capabilities 0x%X", __func__, caps);
+
+               g_object_unref (selected);
+       }
+}
+
+static void
+intro_setup (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+       GtkCellRenderer *renderer;
+       char *s;
+
+        s = g_strdup_printf ("• %s", gtk_label_get_text (priv->provider_name_label));
+       gtk_label_set_text (priv->provider_name_label, s);
+       g_free (s);
+
+        s = g_strdup_printf ("• %s", gtk_label_get_text (priv->plan_name_label));
+       gtk_label_set_text (priv->plan_name_label, s);
+       g_free (s);
+
+        s = g_strdup_printf ("• %s", gtk_label_get_text (priv->apn_label));
+       gtk_label_set_text (priv->apn_label, s);
+       g_free (s);
+
+       /* Device combo; only built if the wizard's caller didn't pass one in */
+       if (!priv->initial_family) {
+               GtkTreeIter iter;
+
+               priv->client = nm_client_new (NULL, NULL);
+               if (priv->client) {
+                       g_signal_connect (priv->client, "device-added",
+                                         G_CALLBACK (intro_device_added_cb), self);
+                       g_signal_connect (priv->client, "device-removed",
+                                         G_CALLBACK (intro_device_removed_cb), self);
+                       g_signal_connect (priv->client, "notify::manager-running",
+                                         G_CALLBACK (intro_manager_running_cb), self);
+               }
+
+               gtk_combo_box_set_row_separator_func (priv->dev_combo,
+                                                     intro_row_separator_func, NULL, NULL);
+
+               renderer = gtk_cell_renderer_text_new ();
+               gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (priv->dev_combo), renderer, TRUE);
+               gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (priv->dev_combo), renderer, "text", 
INTRO_COL_NAME);
+
+               /* Any device */
+               gtk_tree_store_append (priv->dev_store, &iter, NULL);
+               gtk_tree_store_set (priv->dev_store, &iter,
+                                   INTRO_COL_NAME, _("Any device"), -1);
+
+               /* Separator */
+               gtk_tree_store_append (priv->dev_store, &iter, NULL);
+               gtk_tree_store_set (priv->dev_store, &iter,
+                                   INTRO_COL_SEPARATOR, TRUE, -1);
+
+               intro_add_initial_devices (self);
+       }
+}
+
+/**********************************************************/
+/* General assistant stuff */
+/**********************************************************/
+
+static void
+remove_plan_focus_idle (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       if (priv->plan_focus_id) {
+               g_source_remove (priv->plan_focus_id);
+               priv->plan_focus_id = 0;
+       }
+}
+
+static void
+remove_provider_focus_idle (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       if (priv->providers_focus_id) {
+               g_source_remove (priv->providers_focus_id);
+               priv->providers_focus_id = 0;
+       }
+}
+
+static void
+remove_country_focus_idle (NMAMobileWizard *self)
+{
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       if (priv->country_focus_id) {
+               g_source_remove (priv->country_focus_id);
+               priv->country_focus_id = 0;
+       }
+}
+
+static void
+assistant_prepare (GtkAssistant *assistant, GtkWidget *page, gpointer user_data)
+{
+       NMAMobileWizard *self = user_data;
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       if (page != priv->plan_page)
+               remove_plan_focus_idle (self);
+       if (page != priv->providers_page)
+               remove_provider_focus_idle (self);
+       if (page != priv->country_page)
+               remove_country_focus_idle (self);
+
+       if (page == priv->country_page)
+               country_prepare (self);
+       else if (page == priv->providers_page)
+               providers_prepare (self);
+       else if (page == priv->plan_page)
+               plan_prepare (self);
+       else if (page == priv->confirm_page)
+               confirm_prepare (self);
+}
+
+static gint
+forward_func (gint current_page, gpointer user_data)
+{
+       NMAMobileWizard *self = user_data;
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       if (current_page == PROVIDERS_PAGE_IDX) {
+               NMAMobileFamily family = priv->family;
+
+               /* If the provider is unlisted, we can skip ahead of the user's
+                * access technology is CDMA.
+                */
+               if (gtk_toggle_button_get_active (priv->provider_unlisted_radio)) {
+                       if (family == NMA_MOBILE_FAMILY_UNKNOWN)
+                               family = get_provider_unlisted_type (self);
+               } else {
+                       /* Or, if the provider is only CDMA, then we can also skip ahead */
+                       NMAMobileProvider *provider;
+                       GSList *iter;
+                       gboolean gsm = FALSE, cdma = FALSE;
+
+                       provider = get_selected_provider (self);
+                       if (provider) {
+                               for (iter = nma_mobile_provider_get_methods (provider); iter; iter = 
g_slist_next (iter)) {
+                                       NMAMobileAccessMethod *method = iter->data;
+
+                                       if (nma_mobile_access_method_get_family (method) == 
NMA_MOBILE_FAMILY_CDMA)
+                                               cdma = TRUE;
+                                       else if (nma_mobile_access_method_get_family (method) == 
NMA_MOBILE_FAMILY_3GPP)
+                                               gsm = TRUE;
+                               }
+                               nma_mobile_provider_unref (provider);
+
+                               if (cdma && !gsm)
+                                       family = NMA_MOBILE_FAMILY_CDMA;
+                       }
+               }
+
+               /* Skip to the confirm page if we know its CDMA */
+               if (family == NMA_MOBILE_FAMILY_CDMA) {
+                       priv->provider_only_cdma = TRUE;
+                       return CONFIRM_PAGE_IDX;
+               } else
+                       priv->provider_only_cdma = FALSE;
+       }
+
+       return current_page + 1;
+}
+
+static char *
+get_country_from_locale (void)
+{
+       char *p, *m, *cc, *lang;
+
+       lang = getenv ("LC_ALL");
+       if (!lang)
+               lang = getenv ("LANG");
+       if (!lang)
+               return NULL;
+
+       p = strchr (lang, '_');
+       if (!p || !strlen (p)) {
+               g_free (p);
+               return NULL;
+       }
+
+       p = cc = g_strdup (++p);
+       m = strchr (cc, '.');
+       if (m)
+               *m = '\0';
+
+       while (*p) {
+               *p = g_ascii_toupper (*p);
+               p++;
+       }
+
+       return cc;
+}
+
+static void
+finalize (GObject *object)
+{
+       NMAMobileWizard *self = NMA_MOBILE_WIZARD (object);
+       NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       g_clear_pointer (&priv->dev_desc, g_free);
+       g_clear_object (&priv->client);
+
+       remove_plan_focus_idle (self);
+       remove_provider_focus_idle (self);
+       remove_country_focus_idle (self);
+
+       g_clear_object (&priv->mobile_providers_database);
+
+       G_OBJECT_CLASS (nma_mobile_wizard_parent_class)->finalize (object);
+}
+
+static void
+nma_mobile_wizard_class_init (NMAMobileWizardClass *klass)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (klass);
+       GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+       object_class->finalize = finalize;
+
+       g_type_ensure (NM_TYPE_DEVICE);
+       gtk_widget_class_set_template_from_resource (widget_class,
+                                                    
"/org/freedesktop/network-manager-applet/nma-mobile-wizard.ui");
+
+
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, dev_combo);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, dev_combo_label);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, country_page);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, country_view);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, providers_page);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, providers_view_radio);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, providers_view);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, provider_unlisted_radio);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, 
provider_unlisted_type_combo);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, plan_page);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, plan_combo);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, plan_apn_entry);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, confirm_page);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, confirm_provider);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, confirm_plan_label);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, confirm_apn);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, confirm_plan);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, confirm_device_label);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, 
confirm_connect_after_label);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, confirm_device);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, provider_name_label);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, plan_name_label);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, apn_label);
+
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, dev_store);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, country_store);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, country_sort);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, providers_store);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, providers_sort);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAMobileWizard, plan_store);
+
+       gtk_widget_class_bind_template_callback (widget_class, assistant_closed);
+       gtk_widget_class_bind_template_callback (widget_class, assistant_cancel);
+       gtk_widget_class_bind_template_callback (widget_class, assistant_prepare);
+       gtk_widget_class_bind_template_callback (widget_class, intro_combo_changed);
+       gtk_widget_class_bind_template_callback (widget_class, country_update_continue);
+       gtk_widget_class_bind_template_callback (widget_class, providers_radio_toggled);
+       gtk_widget_class_bind_template_callback (widget_class, providers_update_complete);
+       gtk_widget_class_bind_template_callback (widget_class, providers_update_continue);
+       gtk_widget_class_bind_template_callback (widget_class, plan_combo_changed);
+       gtk_widget_class_bind_template_callback (widget_class, plan_update_complete);
+       gtk_widget_class_bind_template_callback (widget_class, apn_filter_cb);
+}
+
+static void
+nma_mobile_wizard_init (NMAMobileWizard *self)
+{
+       gtk_widget_init_template (GTK_WIDGET (self));
+       gtk_widget_realize (GTK_WIDGET (self));
+
+       if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (self)))) {
+#if GTK_CHECK_VERSION(3,90,0)
+               GdkSurface *surface = gtk_widget_get_surface (GTK_WIDGET (self));
+               gdk_x11_surface_set_skip_taskbar_hint (surface, TRUE);
+#else
+               GdkWindow *gdk_window = gtk_widget_get_window (GTK_WIDGET (self));
+               gdk_window_set_skip_taskbar_hint (gdk_window, TRUE);
+#endif
+       }
+}
+
+/**
+ * nma_mobile_wizard_new: (skip)
+ * @parent:
+ * @window_group:
+ * @modem_caps:
+ * @will_connect_after:
+ * @cb: (scope async):
+ * @user_data:
+ *
+ * Returns: the newly created #NMAMobileWizard
+ */
+NMAMobileWizard *
+nma_mobile_wizard_new (GtkWindow *parent,
+                       GtkWindowGroup *window_group,
+                       NMDeviceModemCapabilities modem_caps,
+                       gboolean will_connect_after,
+                       NMAMobileWizardCallback cb,
+                       gpointer user_data)
+{
+       NMAMobileWizard *self;
+       NMAMobileWizardPrivate *priv;
+       char *cc;
+       GError *error = NULL;
+
+       self = g_object_new (NMA_TYPE_MOBILE_WIZARD, NULL);
+       priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
+
+       priv->mobile_providers_database = nma_mobile_providers_database_new_sync (NULL, NULL, NULL, &error);
+       if (!priv->mobile_providers_database) {
+               g_warning ("Cannot create mobile providers database: %s",
+                          error->message);
+               g_error_free (error);
+               nma_mobile_wizard_destroy (self);
+               return NULL;
+       }
+
+       cc = get_country_from_locale ();
+       if (cc) {
+               priv->country = nma_mobile_providers_database_lookup_country 
(priv->mobile_providers_database, cc);
+               g_free (cc);
+       }
+
+       priv->will_connect_after = will_connect_after;
+       priv->callback = cb;
+       priv->user_data = user_data;
+       if (modem_caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS)
+               priv->family = NMA_MOBILE_FAMILY_3GPP;
+       else if (modem_caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO)
+               priv->family = NMA_MOBILE_FAMILY_CDMA;
+       if (priv->family) {
+               priv->initial_family = TRUE;  /* Skip device selection */
+       } else {
+               gtk_widget_show (GTK_WIDGET (priv->dev_combo_label));
+               gtk_widget_show (GTK_WIDGET (priv->dev_combo));
+       }
+
+       gtk_assistant_set_forward_page_func (GTK_ASSISTANT (self),
+                                            forward_func, self, NULL);
+
+       intro_setup (self);
+       country_setup (self);
+       providers_setup (self);
+       plan_setup (self);
+       confirm_setup (self);
+
+       if (parent)
+               gtk_window_set_transient_for (GTK_WINDOW (self), parent);
+       if (window_group)
+               gtk_window_group_add_window (window_group, GTK_WINDOW (self));
+
+       return self;
+}
+
+void
+nma_mobile_wizard_present (NMAMobileWizard *self)
+{
+       g_return_if_fail (self != NULL);
+
+       gtk_window_present (GTK_WINDOW (self));
+}
+
+void
+nma_mobile_wizard_destroy (NMAMobileWizard *self)
+{
+       g_return_if_fail (self != NULL);
+
+       gtk_widget_destroy (GTK_WIDGET (self));
+}
diff --git a/src/libnma/nma-mobile-wizard.h b/src/libnma/nma-mobile-wizard.h
new file mode 100644
index 00000000..85239387
--- /dev/null
+++ b/src/libnma/nma-mobile-wizard.h
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: GPL-2.0+
+/* NetworkManager Connection editor -- Connection editor for NetworkManager
+ *
+ * Dan Williams <dcbw redhat com>
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * (C) Copyright 2008 - 2018 Red Hat, Inc.
+ */
+
+#ifndef MOBILE_WIZARD_H
+#define MOBILE_WIZARD_H
+
+#include <glib.h>
+#include <NetworkManager.h>
+#include <nm-device.h>
+
+typedef struct _NMAMobileWizard NMAMobileWizard;
+typedef struct _NMAMobileWizardClass NMAMobileWizardClass;
+
+/**
+ * NMAMobileWizardAccessMethod:
+ * @provider_name: The mobile network provider name
+ * @plan_name: The provided network access billing plan
+ * @devtype: Required NetworkManager device capabilities
+ * @username: User login
+ * @password: User secret
+ * @gsm_apn: The GSM Access Point Name
+ *
+ * Network access method details.
+ */
+typedef struct {
+       char *provider_name;
+       char *plan_name;
+       NMDeviceModemCapabilities devtype;
+       char *username;
+       char *password;
+       char *gsm_apn;
+} NMAMobileWizardAccessMethod;
+
+typedef void (*NMAMobileWizardCallback) (NMAMobileWizard *self,
+                                         gboolean canceled,
+                                         NMAMobileWizardAccessMethod *method,
+                                         gpointer user_data);
+
+#define NMA_TYPE_MOBILE_WIZARD            (nma_mobile_wizard_get_type ())
+#define NMA_MOBILE_WIZARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMA_TYPE_MOBILE_WIZARD, 
NMAMobileWizard))
+#define NMA_MOBILE_WIZARD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NMA_TYPE_MOBILE_WIZARD, 
NMAMobileWizardClass))
+#define NMA_IS_MOBILE_WIZARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMA_TYPE_MOBILE_WIZARD))
+#define NMA_IS_MOBILE_WIZARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NMA_TYPE_MOBILE_WIZARD))
+#define NMA_MOBILE_WIZARD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NMA_TYPE_MOBILE_WIZARD, 
NMAMobileWizardClass))
+
+GType nma_mobile_wizard_get_type (void);
+
+NMAMobileWizard *nma_mobile_wizard_new (GtkWindow *parent,
+                                        GtkWindowGroup *window_group,
+                                        NMDeviceModemCapabilities modem_caps,
+                                        gboolean will_connect_after,
+                                        NMAMobileWizardCallback cb,
+                                        gpointer user_data);
+
+void nma_mobile_wizard_present (NMAMobileWizard *wizard);
+
+void nma_mobile_wizard_destroy (NMAMobileWizard *self);
+
+#endif /* MOBILE_WIZARD_H */
diff --git a/src/libnma/nma-mobile-wizard.ui b/src/libnma/nma-mobile-wizard.ui
new file mode 100644
index 00000000..e120e962
--- /dev/null
+++ b/src/libnma/nma-mobile-wizard.ui
@@ -0,0 +1,604 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.2 -->
+<interface domain="nm-applet">
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkTreeStore" id="country_store">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name info -->
+      <column type="NMACountryInfo"/>
+    </columns>
+  </object>
+  <object class="GtkTreeModelSort" id="country_sort">
+    <property name="model">country_store</property>
+  </object>
+  <object class="GtkTreeStore" id="dev_store">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name device -->
+      <column type="NMDevice"/>
+      <!-- column-name sparator -->
+      <column type="gboolean"/>
+    </columns>
+  </object>
+  <object class="GtkTreeStore" id="plan_store">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name method -->
+      <column type="NMAMobileAccessMethod"/>
+      <!-- column-name manual -->
+      <column type="gboolean"/>
+    </columns>
+  </object>
+  <object class="GtkTreeStore" id="providers_store">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name provider -->
+      <column type="NMAMobileProvider"/>
+    </columns>
+  </object>
+  <object class="GtkTreeModelSort" id="providers_sort">
+    <property name="model">providers_store</property>
+  </object>
+  <template class="NMAMobileWizard" parent="GtkAssistant">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">New Mobile Broadband Connection</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-always</property>
+    <property name="type_hint">dialog</property>
+    <property name="use_header_bar">1</property>
+    <signal name="cancel" handler="assistant_cancel" swapped="no"/>
+    <signal name="close" handler="assistant_closed" swapped="no"/>
+    <signal name="prepare" handler="assistant_prepare" swapped="no"/>
+    <child>
+      <object class="GtkBox" id="intro_page">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_start">12</property>
+        <property name="margin_end">12</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">12</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">This assistant helps you easily set up a mobile 
broadband connection to a cellular (3G) network.</property>
+            <property name="wrap">True</property>
+            <property name="max_width_chars">60</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">5</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">You will need the following information:</property>
+            <property name="wrap">True</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">6</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="provider_name_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_start">25</property>
+            <property name="label" translatable="yes">Your broadband provider’s name</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">7</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="plan_name_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_start">25</property>
+            <property name="label" translatable="yes">Your broadband billing plan name</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">8</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="apn_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_start">25</property>
+            <property name="label" translatable="yes">(in some cases) Your broadband billing plan APN 
(Access Point Name)</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">9</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="dev_combo_label">
+            <property name="can_focus">False</property>
+            <property name="valign">end</property>
+            <property name="vexpand">True</property>
+            <property name="label" translatable="yes">Create a connection for _this mobile broadband 
device:</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">10</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBox" id="dev_combo">
+            <property name="sensitive">False</property>
+            <property name="can_focus">False</property>
+            <property name="model">dev_store</property>
+            <property name="active">0</property>
+            <signal name="changed" handler="intro_combo_changed" swapped="yes"/>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">11</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="page_type">intro</property>
+        <property name="title" translatable="yes">Set up a Mobile Broadband Connection</property>
+        <property name="complete">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="country_page">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_start">12</property>
+        <property name="margin_end">12</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">12</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Country or region:</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="vexpand">True</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkTreeView" id="country_view">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="model">country_sort</property>
+                <property name="headers_visible">False</property>
+                <property name="search_column">0</property>
+                <signal name="row-activated" handler="country_update_continue" swapped="yes"/>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection"/>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="title" translatable="yes">Choose your Provider’s Country or Region</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="providers_page">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_start">12</property>
+        <property name="margin_end">12</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">12</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkRadioButton" id="providers_view_radio">
+            <property name="label" translatable="yes">Select your provider from a _list:</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_underline">True</property>
+            <property name="active">True</property>
+            <property name="draw_indicator">True</property>
+            <signal name="toggled" handler="providers_radio_toggled" swapped="no"/>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow">
+            <property name="height_request">140</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="margin_start">25</property>
+            <property name="vexpand">True</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkTreeView" id="providers_view">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="model">providers_sort</property>
+                <property name="search_column">0</property>
+                <signal name="row-activated" handler="providers_update_continue" swapped="yes"/>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection"/>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="provider_unlisted_radio">
+            <property name="label" translatable="yes">I can’t find my provider and I wish to set up the 
connection _manually:</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_underline">True</property>
+            <property name="draw_indicator">True</property>
+            <property name="group">providers_view_radio</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBoxText" id="provider_unlisted_type_combo">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_start">25</property>
+            <property name="active">0</property>
+            <items>
+              <item id="0" translatable="yes">My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)</item>
+              <item id="1" translatable="yes">My provider uses CDMA technology (1xRTT, EVDO)</item>
+            </items>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="title" translatable="yes">Choose your Provider</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="plan_page">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_start">12</property>
+        <property name="margin_end">12</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">12</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">_Select your plan:</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBox" id="plan_combo">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="model">plan_store</property>
+            <signal name="changed" handler="plan_combo_changed" swapped="yes"/>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Selected plan _APN (Access Point Name):</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="plan_apn_entry">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="max_length">64</property>
+            <signal name="changed" handler="plan_update_complete" swapped="yes"/>
+            <signal name="insert-text" handler="apn_filter_cb" swapped="no"/>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="valign">end</property>
+            <property name="vexpand">True</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">start</property>
+                <property name="icon_name">dialog-warning</property>
+                <property name="icon_size">6</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="width_request">500</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Warning: Selecting an incorrect plan may result in 
billing issues for your broadband account or may prevent connectivity.
+
+If you are unsure of your plan please ask your provider for your plan’s APN.</property>
+                <property name="wrap">True</property>
+                <property name="max_width_chars">60</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="title" translatable="yes">Choose your Billing Plan</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="confirm_page">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_start">12</property>
+        <property name="margin_end">12</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">12</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="width_request">500</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Your mobile broadband connection is configured with 
the following settings:</property>
+            <property name="wrap">True</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="confirm_device_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Your Device:</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="confirm_device">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_start">25</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Your Provider:</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="confirm_provider">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_start">25</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="confirm_plan_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Your Plan:</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">5</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="confirm_plan">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_start">25</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="confirm_apn">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_start">25</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">6</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="confirm_connect_after_label">
+            <property name="visible">False</property>
+            <property name="width_request">500</property>
+            <property name="can_focus">False</property>
+            <property name="valign">end</property>
+            <property name="vexpand">True</property>
+            <property name="label" translatable="yes">A connection will now be made to your mobile broadband 
provider using the settings you selected. If the connection fails or you cannot access network resources, 
double-check your settings. To modify your mobile broadband connection settings, choose “Network Connections” 
from the System → Preferences menu.</property>
+            <property name="wrap">True</property>
+            <property name="max_width_chars">60</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">7</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="page_type">confirm</property>
+        <property name="title" translatable="yes">Confirm Mobile Broadband Settings</property>
+        <property name="complete">True</property>
+      </packing>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child internal-child="action_area">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+      </object>
+      <packing>
+      </packing>
+    </child>
+  </template>
+</interface>
diff --git a/src/libnma/nma-pkcs11-cert-chooser-dialog.c b/src/libnma/nma-pkcs11-cert-chooser-dialog.c
new file mode 100644
index 00000000..f8feb056
--- /dev/null
+++ b/src/libnma/nma-pkcs11-cert-chooser-dialog.c
@@ -0,0 +1,643 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * Copyright (C) 2016,2017 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+#include "nma-pkcs11-cert-chooser-dialog.h"
+#include "nma-pkcs11-token-login-dialog.h"
+
+#include <string.h>
+#include <gck/gck.h>
+#include <gcr/gcr.h>
+
+/**
+ * SECTION:nma-pkcs11-cert-chooser-dialog
+ * @title: NMAPkcs11CertChooserDialog
+ * @short_description: The PKCS\#11 Object Chooser Dialog
+ *
+ * #NMAPkcs11CertChooserDialog selects an object from a PKCS\#11 token,
+ * optionally allowing the user to specify the PIN and log in.
+ */
+
+enum {
+       COLUMN_LABEL,
+       COLUMN_ISSUER,
+       COLUMN_HAS_KEY,
+       COLUMN_ATTRIBUTES,
+       N_COLUMNS
+};
+
+struct _NMAPkcs11CertChooserDialogPrivate {
+       GckSlot *slot;
+       GtkListStore *cert_store;
+       GtkListStore *key_store;
+       GtkWidget *login_button;
+
+       guchar *pin_value;
+       gulong pin_length;
+       gboolean remember_pin;
+
+       GtkRevealer *error_revealer;
+       GtkLabel *error_label;
+       GtkTreeView *objects_view;
+       GtkTreeViewColumn *list_name_column;
+       GtkCellRenderer *list_name_renderer;
+       GtkTreeViewColumn *list_issued_by_column;
+       GtkCellRenderer *list_issued_by_renderer;
+};
+
+#define NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+                                                       NMA_TYPE_PKCS11_CERT_CHOOSER_DIALOG, \
+                                                       NMAPkcs11CertChooserDialogPrivate))
+
+G_DEFINE_TYPE_WITH_CODE (NMAPkcs11CertChooserDialog, nma_pkcs11_cert_chooser_dialog, GTK_TYPE_DIALOG,
+                         G_ADD_PRIVATE (NMAPkcs11CertChooserDialog))
+
+#define NMA_RESPONSE_LOGIN 1
+
+enum {
+       PROP_0,
+       PROP_SLOT,
+};
+
+typedef struct {
+       GckAttributes *attrs;
+       gboolean has_key;
+} IdMatchData;
+
+static gboolean
+id_match (GtkTreeModel *model,
+          GtkTreePath *path,
+          GtkTreeIter *iter,
+          gpointer user_data)
+{
+       IdMatchData *data = user_data;
+       GckAttributes *attrs = NULL;
+       const GckAttribute *attr1, *attr2;
+
+       attr1 = gck_attributes_find (data->attrs, CKA_ID);
+       if (!attr1 || !attr1->value || !attr1->length)
+               goto out;
+
+       gtk_tree_model_get (model, iter, COLUMN_ATTRIBUTES, &attrs, -1);
+       attr2 = gck_attributes_find (attrs, CKA_ID);
+       if (!attr2 || !attr2->value || !attr2->length)
+               goto out;
+
+       if (attr1->length != attr2->length)
+               goto out;
+
+       if (memcmp (attr1->value, attr2->value, attr1->length))
+               goto out;
+
+       data->has_key = TRUE;
+       gtk_list_store_set (GTK_LIST_STORE (model), iter,
+                           COLUMN_HAS_KEY, TRUE, -1);
+
+       if (attrs)
+               gck_attributes_unref (attrs);
+out:
+       return data->has_key;
+}
+
+static void
+object_details (GObject *source_object, GAsyncResult *res, gpointer user_data)
+{
+       GckObject *object = GCK_OBJECT (source_object);
+       NMAPkcs11CertChooserDialog *self = NMA_PKCS11_CERT_CHOOSER_DIALOG (user_data);
+       NMAPkcs11CertChooserDialogPrivate *priv = NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE (self);
+       GckAttributes *attrs;
+       GtkTreeIter iter;
+       CK_OBJECT_CLASS cka_class;
+       const GckAttribute *attr;
+       GcrCertificate *cert;
+       gchar *label, *issuer;
+       GError *error = NULL;
+       GtkListStore *store1, *store2;
+       IdMatchData data;
+
+       attrs = gck_object_get_finish (object, res, &error);
+       if (!attrs) {
+               /* No better idea than to just ignore the object. */
+               g_warning ("Error getting attributes: %s\n", error->message);
+               g_error_free (error);
+               goto out;
+       }
+
+       if (!gck_attributes_find_ulong (attrs, CKA_CLASS, &cka_class)) {
+               g_warning ("An object without CKA_CLASS\n");
+               goto out;
+       }
+
+       switch (cka_class) {
+       case CKO_CERTIFICATE:
+               store1 = priv->cert_store;
+               store2 = priv->key_store;
+               break;
+       case CKO_PRIVATE_KEY:
+               store1 = priv->key_store;
+               store2 = priv->cert_store;
+               break;
+       default:
+               goto out;
+       }
+
+       /* See if there's a matching object in another store. */
+       data.attrs = attrs;
+       data.has_key = FALSE;
+       gtk_tree_model_foreach (GTK_TREE_MODEL (store2),
+                               id_match,
+                               &data);
+
+       attr = gck_attributes_find (attrs, CKA_VALUE);
+       if (attr && attr->value && attr->length) {
+               cert = gcr_simple_certificate_new (attr->value, attr->length);
+               label = gcr_certificate_get_subject_name (cert);
+               issuer = gcr_certificate_get_issuer_name (cert);
+               g_object_unref (cert);
+       } else {
+               attr = gck_attributes_find (attrs, CKA_LABEL);
+               if (attr && attr->value && attr->length) {
+                       label = g_malloc (attr->length + 1);
+                       memcpy (label, attr->value, attr->length);
+                       label[attr->length] = '\0';
+               } else {
+                       label = g_strdup (_("(Unknown)"));
+               }
+               issuer = g_memdup ("", 1);
+       }
+
+       gtk_list_store_append (store1, &iter);
+       gtk_list_store_set (store1, &iter,
+                           COLUMN_LABEL, label,
+                           COLUMN_ISSUER, issuer,
+                           COLUMN_HAS_KEY, data.has_key,
+                           COLUMN_ATTRIBUTES, attrs,
+                           -1);
+
+       g_free (label);
+       g_free (issuer);
+
+out:
+       if (attrs)
+               gck_attributes_unref (attrs);
+}
+
+static void
+next_object (GObject *obj, GAsyncResult *res, gpointer user_data)
+{
+       NMAPkcs11CertChooserDialog *self = NMA_PKCS11_CERT_CHOOSER_DIALOG (user_data);
+       GckEnumerator *enm = GCK_ENUMERATOR (obj);
+       GList *objects;
+       GList *iter;
+       GError *error = NULL;
+
+       objects = gck_enumerator_next_finish (enm, res, &error);
+       if (error) {
+               /* No better idea than to just ignore the object. */
+               g_warning ("Error getting object: %s", error->message);
+               g_error_free (error);
+               return;
+       }
+
+       for (iter = objects; iter; iter = iter->next) {
+               GckObject *object = GCK_OBJECT (iter->data);
+               const gulong attr_types[] = { CKA_ID, CKA_LABEL, CKA_ISSUER,
+                                             CKA_VALUE, CKA_CLASS };
+
+               gck_object_get_async (object, attr_types,
+                                     sizeof(attr_types) / sizeof(attr_types[0]),
+                                     NULL, object_details, self);
+       }
+
+       gck_list_unref_free (objects);
+}
+
+static void
+reload_slot (NMAPkcs11CertChooserDialog *self, GckSession *session)
+{
+       NMAPkcs11CertChooserDialogPrivate *priv = NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE (self);
+       GckEnumerator *enm;
+
+       gtk_list_store_clear (priv->key_store);
+       gtk_list_store_clear (priv->cert_store);
+       enm = gck_session_enumerate_objects (session, gck_attributes_new_empty (GCK_INVALID));
+       gck_enumerator_next_async (enm, -1, NULL, next_object, self);
+}
+
+static void
+logged_in (GObject *obj, GAsyncResult *res, gpointer user_data)
+{
+       NMAPkcs11CertChooserDialog *self = NMA_PKCS11_CERT_CHOOSER_DIALOG (user_data);
+       NMAPkcs11CertChooserDialogPrivate *priv = NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE (self);
+       GckSession *session = GCK_SESSION (obj);
+       GError *error = NULL;
+
+       if (!gck_session_login_finish (session, res, &error)) {
+               g_prefix_error (&error, _("Error logging in: "));
+               gtk_label_set_label (priv->error_label, error->message);
+               gtk_revealer_set_reveal_child (priv->error_revealer, TRUE);
+               g_error_free (error);
+       } else {
+               gtk_revealer_set_reveal_child (priv->error_revealer, FALSE);
+               gtk_widget_set_sensitive (priv->login_button, FALSE);
+               reload_slot (self, session);
+               g_clear_object (&session);
+       }
+}
+
+static void
+session_opened (GObject *obj, GAsyncResult *res, gpointer user_data)
+{
+       NMAPkcs11CertChooserDialog *self = NMA_PKCS11_CERT_CHOOSER_DIALOG (user_data);
+       NMAPkcs11CertChooserDialogPrivate *priv = NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE (self);
+       GckSession *session;
+       GError *error = NULL;
+
+       session = gck_slot_open_session_finish (priv->slot, res, &error);
+       if (error) {
+               g_prefix_error (&error, _("Error opening a session: "));
+               gtk_label_set_label (priv->error_label, error->message);
+               gtk_revealer_set_reveal_child (priv->error_revealer, TRUE);
+               g_error_free (error);
+               return;
+       }
+
+       if (priv->pin_value) {
+               gck_session_login_async (session, CKU_USER,
+                                        priv->pin_value, priv->pin_length,
+                                        NULL, logged_in, self);
+       } else {
+               reload_slot (self, session);
+               g_clear_object (&session);
+       }
+}
+
+static void
+row_activated (GtkTreeView *tree_view, GtkTreePath *path,
+               GtkTreeViewColumn *column, gpointer user_data)
+{
+       if (gtk_window_activate_default (GTK_WINDOW (user_data)))
+               return;
+}
+
+static void
+cursor_changed (GtkTreeView *tree_view, gpointer user_data)
+{
+       NMAPkcs11CertChooserDialog *self = NMA_PKCS11_CERT_CHOOSER_DIALOG (user_data);
+       gchar *uri;
+
+       uri = nma_pkcs11_cert_chooser_dialog_get_uri (self);
+       gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_ACCEPT, uri != NULL);
+       g_free (uri);
+}
+
+static void
+error_close (GtkInfoBar *bar, gint response_id, gpointer user_data)
+{
+       NMAPkcs11CertChooserDialog *self = user_data;
+       NMAPkcs11CertChooserDialogPrivate *priv = self->priv;
+
+       gtk_revealer_set_reveal_child (priv->error_revealer, FALSE);
+}
+
+static void
+login_clicked (GtkButton *button, gpointer user_data)
+{
+       NMAPkcs11CertChooserDialog *self = NMA_PKCS11_CERT_CHOOSER_DIALOG (user_data);
+       NMAPkcs11CertChooserDialogPrivate *priv = NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE (self);
+       GtkWidget *dialog;
+       GckTokenInfo *token_info;
+       gboolean has_pin_pad = FALSE;
+
+       /* See if the token has a PIN pad. */
+       token_info = gck_slot_get_token_info (priv->slot);
+       g_return_if_fail (token_info);
+       if (token_info->flags & CKF_PROTECTED_AUTHENTICATION_PATH)
+               has_pin_pad = TRUE;
+       gck_token_info_free (token_info);
+
+       if (priv->pin_value)
+               g_free (priv->pin_value);
+
+       if (has_pin_pad) {
+               /* Login with empty credentials makes the token
+                * log in on its PIN pad. */
+               priv->pin_length = 0;
+               priv->pin_value =  g_memdup ("", 1);
+               priv->remember_pin = TRUE;
+               gck_slot_open_session_async (priv->slot, GCK_SESSION_READ_ONLY, NULL, session_opened, self);
+               return;
+       }
+
+       /* The token doesn't have a PIN pad. Ask for PIN. */
+       dialog = nma_pkcs11_token_login_dialog_new (priv->slot);
+       gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
+       gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+
+       if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
+               priv->pin_length = nma_pkcs11_token_login_dialog_get_pin_length 
(NMA_PKCS11_TOKEN_LOGIN_DIALOG (dialog));
+               priv->pin_value = g_memdup (nma_pkcs11_token_login_dialog_get_pin_value 
(NMA_PKCS11_TOKEN_LOGIN_DIALOG (dialog)),
+                                           priv->pin_length + 1);
+               priv->remember_pin = nma_pkcs11_token_login_dialog_get_remember_pin 
(NMA_PKCS11_TOKEN_LOGIN_DIALOG (dialog));
+               gck_slot_open_session_async (priv->slot, GCK_SESSION_READ_ONLY, NULL, session_opened, self);
+       }
+
+       gtk_widget_destroy (dialog);
+}
+
+static void
+get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+       NMAPkcs11CertChooserDialog *self = NMA_PKCS11_CERT_CHOOSER_DIALOG (object);
+       NMAPkcs11CertChooserDialogPrivate *priv = NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE (self);
+
+       switch (prop_id) {
+       case PROP_SLOT:
+               if (priv->slot)
+                       g_value_set_object (value, priv->slot);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       }
+}
+
+static void
+set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+       NMAPkcs11CertChooserDialog *self = NMA_PKCS11_CERT_CHOOSER_DIALOG (object);
+       NMAPkcs11CertChooserDialogPrivate *priv = NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE (self);
+       GckTokenInfo *token_info;
+
+       switch (prop_id) {
+       case PROP_SLOT:
+               priv->slot = g_value_dup_object (value);
+               token_info = gck_slot_get_token_info (priv->slot);
+               g_return_if_fail (token_info);
+               if ((token_info->flags & CKF_LOGIN_REQUIRED) == 0)
+                       gtk_widget_set_sensitive (priv->login_button, FALSE);
+               gck_token_info_free (token_info);
+               gck_slot_open_session_async (priv->slot, GCK_SESSION_READ_ONLY, NULL, session_opened, self);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       }
+}
+
+static void
+finalize (GObject *object)
+{
+       NMAPkcs11CertChooserDialog *self = NMA_PKCS11_CERT_CHOOSER_DIALOG (object);
+       NMAPkcs11CertChooserDialogPrivate *priv = NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE (self);
+
+       g_clear_object (&priv->cert_store);
+       g_clear_object (&priv->key_store);
+       g_clear_object (&priv->slot);
+
+       if (priv->pin_value) {
+               g_free (priv->pin_value);
+               priv->pin_value = NULL;
+       }
+
+       G_OBJECT_CLASS (nma_pkcs11_cert_chooser_dialog_parent_class)->finalize (object);
+}
+
+static void
+nma_pkcs11_cert_chooser_dialog_class_init (NMAPkcs11CertChooserDialogClass *klass)
+{
+        GObjectClass *object_class = G_OBJECT_CLASS (klass);
+       GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+       object_class->get_property = get_property;
+       object_class->set_property = set_property;
+       object_class->finalize = finalize;
+
+       g_object_class_install_property (object_class, PROP_SLOT,
+               g_param_spec_object ("slot", "PKCS#11 Slot", "PKCS#11 Slot",
+                                    GCK_TYPE_SLOT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+       gtk_widget_class_set_template_from_resource (widget_class,
+                                                    
"/org/freedesktop/network-manager-applet/nma-pkcs11-cert-chooser-dialog.ui");
+
+       gtk_widget_class_bind_template_child_private (widget_class, NMAPkcs11CertChooserDialog, objects_view);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAPkcs11CertChooserDialog, 
list_name_column);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAPkcs11CertChooserDialog, 
list_name_renderer);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAPkcs11CertChooserDialog, 
list_issued_by_column);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAPkcs11CertChooserDialog, 
list_issued_by_renderer);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAPkcs11CertChooserDialog, 
error_revealer);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAPkcs11CertChooserDialog, error_label);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAPkcs11CertChooserDialog, login_button);
+
+       gtk_widget_class_bind_template_callback (widget_class, row_activated);
+       gtk_widget_class_bind_template_callback (widget_class, cursor_changed);
+       gtk_widget_class_bind_template_callback (widget_class, error_close);
+       gtk_widget_class_bind_template_callback (widget_class, login_clicked);
+}
+
+static void
+nma_pkcs11_cert_chooser_dialog_init (NMAPkcs11CertChooserDialog *self)
+{
+       NMAPkcs11CertChooserDialogPrivate *priv;
+
+       self->priv = nma_pkcs11_cert_chooser_dialog_get_instance_private (self);
+       priv = NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE (self);
+
+       gtk_widget_init_template (GTK_WIDGET (self));
+
+       gtk_tree_view_column_set_attributes (priv->list_name_column,
+                                            priv->list_name_renderer,
+                                            "text", 0, NULL);
+       gtk_tree_view_column_set_attributes (priv->list_issued_by_column,
+                                            priv->list_issued_by_renderer,
+                                            "text", 1, NULL);
+
+       priv->cert_store = gtk_list_store_new (N_COLUMNS,
+                                              G_TYPE_STRING,
+                                              G_TYPE_STRING,
+                                              G_TYPE_BOOLEAN,
+                                              GCK_TYPE_ATTRIBUTES);
+       priv->key_store = gtk_list_store_new (N_COLUMNS,
+                                             G_TYPE_STRING,
+                                             G_TYPE_STRING,
+                                             G_TYPE_BOOLEAN,
+                                             GCK_TYPE_ATTRIBUTES);
+}
+
+static GtkWidget *
+nma_pkcs11_cert_chooser_dialog_new_valist (GckSlot *slot,
+                                           CK_OBJECT_CLASS object_class,
+                                           const gchar *title, GtkWindow *parent,
+                                           GtkDialogFlags flags,
+                                           const gchar *first_button_text,
+                                           va_list varargs)
+{
+       NMAPkcs11CertChooserDialogPrivate *priv;
+       GtkWidget *self;
+       const char *button_text = first_button_text;
+       gint response_id;
+
+       self = g_object_new (NMA_TYPE_PKCS11_CERT_CHOOSER_DIALOG,
+                            "use-header-bar", !!(flags & GTK_DIALOG_USE_HEADER_BAR),
+                            "title", title,
+                            "slot", slot,
+                            NULL);
+
+       priv = NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE (self);
+       switch (object_class) {
+       case CKO_CERTIFICATE:
+               gtk_tree_view_set_model (GTK_TREE_VIEW (priv->objects_view),
+                                        GTK_TREE_MODEL (priv->cert_store));
+               break;
+       case CKO_PRIVATE_KEY:
+               gtk_tree_view_set_model (GTK_TREE_VIEW (priv->objects_view),
+                                        GTK_TREE_MODEL (priv->key_store));
+               break;
+       default:
+               g_warn_if_reached ();
+       }
+
+       if (parent)
+               gtk_window_set_transient_for (GTK_WINDOW (self), parent);
+
+       while (button_text) {
+               response_id = va_arg (varargs, gint);
+               gtk_dialog_add_button (GTK_DIALOG (self), button_text, response_id);
+               button_text = va_arg (varargs, const gchar *);
+       }
+
+       gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_ACCEPT);
+       gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_ACCEPT, FALSE);
+
+       return self;
+}
+
+/**
+ * nma_pkcs11_cert_chooser_dialog_get_uri:
+ * @dialog: the #NMAPkcs11CertChooserDialog instance
+ *
+ * Obtain the URI of the selected obejct.
+ *
+ * Returns: the URI or %NULL if none was selected.
+ */
+gchar *
+nma_pkcs11_cert_chooser_dialog_get_uri (NMAPkcs11CertChooserDialog *dialog)
+{
+       NMAPkcs11CertChooserDialogPrivate *priv = NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE (dialog);
+       GtkTreeModel *model;
+       GtkTreePath *path;
+       GtkTreeIter iter;
+       GckAttributes *attrs;
+       gboolean has_key;
+       GckBuilder *builder;
+       GckUriData uri_data = { 0, };
+       gchar *uri;
+
+       gtk_tree_view_get_cursor (priv->objects_view, &path, NULL);
+       if (path == NULL)
+               return NULL;
+
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->objects_view));
+       if (!gtk_tree_model_get_iter (model, &iter, path))
+               g_return_val_if_reached (NULL);
+
+       gtk_tree_model_get (model, &iter,
+                           COLUMN_HAS_KEY, &has_key,
+                           COLUMN_ATTRIBUTES, &attrs, -1);
+
+       builder = gck_builder_new (GCK_BUILDER_NONE);
+       if (has_key) {
+               /* We do have a object with matching id in the other store (a key)
+                * but its other properties (label) may be unset or missing.
+                * Still, we want an URI that matches both. */
+               gck_builder_add_only (builder, attrs, CKA_ID, GCK_INVALID);
+       } else {
+               gck_builder_add_all (builder, attrs);
+       }
+
+       uri_data.attributes = gck_builder_end (builder);
+       uri_data.token_info = gck_slot_get_token_info (priv->slot);
+       uri = gck_uri_build (&uri_data, GCK_URI_FOR_OBJECT_ON_TOKEN);
+
+       gck_attributes_unref (uri_data.attributes);
+       gck_attributes_unref (attrs);
+
+       return uri;
+}
+
+/**
+ * nma_pkcs11_cert_chooser_dialog_get_pin:
+ * @dialog: the #NMAPkcs11CertChooserDialog instance
+ *
+ * Obtain the PIN that was used to unlock the token.
+ *
+ * Returns: the PIN, %NULL if the token was not logged into or an emtpy
+ *   string ("") if the protected authentication path was used.
+ */
+gchar *
+nma_pkcs11_cert_chooser_dialog_get_pin (NMAPkcs11CertChooserDialog *dialog)
+{
+       NMAPkcs11CertChooserDialogPrivate *priv = NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE (dialog);
+
+       return g_strdup ((gchar *) priv->pin_value);
+}
+
+/**
+ * nma_pkcs11_cert_chooser_dialog_get_remember_pin:
+ * @dialog: the #NMAPkcs11CertChooserDialog instance
+ *
+ * Obtain the value of the "Remember PIN" checkbox during the token login.
+ *
+ * Returns: TRUE if the user chose to remember the PIN, FALSE
+ *   if not or if the tokin was not logged into at all.
+ */
+gboolean
+nma_pkcs11_cert_chooser_dialog_get_remember_pin (NMAPkcs11CertChooserDialog *dialog)
+{
+       NMAPkcs11CertChooserDialogPrivate *priv = NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_PRIVATE (dialog);
+
+       return priv->remember_pin;
+}
+
+/**
+ * nma_pkcs11_cert_chooser_dialog_new:
+ * @slot: the PKCS\#11 slot the token is in
+ * @object_class: CKA_CLASS of object to be selected
+ * @title: The dialog window title
+ * @parent: (allow-none): The parent window or %NULL
+ * @flags: The dialog flags
+ * @first_button_text: (allow-none): The text of the first button
+ * @...: response ID for the first button, texts and response ids for other buttons, terminated with %NULL
+ *
+ * Creates the new #NMAPkcs11CertChooserDialog.
+ *
+ * Returns: newly created #NMAPkcs11CertChooserDialog
+ */
+
+GtkWidget *
+nma_pkcs11_cert_chooser_dialog_new (GckSlot *slot,
+                                    CK_OBJECT_CLASS object_class,
+                                    const gchar *title,
+                                    GtkWindow *parent,
+                                    GtkDialogFlags flags,
+                                    const gchar *first_button_text,
+                                    ...)
+{
+       GtkWidget *result;
+       va_list varargs;
+
+       va_start (varargs, first_button_text);
+       result = nma_pkcs11_cert_chooser_dialog_new_valist (slot,
+                                                           object_class,
+                                                           title,
+                                                           parent,
+                                                           flags,
+                                                           first_button_text,
+                                                           varargs);
+       va_end (varargs);
+
+       return result;
+}
diff --git a/src/libnma/nma-pkcs11-cert-chooser-dialog.h b/src/libnma/nma-pkcs11-cert-chooser-dialog.h
new file mode 100644
index 00000000..ced388ab
--- /dev/null
+++ b/src/libnma/nma-pkcs11-cert-chooser-dialog.h
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * Copyright (C) 2016,2017 Red Hat, Inc.
+ */
+
+#ifndef __NMA_PKCS11_CERT_CHOOSER_DIALOG_H__
+#define __NMA_PKCS11_CERT_CHOOSER_DIALOG_H__
+
+#include <gtk/gtk.h>
+#include <gck/gck.h>
+
+typedef struct _NMAPkcs11CertChooserDialogPrivate NMAPkcs11CertChooserDialogPrivate;
+
+typedef struct {
+        GtkDialog parent;
+       NMAPkcs11CertChooserDialogPrivate *priv;
+} NMAPkcs11CertChooserDialog;
+
+typedef struct {
+        GtkDialogClass parent;
+} NMAPkcs11CertChooserDialogClass;
+
+#define NMA_TYPE_PKCS11_CERT_CHOOSER_DIALOG            (nma_pkcs11_cert_chooser_dialog_get_type ())
+#define NMA_PKCS11_CERT_CHOOSER_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
NMA_TYPE_PKCS11_CERT_CHOOSER_DIALOG, NMAPkcs11CertChooserDialog))
+#define NMA_PKCS11_CERT_CHOOSER_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), 
NMA_TYPE_PKCS11_CERT_CHOOSER_DIALOG, NMAPkcs11CertChooserDialogClass))
+#define NMA_IS_PKCS11_CERT_CHOOSER_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
NMA_TYPE_PKCS11_CERT_CHOOSER_DIALOG))
+#define NMA_IS_PKCS11_CERT_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), 
NMA_TYPE_PKCS11_CERT_CHOOSER_DIALOG))
+#define NMA_PKCS11_CERT_CHOOSER_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
NMA_TYPE_PKCS11_CERT_CHOOSER_DIALOG, NMAPkcs11CertChooserDialogClass))
+
+GType nma_pkcs11_cert_chooser_dialog_get_type (void);
+
+GtkWidget *nma_pkcs11_cert_chooser_dialog_new (GckSlot *slot,
+                                               CK_OBJECT_CLASS object_class,
+                                               const gchar *title,
+                                               GtkWindow *parent,
+                                               GtkDialogFlags flags,
+                                               const gchar *first_button_text,
+                                               ...);
+
+gchar *nma_pkcs11_cert_chooser_dialog_get_uri (NMAPkcs11CertChooserDialog *dialog);
+
+gchar *nma_pkcs11_cert_chooser_dialog_get_pin (NMAPkcs11CertChooserDialog *dialog);
+
+gboolean nma_pkcs11_cert_chooser_dialog_get_remember_pin (NMAPkcs11CertChooserDialog *dialog);
+
+#endif /* __NMA_PKCS11_CERT_CHOOSER_DIALOG_H__ */
diff --git a/src/libnma/nma-pkcs11-cert-chooser-dialog.ui b/src/libnma/nma-pkcs11-cert-chooser-dialog.ui
new file mode 100644
index 00000000..3141dba8
--- /dev/null
+++ b/src/libnma/nma-pkcs11-cert-chooser-dialog.ui
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="gtk30">
+  <requires lib="gtk+" version="3.10"/>
+  <template class="NMAPkcs11CertChooserDialog" parent="GtkDialog">
+    <property name="can_focus">False</property>
+    <property name="role">NMAPkcs11CertChooserDialog</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="login_button">
+                <property name="label" translatable="yes">_Unlock token</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="login_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkRevealer" id="error_revealer">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkInfoBar" id="error_bar">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="message_type">error</property>
+                    <property name="show_close_button">True</property>
+                    <signal name="response" handler="error_close" swapped="no"/>
+                    <child internal-child="action_area">
+                      <object class="GtkButtonBox">
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child internal-child="content_area">
+                      <object class="GtkBox">
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel" id="error_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow">
+                <property name="width_request">300</property>
+                <property name="height_request">200</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hscrollbar_policy">never</property>
+                <child>
+                  <object class="GtkTreeView" id="objects_view">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="enable_search">False</property>
+                    <signal name="cursor-changed" handler="cursor_changed" swapped="no"/>
+                    <signal name="row-activated" handler="row_activated" swapped="no"/>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="objects_view_selection"/>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="list_name_column">
+                        <property name="title" translatable="yes">Name</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="list_name_renderer">
+                            <property name="xpad">6</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="list_issued_by_column">
+                        <property name="title" translatable="yes">Issued By</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="list_issued_by_renderer">
+                            <property name="xpad">6</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/src/libnma/nma-pkcs11-cert-chooser.c b/src/libnma/nma-pkcs11-cert-chooser.c
new file mode 100644
index 00000000..8e45138e
--- /dev/null
+++ b/src/libnma/nma-pkcs11-cert-chooser.c
@@ -0,0 +1,559 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * Copyright (C) 2017,2018 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+#include "nma-private.h"
+#include "nma-cert-chooser-private.h"
+#include "nma-cert-chooser-button.h"
+#include "nma-ui-utils.h"
+#include "utils.h"
+
+#include <glib/gstdio.h>
+#include <gck/gck.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#define NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE(self) (&(_NM_GET_PRIVATE (self, NMACertChooser, 
NMA_IS_CERT_CHOOSER)->_sub.pkcs11))
+
+static void
+set_key_password (NMACertChooser *cert_chooser, const gchar *password)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       g_return_if_fail (priv->key_password != NULL);
+       if (password)
+               gtk_editable_set_text (GTK_EDITABLE (priv->key_password), password);
+}
+
+static const gchar *
+get_key_password (NMACertChooser *cert_chooser)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+       const gchar *text;
+
+       g_return_val_if_fail (priv->key_password != NULL, NULL);
+       text = gtk_editable_get_text (GTK_EDITABLE (priv->key_password));
+
+       return text && text[0] ? text : NULL;
+}
+
+static void
+set_key_uri (NMACertChooser *cert_chooser, const gchar *uri)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       gtk_widget_set_sensitive (priv->key_button, TRUE);
+       gtk_widget_set_sensitive (priv->key_button_label, TRUE);
+       gtk_widget_set_sensitive (priv->key_password, TRUE);
+       gtk_widget_set_sensitive (priv->key_password_label, TRUE);
+       gtk_widget_show (priv->key_password);
+       gtk_widget_show (priv->key_password_label);
+       gtk_widget_show (priv->show_password);
+       nma_cert_chooser_button_set_uri (NMA_CERT_CHOOSER_BUTTON (priv->key_button), uri);
+}
+
+static gchar *
+get_key_uri (NMACertChooser *cert_chooser)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       return g_strdup (nma_cert_chooser_button_get_uri (NMA_CERT_CHOOSER_BUTTON (priv->key_button)));
+}
+
+static void
+set_cert_password (NMACertChooser *cert_chooser, const gchar *password)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       g_return_if_fail (priv->cert_password != NULL);
+       if (password)
+               gtk_editable_set_text (GTK_EDITABLE (priv->cert_password), password);
+}
+
+static const gchar *
+get_cert_password (NMACertChooser *cert_chooser)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+       const gchar *text;
+
+       g_return_val_if_fail (priv->cert_password != NULL, NULL);
+       text = gtk_editable_get_text (GTK_EDITABLE (priv->cert_password));
+
+       return text && text[0] ? text : NULL;
+}
+
+static void
+set_cert_uri (NMACertChooser *cert_chooser, const gchar *uri)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       if (g_str_has_prefix (uri, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) {
+               gtk_widget_set_sensitive (priv->cert_password, FALSE);
+               gtk_widget_set_sensitive (priv->cert_password_label, FALSE);
+       } else if (g_str_has_prefix (uri, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11)) {
+               gtk_widget_set_sensitive (priv->cert_password, TRUE);
+               gtk_widget_set_sensitive (priv->cert_password_label, TRUE);
+               gtk_widget_show (priv->cert_password);
+               gtk_widget_show (priv->cert_password_label);
+               gtk_widget_show (priv->show_password);
+       } else {
+               g_warning ("The certificate '%s' uses an unknown scheme\n", uri);
+               return;
+       }
+
+       nma_cert_chooser_button_set_uri (NMA_CERT_CHOOSER_BUTTON (priv->cert_button), uri);
+}
+
+static gchar *
+get_cert_uri (NMACertChooser *cert_chooser)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       return g_strdup (nma_cert_chooser_button_get_uri (NMA_CERT_CHOOSER_BUTTON (priv->cert_button)));
+}
+
+static void
+add_to_size_group (NMACertChooser *cert_chooser, GtkSizeGroup *group)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       gtk_size_group_add_widget (group, priv->cert_button_label);
+       gtk_size_group_add_widget (group, priv->cert_password_label);
+       gtk_size_group_add_widget (group, priv->key_button_label);
+       gtk_size_group_add_widget (group, priv->key_password_label);
+}
+
+static gboolean
+validate (NMACertChooser *cert_chooser, GError **error)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+       GError *local = NULL;
+
+       if (!nma_cert_chooser_button_get_uri (NMA_CERT_CHOOSER_BUTTON (priv->cert_button))) {
+               g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("No certificate set"));
+               return FALSE;
+       }
+
+       g_signal_emit_by_name (cert_chooser, "cert-validate", &local);
+       if (local) {
+               widget_set_error (priv->cert_button);
+               g_propagate_error (error, local);
+               return FALSE;
+       } else {
+               widget_unset_error (priv->cert_button);
+       }
+
+       g_signal_emit_by_name (cert_chooser, "cert-password-validate", &local);
+       if (local) {
+               widget_set_error (priv->cert_password);
+               g_propagate_error (error, local);
+               return FALSE;
+       } else {
+               widget_unset_error (priv->cert_password);
+       }
+
+       if (gtk_widget_get_visible (priv->key_button)) {
+               if (!nma_cert_chooser_button_get_uri (NMA_CERT_CHOOSER_BUTTON (priv->cert_button))) {
+                       g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("No key set"));
+                       return FALSE;
+               }
+
+               g_signal_emit_by_name (cert_chooser, "key-validate", &local);
+               if (local) {
+                       widget_set_error (priv->key_button);
+                       g_propagate_error (error, local);
+                       return FALSE;
+               } else {
+                       widget_unset_error (priv->key_button);
+               }
+
+               g_signal_emit_by_name (cert_chooser, "key-password-validate", &local);
+               if (local) {
+                       widget_set_error (priv->key_password);
+                       g_propagate_error (error, local);
+                       return FALSE;
+               } else {
+                       widget_unset_error (priv->key_password);
+               }
+       }
+
+       return TRUE;
+}
+
+static void
+setup_key_password_storage (NMACertChooser *cert_chooser,
+                            NMSettingSecretFlags initial_flags,
+                            NMSetting *setting,
+                            const char *password_flags_name,
+                            gboolean with_not_required,
+                            gboolean ask_mode)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       nma_utils_setup_password_storage (priv->key_password,
+                                         initial_flags,
+                                         setting,
+                                         password_flags_name,
+                                         with_not_required,
+                                         ask_mode);
+}
+
+static void
+update_key_password_storage (NMACertChooser *cert_chooser,
+                             NMSettingSecretFlags secret_flags,
+                             NMSetting *setting,
+                             const char *password_flags_name)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       nma_utils_update_password_storage (priv->key_password,
+                                          secret_flags,
+                                          setting,
+                                          password_flags_name);
+}
+
+static NMSettingSecretFlags
+get_key_password_flags (NMACertChooser *cert_chooser)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       return nma_utils_menu_to_secret_flags (priv->key_password);
+}
+
+static void
+setup_cert_password_storage (NMACertChooser *cert_chooser,
+                             NMSettingSecretFlags initial_flags,
+                             NMSetting *setting,
+                             const char *password_flags_name,
+                             gboolean with_not_required,
+                             gboolean ask_mode)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       nma_utils_setup_password_storage (priv->cert_password,
+                                         initial_flags,
+                                         setting,
+                                         password_flags_name,
+                                         with_not_required,
+                                         ask_mode);
+}
+
+static void
+update_cert_password_storage (NMACertChooser *cert_chooser,
+                              NMSettingSecretFlags secret_flags,
+                              NMSetting *setting,
+                              const char *password_flags_name)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       nma_utils_update_password_storage (priv->cert_password,
+                                          secret_flags,
+                                          setting,
+                                          password_flags_name);
+}
+
+static NMSettingSecretFlags
+get_cert_password_flags (NMACertChooser *cert_chooser)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       return nma_utils_menu_to_secret_flags (priv->cert_password);
+}
+
+static void
+cert_changed_cb (NMACertChooserButton *button, gpointer user_data)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (NMA_CERT_CHOOSER 
(user_data));
+       GckUriData *uri_data;
+       gchar *pin = NULL;
+       const gchar *uri;
+
+       uri = nma_cert_chooser_button_get_uri (button);
+       if (!uri)
+               return;
+       uri_data = gck_uri_parse (uri, GCK_URI_FOR_OBJECT, NULL);
+
+       if (nma_cert_chooser_button_get_remember_pin (button))
+               pin = nma_cert_chooser_button_get_pin (button);
+       if (pin)
+               gtk_editable_set_text (GTK_EDITABLE (priv->cert_password), pin);
+
+       gtk_widget_set_sensitive (priv->cert_password, uri_data != NULL);
+       gtk_widget_set_sensitive (priv->cert_password_label, uri_data != NULL);
+
+       if (!gtk_widget_get_sensitive (priv->key_button)) {
+               gtk_widget_set_sensitive (priv->key_button, TRUE);
+               gtk_widget_set_sensitive (priv->key_button_label, TRUE);
+
+               if (uri_data) {
+                       /* URI that is good both for a certificate and for a key. */
+                       if (!gck_attributes_find (uri_data->attributes, CKA_CLASS)) {
+                               nma_cert_chooser_button_set_uri (NMA_CERT_CHOOSER_BUTTON (priv->key_button), 
uri);
+                               gtk_widget_set_sensitive (priv->key_password, TRUE);
+                               gtk_widget_set_sensitive (priv->key_password_label, TRUE);
+                               if (pin)
+                                       gtk_editable_set_text (GTK_EDITABLE (priv->key_password), pin);
+                       }
+               }
+       }
+
+       if (uri_data)
+               gck_uri_data_free (uri_data);
+       if (pin)
+               g_free (pin);
+
+       g_signal_emit_by_name (user_data, "changed");
+}
+
+static void
+key_changed_cb (NMACertChooserButton *button, gpointer user_data)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (NMA_CERT_CHOOSER 
(user_data));
+       gchar *pin = NULL;
+
+       if (nma_cert_chooser_button_get_remember_pin (button))
+               pin = nma_cert_chooser_button_get_pin (button);
+       if (pin) {
+               gtk_editable_set_text (GTK_EDITABLE (priv->key_password), pin);
+               g_free (pin);
+       }
+
+       gtk_widget_set_sensitive (priv->key_password, TRUE);
+       gtk_widget_set_sensitive (priv->key_password_label, TRUE);
+       g_signal_emit_by_name (user_data, "changed");
+}
+
+static void
+key_password_changed_cb (GtkEntry *entry, gpointer user_data)
+{
+       g_signal_emit_by_name (user_data, "changed");
+}
+
+static void
+cert_password_changed_cb (GtkEntry *entry, gpointer user_data)
+{
+       g_signal_emit_by_name (user_data, "changed");
+}
+
+
+static void
+show_toggled_cb (GtkCheckButton *button, gpointer user_data)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (NMA_CERT_CHOOSER 
(user_data));
+       gboolean active;
+
+       active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+       gtk_entry_set_visibility (GTK_ENTRY (priv->cert_password), active);
+       if (priv->key_password)
+               gtk_entry_set_visibility (GTK_ENTRY (priv->key_password), active);
+}
+
+static void
+set_title (NMACertChooser *cert_chooser, const gchar *title)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+       gs_free gchar *mnemonic_escaped = NULL;
+       gchar *text;
+       char **split;
+
+       split = g_strsplit (title, "_", -1);
+       mnemonic_escaped = g_strjoinv("__", split);
+       g_strfreev (split);
+
+       text = g_strdup_printf (_("Choose a key for %s Certificate"), title);
+       nma_cert_chooser_button_set_title (NMA_CERT_CHOOSER_BUTTON (priv->key_button), text);
+       g_free (text);
+
+       text = g_strdup_printf (_("%s private _key"), mnemonic_escaped);
+       gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->key_button_label), text);
+       g_free (text);
+
+       text = g_strdup_printf (_("%s key _password"), mnemonic_escaped);
+       gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->key_password_label), text);
+       g_free (text);
+
+       text = g_strdup_printf (_("Choose a %s Certificate"), title);
+       nma_cert_chooser_button_set_title (NMA_CERT_CHOOSER_BUTTON (priv->cert_button), text);
+       g_free (text);
+
+       text = g_strdup_printf (_("%s _certificate"), mnemonic_escaped);
+       gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->cert_button_label), text);
+       g_free (text);
+
+       text = g_strdup_printf (_("%s certificate _password"), mnemonic_escaped);
+       gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->cert_password_label), text);
+       g_free (text);
+}
+
+static void
+set_flags (NMACertChooser *cert_chooser, NMACertChooserFlags flags)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       if (flags & NMA_CERT_CHOOSER_FLAG_CERT) {
+               gtk_widget_hide (priv->key_button);
+               gtk_widget_hide (priv->key_button_label);
+               gtk_widget_hide (priv->key_password);
+               gtk_widget_hide (priv->key_password_label);
+       }
+
+       if (flags & NMA_CERT_CHOOSER_FLAG_PASSWORDS) {
+               gtk_widget_hide (priv->cert_button);
+               gtk_widget_hide (priv->cert_button_label);
+               gtk_widget_hide (priv->key_button);
+               gtk_widget_hide (priv->key_button_label);
+
+               /* With FLAG_PASSWORDS the user can't pick a different key or a
+                * certificate, so there's no point in showing inactive password
+                * inputs. */
+               if (!gtk_widget_get_sensitive (priv->cert_password)) {
+                       gtk_widget_hide (priv->cert_password);
+                       gtk_widget_hide (priv->cert_password_label);
+               }
+               if (!gtk_widget_get_sensitive (priv->key_password)) {
+                       gtk_widget_hide (priv->key_password);
+                       gtk_widget_hide (priv->key_password_label);
+               }
+               if (   !gtk_widget_get_visible (priv->cert_password)
+                   && !gtk_widget_get_visible (priv->key_password)) {
+                       gtk_widget_hide (priv->show_password);
+               }
+       }
+}
+
+static void
+init (NMACertChooser *cert_chooser)
+{
+       NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+
+       gtk_grid_insert_column (GTK_GRID (cert_chooser), 2);
+       gtk_grid_set_row_spacing (GTK_GRID (cert_chooser), 6);
+       gtk_grid_set_column_spacing (GTK_GRID (cert_chooser), 6);
+
+       /* Show password */
+       gtk_grid_insert_row (GTK_GRID (cert_chooser), 0);
+       priv->show_password = gtk_check_button_new_with_mnemonic _("Sho_w passwords");
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->show_password, 1, 2, 1, 1);
+       gtk_widget_show (priv->show_password);
+       gtk_widget_set_no_show_all (priv->show_password, TRUE);
+       g_signal_connect (priv->show_password, "toggled",
+                         G_CALLBACK (show_toggled_cb), cert_chooser);
+
+       /* The key chooser */
+       gtk_grid_insert_row (GTK_GRID (cert_chooser), 0);
+
+       priv->key_button = nma_cert_chooser_button_new (NMA_CERT_CHOOSER_BUTTON_FLAG_KEY);
+
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_button, 1, 0, 1, 1);
+       gtk_widget_set_hexpand (priv->key_button, TRUE);
+       gtk_widget_set_sensitive (priv->key_button, FALSE);
+       gtk_widget_show (priv->key_button);
+       gtk_widget_set_no_show_all (priv->key_button, TRUE);
+
+        g_signal_connect (priv->key_button, "changed",
+                         G_CALLBACK (key_changed_cb), cert_chooser);
+
+       priv->key_button_label = gtk_label_new (NULL);
+       g_object_set (priv->key_button_label, "xalign", (gfloat) 1, NULL);
+       gtk_label_set_mnemonic_widget (GTK_LABEL (priv->key_button_label), priv->key_button);
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_button_label, 0, 0, 1, 1);
+       gtk_widget_set_sensitive (priv->key_button_label, FALSE);
+       gtk_widget_show (priv->key_button_label);
+       gtk_widget_set_no_show_all (priv->key_button_label, TRUE);
+
+       /* The key password entry */
+       gtk_grid_insert_row (GTK_GRID (cert_chooser), 1);
+
+       priv->key_password = gtk_entry_new ();
+       gtk_entry_set_visibility (GTK_ENTRY (priv->key_password), FALSE);
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_password, 1, 1, 1, 1);
+       gtk_widget_set_hexpand (priv->key_password, TRUE);
+       gtk_widget_set_sensitive (priv->key_password, FALSE);
+       gtk_widget_show (priv->key_password);
+       gtk_widget_set_no_show_all (priv->key_password, TRUE);
+
+       g_signal_connect (priv->key_password, "changed",
+                         G_CALLBACK (key_password_changed_cb), cert_chooser);
+
+       priv->key_password_label = gtk_label_new (NULL);
+       g_object_set (priv->key_password_label, "xalign", (gfloat) 1, NULL);
+       gtk_label_set_mnemonic_widget (GTK_LABEL (priv->key_password_label), priv->key_password);
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_password_label, 0, 1, 1, 1);
+       gtk_widget_set_sensitive (priv->key_password_label, FALSE);
+       gtk_widget_show (priv->key_password_label);
+       gtk_widget_set_no_show_all (priv->key_password_label, TRUE);
+
+       /* The certificate chooser */
+       gtk_grid_insert_row (GTK_GRID (cert_chooser), 0);
+
+       priv->cert_button = nma_cert_chooser_button_new (NMA_CERT_CHOOSER_BUTTON_FLAG_NONE);
+
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_button, 1, 0, 1, 1);
+       gtk_widget_set_hexpand (priv->cert_button, TRUE);
+       gtk_widget_show (priv->cert_button);
+       gtk_widget_set_no_show_all (priv->cert_button, TRUE);
+
+       g_signal_connect (priv->cert_button, "changed",
+                         G_CALLBACK (cert_changed_cb), cert_chooser);
+
+       priv->cert_button_label = gtk_label_new (NULL);
+       g_object_set (priv->cert_button_label, "xalign", (gfloat) 1, NULL);
+       gtk_label_set_mnemonic_widget (GTK_LABEL (priv->cert_button_label), priv->cert_button);
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_button_label, 0, 0, 1, 1);
+       gtk_widget_show (priv->cert_button_label);
+       gtk_widget_set_no_show_all (priv->cert_button_label, TRUE);
+
+       /* The cert password entry */
+       gtk_grid_insert_row (GTK_GRID (cert_chooser), 1);
+
+       priv->cert_password = gtk_entry_new ();
+       gtk_entry_set_visibility (GTK_ENTRY (priv->cert_password), FALSE);
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_password, 1, 1, 1, 1);
+       gtk_widget_set_hexpand (priv->cert_password, TRUE);
+       gtk_widget_set_sensitive (priv->cert_password, FALSE);
+       gtk_widget_show (priv->cert_password);
+       gtk_widget_set_no_show_all (priv->cert_password, TRUE);
+
+       g_signal_connect (priv->cert_password, "changed",
+                         G_CALLBACK (cert_password_changed_cb), cert_chooser);
+
+       priv->cert_password_label = gtk_label_new (NULL);
+       g_object_set (priv->cert_password_label, "xalign", (gfloat) 1, NULL);
+       gtk_label_set_mnemonic_widget (GTK_LABEL (priv->cert_password_label), priv->cert_password);
+       gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_password_label, 0, 1, 1, 1);
+       gtk_widget_set_sensitive (priv->cert_password_label, FALSE);
+       gtk_widget_show (priv->cert_password_label);
+       gtk_widget_set_no_show_all (priv->cert_password_label, TRUE);
+}
+
+const NMACertChooserVtable nma_cert_chooser_vtable_pkcs11 = {
+       .init = init,
+
+       .set_title = set_title,
+       .set_flags = set_flags,
+       .set_cert_uri = set_cert_uri,
+       .get_cert_uri = get_cert_uri,
+
+       .set_cert_password = set_cert_password,
+       .get_cert_password = get_cert_password,
+       .set_key_uri = set_key_uri,
+       .get_key_uri = get_key_uri,
+       .set_key_password = set_key_password,
+       .get_key_password = get_key_password,
+
+       .add_to_size_group = add_to_size_group,
+       .validate = validate,
+
+       .setup_key_password_storage = setup_key_password_storage,
+       .update_key_password_storage = update_key_password_storage,
+       .get_key_password_flags = get_key_password_flags,
+       .setup_cert_password_storage = setup_cert_password_storage,
+       .update_cert_password_storage = update_cert_password_storage,
+       .get_cert_password_flags = get_cert_password_flags,
+};
diff --git a/src/libnma/nma-pkcs11-token-login-dialog.c b/src/libnma/nma-pkcs11-token-login-dialog.c
new file mode 100644
index 00000000..f141ce74
--- /dev/null
+++ b/src/libnma/nma-pkcs11-token-login-dialog.c
@@ -0,0 +1,236 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * Copyright (C) 2016,2017 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+#include "nma-pkcs11-token-login-dialog.h"
+
+#include <gck/gck.h>
+
+/**
+ * SECTION:nma-pkcs11-token-login-dialog
+ * @title: NMAPkcs11TokenLoginDialog
+ * @short_description: The PKCS\#11 PIN Dialog
+ * @see_also: #GcrObjectChooserDialog
+ *
+ * #NMAPkcs11TokenLoginDialog asks for the PKCS\#11 login PIN.
+ * It enforces the PIN constrains (maximum & minimum length).
+ *
+ * Used by the #GcrObjectChooserDialog when the #GcrTokensSidebar indicates
+ * that the user requested the token to be logged in.
+ */
+
+struct _NMAPkcs11TokenLoginDialogPrivate
+{
+       GckSlot *slot;
+       GckTokenInfo *info;
+
+       GtkEntry *pin_entry;
+       GtkCheckButton *remember;
+};
+
+G_DEFINE_TYPE_WITH_CODE (NMAPkcs11TokenLoginDialog, nma_pkcs11_token_login_dialog, GTK_TYPE_DIALOG,
+                         G_ADD_PRIVATE (NMAPkcs11TokenLoginDialog));
+
+enum
+{
+       PROP_0,
+       PROP_TOKEN_SLOT,
+};
+
+/**
+ * nma_pkcs11_token_login_dialog_get_pin_value:
+ * @self: The #NMAPkcs11TokenLoginDialog
+ *
+ * Returns: the entered PIN
+ */
+
+const guchar *
+nma_pkcs11_token_login_dialog_get_pin_value (NMAPkcs11TokenLoginDialog *self)
+{
+       NMAPkcs11TokenLoginDialogPrivate *priv = self->priv;
+       GtkEntryBuffer *buffer = gtk_entry_get_buffer (priv->pin_entry);
+
+       return (guchar *) gtk_entry_buffer_get_text (buffer);
+}
+
+/**
+ * nma_pkcs11_token_login_dialog_get_pin_length:
+ * @self: The #NMAPkcs11TokenLoginDialog
+ *
+ * Returns: the PIN length
+ */
+
+gulong
+nma_pkcs11_token_login_dialog_get_pin_length (NMAPkcs11TokenLoginDialog *self)
+{
+       NMAPkcs11TokenLoginDialogPrivate *priv = self->priv;
+       GtkEntryBuffer *buffer = gtk_entry_get_buffer (priv->pin_entry);
+
+       return gtk_entry_buffer_get_bytes (buffer);
+}
+
+/**
+ * nma_pkcs11_token_login_dialog_get_remember_pin:
+ * @self: The #NMAPkcs11TokenLoginDialog
+ *
+ * Returns: %TRUE if the "Remember PIN" checkbox was checked
+ */
+
+gboolean
+nma_pkcs11_token_login_dialog_get_remember_pin (NMAPkcs11TokenLoginDialog *self)
+{
+       NMAPkcs11TokenLoginDialogPrivate *priv = self->priv;
+
+       return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->remember));
+}
+
+static void
+get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+       NMAPkcs11TokenLoginDialog *self = NMA_PKCS11_TOKEN_LOGIN_DIALOG (object);
+       NMAPkcs11TokenLoginDialogPrivate *priv = self->priv;
+
+       switch (prop_id) {
+       case PROP_TOKEN_SLOT:
+               if (priv->slot)
+                       g_value_set_object (value, priv->slot);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       }
+}
+
+static gboolean
+can_activate (NMAPkcs11TokenLoginDialog *self)
+{
+       NMAPkcs11TokenLoginDialogPrivate *priv = self->priv;
+       GtkEntryBuffer *buffer = gtk_entry_get_buffer (priv->pin_entry);
+       guint len = gtk_entry_buffer_get_length (buffer);
+
+       return len <= priv->info->max_pin_len && len >= priv->info->min_pin_len;
+}
+
+static void
+set_slot (NMAPkcs11TokenLoginDialog *self, GckSlot *slot)
+{
+       NMAPkcs11TokenLoginDialogPrivate *priv = self->priv;
+       gchar *title;
+
+       g_clear_object (&priv->slot);
+       if (priv->info)
+               gck_token_info_free (priv->info);
+
+       priv->slot = slot;
+       priv->info = gck_slot_get_token_info (slot);
+       g_return_if_fail (priv->info);
+
+       title = g_strdup_printf (_("Enter %s PIN"), priv->info->label);
+       gtk_window_set_title (GTK_WINDOW (self), title);
+       g_free (title);
+
+       gtk_entry_set_max_length (priv->pin_entry, priv->info->max_pin_len);
+       gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_ACCEPT,
+                                          can_activate (self));
+}
+
+
+static void
+set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+       NMAPkcs11TokenLoginDialog *self = NMA_PKCS11_TOKEN_LOGIN_DIALOG (object);
+
+       switch (prop_id) {
+       case PROP_TOKEN_SLOT:
+               set_slot (self, g_value_dup_object (value));
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       }
+}
+
+static void
+finalize (GObject *object)
+{
+       NMAPkcs11TokenLoginDialog *self = NMA_PKCS11_TOKEN_LOGIN_DIALOG (object);
+       NMAPkcs11TokenLoginDialogPrivate *priv = self->priv;
+
+       g_clear_object (&priv->slot);
+       if (priv->info) {
+               gck_token_info_free (priv->info);
+               priv->info = NULL;
+       }
+
+       G_OBJECT_CLASS (nma_pkcs11_token_login_dialog_parent_class)->finalize (object);
+}
+
+static void
+pin_changed (GtkEditable *editable, gpointer user_data)
+{
+       gtk_dialog_set_response_sensitive (GTK_DIALOG (user_data), GTK_RESPONSE_ACCEPT,
+                                          can_activate (NMA_PKCS11_TOKEN_LOGIN_DIALOG (user_data)));
+}
+
+
+static void
+pin_activate (GtkEditable *editable, gpointer user_data)
+{
+       if (can_activate (NMA_PKCS11_TOKEN_LOGIN_DIALOG (user_data)))
+               gtk_dialog_response (GTK_DIALOG (user_data), GTK_RESPONSE_ACCEPT);
+}
+
+static void
+nma_pkcs11_token_login_dialog_class_init (NMAPkcs11TokenLoginDialogClass *klass)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (klass);
+       GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+       object_class->get_property = get_property;
+       object_class->set_property = set_property;
+       object_class->finalize = finalize;
+
+       /**
+        * NMAPkcs11TokenLoginDialog::token-slot:
+        *
+        * Slot that contains the pin for which the dialog requests
+        * the PIN.
+        */
+       g_object_class_install_property (object_class, PROP_TOKEN_SLOT,
+               g_param_spec_object ("token-slot", "Slot", "Slot containing the Token",
+                                    GCK_TYPE_SLOT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+       gtk_widget_class_set_template_from_resource (widget_class, 
"/org/freedesktop/network-manager-applet/nma-pkcs11-token-login-dialog.ui");
+       gtk_widget_class_bind_template_child_private (widget_class, NMAPkcs11TokenLoginDialog, pin_entry);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAPkcs11TokenLoginDialog, remember);
+       gtk_widget_class_bind_template_callback (widget_class, pin_changed);
+       gtk_widget_class_bind_template_callback (widget_class, pin_activate);
+}
+
+static void
+nma_pkcs11_token_login_dialog_init (NMAPkcs11TokenLoginDialog *self)
+{
+       self->priv = nma_pkcs11_token_login_dialog_get_instance_private (self);
+
+       gtk_widget_init_template (GTK_WIDGET (self));
+}
+
+/**
+ * nma_pkcs11_token_login_dialog_new:
+ * @slot: Slot that contains the pin for which the dialog requests the PIN
+ *
+ * Creates the new PKCS\#11 login dialog.
+ *
+ * Returns: the newly created #NMAPkcs11TokenLoginDialog
+ */
+GtkWidget *
+nma_pkcs11_token_login_dialog_new (GckSlot *slot)
+{
+       return GTK_WIDGET (g_object_new (NMA_TYPE_PKCS11_TOKEN_LOGIN_DIALOG,
+                          "use-header-bar", TRUE,
+                          "token-slot", slot,
+                          NULL));
+}
diff --git a/src/libnma/nma-pkcs11-token-login-dialog.h b/src/libnma/nma-pkcs11-token-login-dialog.h
new file mode 100644
index 00000000..fd8e602c
--- /dev/null
+++ b/src/libnma/nma-pkcs11-token-login-dialog.h
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * Copyright (C) 2017 Red Hat, Inc.
+ */
+
+#ifndef __NMA_PKCS11_TOKEN_LOGIN_DIALOG_H__
+#define __NMA_PKCS11_TOKEN_LOGIN_DIALOG_H__
+
+#include <gtk/gtk.h>
+#include <gck/gck.h>
+
+typedef struct _NMAPkcs11TokenLoginDialogPrivate NMAPkcs11TokenLoginDialogPrivate;
+
+typedef struct {
+        GtkDialog parent;
+        NMAPkcs11TokenLoginDialogPrivate *priv;
+} NMAPkcs11TokenLoginDialog;
+
+typedef struct {
+        GtkDialog parent;
+} NMAPkcs11TokenLoginDialogClass;
+
+#define NMA_TYPE_PKCS11_TOKEN_LOGIN_DIALOG            (nma_pkcs11_token_login_dialog_get_type ())
+#define NMA_PKCS11_TOKEN_LOGIN_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
NMA_TYPE_PKCS11_TOKEN_LOGIN_DIALOG, NMAPkcs11TokenLoginDialog))
+#define NMA_PKCS11_TOKEN_LOGIN_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), 
NMA_TYPE_PKCS11_TOKEN_LOGIN_DIALOG, NMAPkcs11TokenLoginDialogClass))
+#define NMA_IS_PKCS11_TOKEN_LOGIN_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
NMA_TYPE_PKCS11_TOKEN_LOGIN_DIALOG))
+#define NMA_IS_PKCS11_TOKEN_LOGIN_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), 
NMA_TYPE_PKCS11_TOKEN_LOGIN_DIALOG))
+#define NMA_PKCS11_TOKEN_LOGIN_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
NMA_TYPE_PKCS11_TOKEN_LOGIN_DIALOG, NMAPkcs11TokenLoginDialogClass))
+
+GType nma_pkcs11_token_login_dialog_get_type (void);
+
+GtkWidget *nma_pkcs11_token_login_dialog_new (GckSlot *slot);
+
+const guchar *nma_pkcs11_token_login_dialog_get_pin_value (NMAPkcs11TokenLoginDialog *self);
+
+gulong nma_pkcs11_token_login_dialog_get_pin_length (NMAPkcs11TokenLoginDialog *self);
+
+gboolean nma_pkcs11_token_login_dialog_get_remember_pin (NMAPkcs11TokenLoginDialog *self);
+
+#endif /* __NMA_PKCS11_TOKEN_LOGIN_DIALOG_H__ */
diff --git a/src/libnma/nma-pkcs11-token-login-dialog.ui b/src/libnma/nma-pkcs11-token-login-dialog.ui
new file mode 100644
index 00000000..147596b1
--- /dev/null
+++ b/src/libnma/nma-pkcs11-token-login-dialog.ui
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="nm-applet">
+  <requires lib="gtk+" version="3.10"/>
+  <template class="NMAPkcs11TokenLoginDialog" parent="GtkDialog">
+    <property name="can_focus">False</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="login">
+                <property name="label" translatable="yes">_Login</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_start">12</property>
+            <property name="margin_end">12</property>
+            <property name="margin_top">12</property>
+            <property name="margin_bottom">12</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkEntry" id="pin_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
+                <property name="input_purpose">password</property>
+                <signal name="activate" handler="pin_activate" swapped="no"/>
+                <signal name="changed" handler="pin_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">6</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="remember">
+                <property name="label" translatable="yes">_Remember PIN</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="halign">start</property>
+                <property name="use_underline">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">6</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">cancel</action-widget>
+      <action-widget response="-3">login</action-widget>
+    </action-widgets>
+  </template>
+</interface>
diff --git a/src/libnma/nma-private.h b/src/libnma/nma-private.h
new file mode 100644
index 00000000..8470fbf3
--- /dev/null
+++ b/src/libnma/nma-private.h
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * Copyright (C) 2019 Red Hat, Inc.
+ */
+
+#ifndef NMA_PRIVATE_H
+
+#if !GTK_CHECK_VERSION(3,96,0)
+#define gtk_editable_set_text(editable,text)             gtk_entry_set_text(GTK_ENTRY(editable), (text))
+#define gtk_editable_get_text(editable)                  gtk_entry_get_text(GTK_ENTRY(editable))
+#define gtk_editable_set_width_chars(editable, n_chars)  gtk_entry_set_width_chars(GTK_ENTRY(editable), 
(n_chars))
+#endif
+
+void nma_gtk_widget_activate_default (GtkWidget *widget);
+
+#define NMA_PRIVATE_H
+
+#endif /* NMA_PRIVATE_H */
diff --git a/src/libnma/nma-ui-utils.c b/src/libnma/nma-ui-utils.c
new file mode 100644
index 00000000..d36638ad
--- /dev/null
+++ b/src/libnma/nma-ui-utils.c
@@ -0,0 +1,432 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2015 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+#include "nma-private.h"
+
+#include <string.h>
+
+#include "nma-ui-utils.h"
+
+/*---------------------------------------------------------------------------*/
+/* Password storage icon */
+
+#define PASSWORD_STORAGE_MENU_TAG  "password-storage-menu"
+#define MENU_WITH_NOT_REQUIRED_TAG "menu-with-not-required"
+#define ASK_MODE_TAG               "ask-mode"
+
+typedef enum {
+       ITEM_STORAGE_USER    = 0,
+       ITEM_STORAGE_SYSTEM  = 1,
+       ITEM_STORAGE_ASK     = 2,
+       ITEM_STORAGE_UNUSED  = 3,
+       __ITEM_STORAGE_MAX,
+       ITEM_STORAGE_MAX = __ITEM_STORAGE_MAX - 1,
+} MenuItem;
+
+static const char *icon_name_table[ITEM_STORAGE_MAX + 1] = {
+       [ITEM_STORAGE_USER]    = "user-info-symbolic",
+       [ITEM_STORAGE_SYSTEM]  = "system-users-symbolic",
+       [ITEM_STORAGE_ASK]     = "dialog-question-symbolic",
+       [ITEM_STORAGE_UNUSED]  = "edit-clear-all-symbolic",
+};
+static const char *icon_desc_table[ITEM_STORAGE_MAX + 1] = {
+       [ITEM_STORAGE_USER]    = N_("Store the password only for this user"),
+       [ITEM_STORAGE_SYSTEM]  = N_("Store the password for all users"),
+       [ITEM_STORAGE_ASK]     = N_("Ask for this password every time"),
+       [ITEM_STORAGE_UNUSED]  = N_("The password is not required"),
+};
+
+static void
+g_free_str0 (gpointer mem)
+{
+       /* g_free a char pointer and set it to 0 before (for passwords). */
+       if (mem) {
+               char *p = mem;
+               memset (p, 0, strlen (p));
+               g_free (p);
+       }
+}
+
+static void
+change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item)
+{
+       const char *old_pwd;
+       gboolean ask_mode;
+
+       g_return_if_fail (item >= 0 && item <= ITEM_STORAGE_MAX);
+
+       gtk_entry_set_icon_from_icon_name (GTK_ENTRY (passwd_entry),
+                                          GTK_ENTRY_ICON_SECONDARY,
+                                          icon_name_table[item]);
+       gtk_entry_set_icon_tooltip_text (GTK_ENTRY (passwd_entry),
+                                        GTK_ENTRY_ICON_SECONDARY,
+                                        _(icon_desc_table[item]));
+
+       /* We want to make entry insensitive when ITEM_STORAGE_ASK is selected
+        * Unfortunately, making GtkEntry insensitive will also make the icon
+        * insensitive, which prevents user from reverting the action.
+        * Let's workaround that by disabling focus for entry instead of
+        * sensitivity change.
+       */
+       ask_mode = !!g_object_get_data (G_OBJECT (passwd_entry), ASK_MODE_TAG);
+       if (   (item == ITEM_STORAGE_ASK && !ask_mode)
+           || item == ITEM_STORAGE_UNUSED) {
+               /* Store the old password */
+               old_pwd = gtk_editable_get_text (GTK_EDITABLE (passwd_entry));
+               if (old_pwd && *old_pwd)
+                       g_object_set_data_full (G_OBJECT (passwd_entry), "password-old",
+                                               g_strdup (old_pwd), g_free_str0);
+               gtk_editable_set_text (GTK_EDITABLE (passwd_entry), "");
+
+               if (gtk_widget_is_focus (passwd_entry))
+                       gtk_widget_child_focus ((gtk_widget_get_toplevel (passwd_entry)), 
GTK_DIR_TAB_BACKWARD);
+               gtk_widget_set_can_focus (passwd_entry, FALSE);
+       } else {
+               /* Set the old password to the entry */
+               old_pwd = g_object_get_data (G_OBJECT (passwd_entry), "password-old");
+               if (old_pwd && *old_pwd)
+                       gtk_editable_set_text (GTK_EDITABLE (passwd_entry), old_pwd);
+               g_object_set_data (G_OBJECT (passwd_entry), "password-old", NULL);
+
+               if (!gtk_widget_get_can_focus (passwd_entry)) {
+                       gtk_widget_set_can_focus (passwd_entry, TRUE);
+                       gtk_widget_grab_focus (passwd_entry);
+               }
+       }
+}
+
+static MenuItem
+secret_flags_to_menu_item (NMSettingSecretFlags flags, gboolean with_not_required)
+{
+       MenuItem idx;
+
+       if (flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)
+               idx = ITEM_STORAGE_ASK;
+       else if (with_not_required && (flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED))
+               idx = ITEM_STORAGE_UNUSED;
+       else if (flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED)
+               idx = ITEM_STORAGE_USER;
+       else
+               idx = ITEM_STORAGE_SYSTEM;
+
+       return idx;
+}
+
+static NMSettingSecretFlags
+menu_item_to_secret_flags (MenuItem item)
+{
+       NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
+
+       switch (item) {
+       case ITEM_STORAGE_USER:
+               flags |= NM_SETTING_SECRET_FLAG_AGENT_OWNED;
+               break;
+       case ITEM_STORAGE_ASK:
+               flags |= NM_SETTING_SECRET_FLAG_NOT_SAVED;
+               break;
+       case ITEM_STORAGE_UNUSED:
+               flags |= NM_SETTING_SECRET_FLAG_NOT_REQUIRED;
+               break;
+       case ITEM_STORAGE_SYSTEM:
+       default:
+               break;
+       }
+       return flags;
+}
+
+typedef struct {
+       NMSetting *setting;
+       char *password_flags_name;
+       MenuItem item_number;
+       GtkWidget *passwd_entry;
+} PopupMenuItemInfo;
+
+static void
+popup_menu_item_info_destroy (gpointer data, GClosure *closure)
+{
+       PopupMenuItemInfo *info = (PopupMenuItemInfo *) data;
+
+       if (info->setting)
+               g_object_unref (info->setting);
+       g_clear_pointer (&info->password_flags_name, g_free);
+       if (info->passwd_entry)
+               g_object_remove_weak_pointer (G_OBJECT (info->passwd_entry), (gpointer *) 
&info->passwd_entry);
+       g_slice_free (PopupMenuItemInfo, info);
+}
+
+static void
+activate_menu_item_cb (GtkMenuItem *menuitem, gpointer user_data)
+{
+       PopupMenuItemInfo *info = (PopupMenuItemInfo *) user_data;
+       NMSettingSecretFlags flags;
+
+       /* Update password flags according to the password-storage popup menu */
+       if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem))) {
+               flags = menu_item_to_secret_flags (info->item_number);
+
+               /* Update the secret flags in the setting */
+               if (info->setting)
+                       nm_setting_set_secret_flags (info->setting, info->password_flags_name,
+                                                    flags, NULL);
+
+               /* Change icon */
+               if (info->passwd_entry) {
+                       change_password_storage_icon (info->passwd_entry, info->item_number);
+
+                       /* Emit "changed" signal on the entry */
+                       g_signal_emit_by_name (G_OBJECT (info->passwd_entry), "changed");
+               }
+       }
+}
+
+static void
+popup_menu_item_info_register (GtkWidget *item,
+                               NMSetting *setting,
+                               const char *password_flags_name,
+                               MenuItem item_number,
+                               GtkWidget *passwd_entry)
+{
+       PopupMenuItemInfo *info;
+
+       info = g_slice_new0 (PopupMenuItemInfo);
+       info->setting = setting ? g_object_ref (setting) : NULL;
+       info->password_flags_name = g_strdup (password_flags_name);
+       info->item_number = item_number;
+       info->passwd_entry = passwd_entry;
+
+       if (info->passwd_entry)
+               g_object_add_weak_pointer (G_OBJECT (info->passwd_entry), (gpointer *) &info->passwd_entry);
+
+       g_signal_connect_data (item, "activate",
+                              G_CALLBACK (activate_menu_item_cb),
+                              info,
+                              (GClosureNotify) popup_menu_item_info_destroy, 0);
+}
+
+void
+nma_gtk_widget_activate_default (GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_widget_activate_default (widget);
+#else
+       gtk_window_activate_default (GTK_WINDOW (widget));
+#endif
+}
+
+static void
+icon_release_cb (GtkEntry *entry,
+                 GtkEntryIconPosition position,
+#if !GTK_CHECK_VERSION(3,90,0)
+                 GdkEventButton *event,
+#endif
+                 gpointer data)
+{
+       GtkMenu *menu = GTK_MENU (data);
+#if GTK_CHECK_VERSION(3,90,0)
+       GdkRectangle icon_area;
+#endif
+
+       if (position == GTK_ENTRY_ICON_SECONDARY) {
+#if GTK_CHECK_VERSION(3,90,0)
+               gtk_widget_show (GTK_WIDGET (data));
+               gtk_entry_get_icon_area (entry,
+                                        GTK_ENTRY_ICON_SECONDARY,
+                                        &icon_area);
+               gtk_menu_popup_at_rect (menu,
+                                       gtk_widget_get_surface (GTK_WIDGET (entry)),
+                                       &icon_area,
+                                       GDK_GRAVITY_CENTER,
+                                       GDK_GRAVITY_CENTER,
+                                       NULL);
+#else
+               gtk_widget_show_all (GTK_WIDGET (data));
+               gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
+                               event->button, event->time);
+#endif
+       }
+}
+
+/**
+ * nma_utils_setup_password_storage:
+ * @passwd_entry: password #GtkEntry which the icon is attached to
+ * @initial_flags: initial secret flags to setup password menu from
+ * @setting: #NMSetting containing the password, or NULL
+ * @password_flags_name: name of the secret flags (like psk-flags), or NULL
+ * @with_not_required: whether to include "Not required" menu item
+ * @ask_mode: %TRUE if the entry is shown in ASK mode. That means,
+ *   while prompting for a password, contrary to being inside the
+ *   editor mode.
+ *   If %TRUE, the entry should be sensivive on selected "always-ask"
+ *   icon (this is e.f. for nm-applet asking for password), otherwise
+ *   not.
+ *   If %TRUE, it shall not be possible to select a different storage,
+ *   because we only prompt for a password, we cannot change the password
+ *   location.
+ *
+ * Adds a secondary icon and creates a popup menu for password entry.
+ * The active menu item is set up according to initial_flags, or
+ * from @setting/@password_flags_name (if they are not NULL).
+ * If the @setting/@password_flags_name are not NULL, secret flags will
+ * be automatically updated in the setting when menu is changed.
+ */
+void
+nma_utils_setup_password_storage (GtkWidget *passwd_entry,
+                                  NMSettingSecretFlags initial_flags,
+                                  NMSetting *setting,
+                                  const char *password_flags_name,
+                                  gboolean with_not_required,
+                                  gboolean ask_mode)
+{
+       GtkWidget *popup_menu;
+       GtkWidget *item[4];
+       GSList *group;
+       MenuItem idx;
+       NMSettingSecretFlags secret_flags;
+
+       /* Whether entry should be sensitive if "always-ask" is active " */
+       g_object_set_data (G_OBJECT (passwd_entry), ASK_MODE_TAG, GUINT_TO_POINTER (ask_mode));
+
+       popup_menu = gtk_menu_new ();
+       g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE));
+       g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER 
(with_not_required));
+       group = NULL;
+       item[0] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[0]));
+       group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0]));
+       item[1] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[1]));
+       item[2] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[2]));
+       if (with_not_required)
+               item[3] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[3]));
+
+       gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]);
+       gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]);
+       gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[2]);
+       if (with_not_required)
+               gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[3]);
+
+       popup_menu_item_info_register (item[0], setting, password_flags_name, ITEM_STORAGE_USER, 
passwd_entry);
+       popup_menu_item_info_register (item[1], setting, password_flags_name, ITEM_STORAGE_SYSTEM, 
passwd_entry);
+       popup_menu_item_info_register (item[2], setting, password_flags_name, ITEM_STORAGE_ASK, passwd_entry);
+       if (with_not_required)
+               popup_menu_item_info_register (item[3], setting, password_flags_name, ITEM_STORAGE_UNUSED, 
passwd_entry);
+
+       g_signal_connect (passwd_entry, "icon-release", G_CALLBACK (icon_release_cb), popup_menu);
+       gtk_entry_set_icon_activatable (GTK_ENTRY (passwd_entry), GTK_ENTRY_ICON_SECONDARY,
+                                       !ask_mode);
+       gtk_menu_attach_to_widget (GTK_MENU (popup_menu), passwd_entry, NULL);
+
+       /* Initialize active item for password-storage popup menu */
+       if (setting && password_flags_name)
+               nm_setting_get_secret_flags (setting, password_flags_name, &secret_flags, NULL);
+       else
+               secret_flags = initial_flags;
+
+       idx = secret_flags_to_menu_item (secret_flags, with_not_required);
+       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item[idx]), TRUE);
+       change_password_storage_icon (passwd_entry, idx);
+}
+
+/**
+ * nma_utils_menu_to_secret_flags:
+ * @passwd_entry: password #GtkEntry which the password icon/menu is attached to
+ *
+ * Returns secret flags corresponding to the selected password storage menu
+ * in the attached icon
+ *
+ * Returns: secret flags corresponding to the active item in password menu
+ */
+NMSettingSecretFlags
+nma_utils_menu_to_secret_flags (GtkWidget *passwd_entry)
+{
+       GList *menu_list, *iter;
+       GtkWidget *menu = NULL;
+       NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
+
+       menu_list = gtk_menu_get_for_attach_widget (passwd_entry);
+       for (iter = menu_list; iter; iter = g_list_next (iter)) {
+               if (g_object_get_data (G_OBJECT (iter->data), PASSWORD_STORAGE_MENU_TAG)) {
+                       menu = iter->data;
+                       break;
+               }
+       }
+
+       /* Translate password popup menu to secret flags */
+       if (menu) {
+               MenuItem idx = 0;
+               gs_free_list GList *list = NULL;
+               int i, length;
+
+               list = gtk_container_get_children (GTK_CONTAINER (menu));
+               iter = list;
+               length = g_list_length (list);
+               for (i = 0; i < length; i++) {
+                       if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (iter->data))) {
+                               idx =  (MenuItem) i;
+                               break;
+                       }
+                       iter = g_list_next (iter);
+               }
+
+               flags = menu_item_to_secret_flags (idx);
+       }
+       return flags;
+}
+
+/**
+ * nma_utils_update_password_storage:
+ * @passwd_entry: #GtkEntry with the password
+ * @secret_flags: secret flags to set
+ * @setting: #NMSetting containing the password, or NULL
+ * @password_flags_name: name of the secret flags (like psk-flags), or NULL
+ *
+ * Updates secret flags in the password storage popup menu and also
+ * in the @setting (if @setting and @password_flags_name are not NULL).
+ *
+ */
+void
+nma_utils_update_password_storage (GtkWidget *passwd_entry,
+                                   NMSettingSecretFlags secret_flags,
+                                   NMSetting *setting,
+                                   const char *password_flags_name)
+{
+       GList *menu_list, *iter;
+       GtkWidget *menu = NULL;
+
+       /* Update secret flags (WEP_KEY_FLAGS, PSK_FLAGS, ...) in the security setting */
+       if (setting && password_flags_name)
+               nm_setting_set_secret_flags (setting, password_flags_name, secret_flags, NULL);
+
+       /* Update password-storage popup menu to reflect secret flags */
+       menu_list = gtk_menu_get_for_attach_widget (passwd_entry);
+       for (iter = menu_list; iter; iter = g_list_next (iter)) {
+               if (g_object_get_data (G_OBJECT (iter->data), PASSWORD_STORAGE_MENU_TAG)) {
+                       menu = iter->data;
+                       break;
+               }
+       }
+
+       if (menu) {
+               GtkRadioMenuItem *item;
+               MenuItem idx;
+               GSList *group;
+               gboolean with_not_required;
+               int i, last;
+
+               /* radio menu group list contains the menu items in reverse order */
+               item = (GtkRadioMenuItem *) gtk_menu_get_active (GTK_MENU (menu));
+               group = gtk_radio_menu_item_get_group (item);
+               with_not_required = !!g_object_get_data (G_OBJECT (menu), MENU_WITH_NOT_REQUIRED_TAG);
+
+               idx = secret_flags_to_menu_item (secret_flags, with_not_required);
+               last = g_slist_length (group) - idx - 1;
+               for (i = 0; i < last; i++)
+                       group = g_slist_next (group);
+
+               gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (group->data), TRUE);
+               change_password_storage_icon (passwd_entry, idx);
+       }
+}
+/*---------------------------------------------------------------------------*/
+
diff --git a/src/libnma/nma-ui-utils.h b/src/libnma/nma-ui-utils.h
new file mode 100644
index 00000000..bde5f487
--- /dev/null
+++ b/src/libnma/nma-ui-utils.h
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2015 Red Hat, Inc.
+ */
+
+#ifndef NMA_UI_UTILS_H
+#define NMA_UI_UTILS_H
+
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <NetworkManager.h>
+
+void nma_utils_setup_password_storage (GtkWidget *passwd_entry,
+                                       NMSettingSecretFlags initial_flags,
+                                       NMSetting *setting,
+                                       const char *password_flags_name,
+                                       gboolean with_not_required,
+                                       gboolean ask_mode);
+NMSettingSecretFlags nma_utils_menu_to_secret_flags (GtkWidget *passwd_entry);
+void nma_utils_update_password_storage (GtkWidget *passwd_entry,
+                                        NMSettingSecretFlags secret_flags,
+                                        NMSetting *setting,
+                                        const char *password_flags_name);
+
+#endif /* NMA_UI_UTILS_H */
+
diff --git a/src/libnma/nma-version.h.in b/src/libnma/nma-version.h.in
new file mode 100644
index 00000000..78e0f206
--- /dev/null
+++ b/src/libnma/nma-version.h.in
@@ -0,0 +1,119 @@
+// SPDX-License-Identifier: LGPL-2.1+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Copyright (C) 2011-2017 Red Hat, Inc.
+ */
+
+#ifndef NMA_VERSION_H
+#define NMA_VERSION_H
+
+#include <glib.h>
+
+/**
+ * NMA_MAJOR_VERSION:
+ *
+ * Evaluates to the major version number of NetworkManager which this source
+ * is compiled against.
+ */
+#define NMA_MAJOR_VERSION (@NMA_MAJOR_VERSION@)
+
+/**
+ * NMA_MINOR_VERSION:
+ *
+ * Evaluates to the minor version number of NetworkManager which this source
+ * is compiled against.
+ */
+#define NMA_MINOR_VERSION (@NMA_MINOR_VERSION@)
+
+/**
+ * NMA_MICRO_VERSION:
+ *
+ * Evaluates to the micro version number of NetworkManager which this source
+ * compiled against.
+ */
+#define NMA_MICRO_VERSION (@NMA_MICRO_VERSION@)
+
+/**
+ * NMA_CHECK_VERSION:
+ * @major: major version (e.g. 1 for version 1.2.5)
+ * @minor: minor version (e.g. 2 for version 1.2.5)
+ * @micro: micro version (e.g. 5 for version 1.2.5)
+ *
+ * Returns: %TRUE if the version of the NetworkManager header files
+ * is the same as or newer than the passed-in version.
+ */
+#define NMA_CHECK_VERSION(major,minor,micro)                         \
+    (NMA_MAJOR_VERSION > (major) ||                                  \
+     (NMA_MAJOR_VERSION == (major) && NMA_MINOR_VERSION > (minor)) || \
+     (NMA_MAJOR_VERSION == (major) && NMA_MINOR_VERSION == (minor) && NMA_MICRO_VERSION >= (micro)))
+
+#define NMA_ENCODE_VERSION(major,minor,micro) ((major) << 16 | (minor) << 8 | (micro))
+
+#define NMA_VERSION_1_2    (NMA_ENCODE_VERSION (1, 2, 0))
+#define NMA_VERSION_1_4    (NMA_ENCODE_VERSION (1, 4, 0))
+#define NMA_VERSION_1_8    (NMA_ENCODE_VERSION (1, 8, 0))
+#define NMA_VERSION_1_8_2  (NMA_ENCODE_VERSION (1, 8, 2))
+#define NMA_VERSION_1_8_4  (NMA_ENCODE_VERSION (1, 8, 4))
+#define NMA_VERSION_1_8_6  (NMA_ENCODE_VERSION (1, 8, 6))
+#define NMA_VERSION_1_8_8  (NMA_ENCODE_VERSION (1, 8, 8))
+#define NMA_VERSION_1_8_10 (NMA_ENCODE_VERSION (1, 8, 10))
+#define NMA_VERSION_1_8_12 (NMA_ENCODE_VERSION (1, 8, 12))
+#define NMA_VERSION_1_8_22 (NMA_ENCODE_VERSION (1, 8, 22))
+
+#define NMA_VERSION_CUR_STABLE  NMA_VERSION_1_8_10
+#define NMA_VERSION_NEXT_STABLE NMA_VERSION_1_8_22
+
+#define NMA_VERSION NMA_ENCODE_VERSION (NMA_MAJOR_VERSION, NMA_MINOR_VERSION, NMA_MICRO_VERSION)
+
+/* Deprecation / Availability macros */
+
+#if !defined (NMA_VERSION_MIN_REQUIRED) || (NMA_VERSION_MIN_REQUIRED == 0)
+# undef NMA_VERSION_MIN_REQUIRED
+# define NMA_VERSION_MIN_REQUIRED (NMA_VERSION_CUR_STABLE)
+#endif
+
+#if !defined (NMA_VERSION_MAX_ALLOWED) || (NMA_VERSION_MAX_ALLOWED == 0)
+# undef NMA_VERSION_MAX_ALLOWED
+# define NMA_VERSION_MAX_ALLOWED (NMA_VERSION_NEXT_STABLE)
+#endif
+
+/* sanity checks */
+#if NMA_VERSION_MIN_REQUIRED > NMA_VERSION_NEXT_STABLE
+#error "NMA_VERSION_MIN_REQUIRED must be <= NMA_VERSION_NEXT_STABLE"
+#endif
+#if NMA_VERSION_MAX_ALLOWED < NMA_VERSION_MIN_REQUIRED
+#error "NMA_VERSION_MAX_ALLOWED must be >= NMA_VERSION_MIN_REQUIRED"
+#endif
+#if NMA_VERSION_MIN_REQUIRED < NMA_VERSION_1_2
+#error "NMA_VERSION_MIN_REQUIRED must be >= NMA_VERSION_1_2"
+#endif
+
+#if NMA_VERSION_MIN_REQUIRED >= NMA_VERSION_1_2
+# define NMA_DEPRECATED_IN_1_2           G_DEPRECATED
+# define NMA_DEPRECATED_IN_1_2_FOR(f)    G_DEPRECATED_FOR(f)
+#else
+# define NMA_DEPRECATED_IN_1_2
+# define NMA_DEPRECATED_IN_1_2_FOR(f)
+#endif
+
+#if NMA_VERSION_MIN_REQUIRED >= NMA_VERSION_1_8
+# define NMA_DEPRECATED_IN_1_8           G_DEPRECATED
+# define NMA_DEPRECATED_IN_1_8_FOR(f)    G_DEPRECATED_FOR(f)
+#else
+# define NMA_DEPRECATED_IN_1_8
+# define NMA_DEPRECATED_IN_1_8_FOR(f)
+#endif
+
+#if NMA_VERSION_MAX_ALLOWED < NMA_VERSION_1_8
+# define NMA_AVAILABLE_IN_1_8            G_UNAVAILABLE(1,8)
+#else
+# define NMA_AVAILABLE_IN_1_8
+#endif
+
+#if NMA_VERSION_MAX_ALLOWED < NMA_VERSION_1_8_22
+# define NMA_AVAILABLE_IN_1_8_22            G_UNAVAILABLE(1.8,22)
+#else
+# define NMA_AVAILABLE_IN_1_8_22
+#endif
+
+#endif  /* NMA_VERSION_H */
diff --git a/src/libnma/nma-vpn-password-dialog.c b/src/libnma/nma-vpn-password-dialog.c
new file mode 100644
index 00000000..adc67971
--- /dev/null
+++ b/src/libnma/nma-vpn-password-dialog.c
@@ -0,0 +1,351 @@
+/* nma-vpn-password-dialog.c - A password prompting dialog widget.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the ree Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * Copyright (C) 1999, 2000 Eazel, Inc.
+ * Copyright (C) 2011 - 2018 Red Hat, Inc.
+ *
+ * Authors: Ramiro Estrugo <ramiro eazel com>
+ *          Dan Williams <dcbw redhat com>
+ *          Lubomir Rintel <lkundrak v3 sk>
+ */
+
+#include "nm-default.h"
+#include "nma-private.h"
+#include "nma-vpn-password-dialog.h"
+
+typedef struct {
+       GtkWidget *message_label;
+       GtkWidget *password_label;
+       GtkWidget *password_label_secondary;
+       GtkWidget *password_label_tertiary;
+       GtkWidget *password_entry;
+       GtkWidget *password_entry_secondary;
+       GtkWidget *password_entry_tertiary;
+       GtkWidget *show_passwords_checkbox;
+} NMAVpnPasswordDialogPrivate;
+
+G_DEFINE_TYPE_WITH_CODE (NMAVpnPasswordDialog, nma_vpn_password_dialog, GTK_TYPE_DIALOG,
+                         G_ADD_PRIVATE (NMAVpnPasswordDialog))
+
+
+#define NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+                                                NMA_VPN_TYPE_PASSWORD_DIALOG, \
+                                                NMAVpnPasswordDialogPrivate))
+
+/* NMAVpnPasswordDialogClass methods */
+static void nma_vpn_password_dialog_class_init (NMAVpnPasswordDialogClass *password_dialog_class);
+static void nma_vpn_password_dialog_init       (NMAVpnPasswordDialog      *password_dialog);
+
+/* GtkDialog callbacks */
+static void dialog_show_callback (GtkWidget *widget, gpointer callback_data);
+static void dialog_close_callback (GtkWidget *widget, gpointer callback_data);
+
+static void
+show_passwords_toggled_cb (GtkWidget *widget, gpointer user_data)
+{
+       NMAVpnPasswordDialog *dialog = NMA_VPN_PASSWORD_DIALOG (user_data);
+       NMAVpnPasswordDialogPrivate *priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       gboolean visible;
+
+       visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+
+       gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry), visible);
+       gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry_secondary), visible);
+       gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry_tertiary), visible);
+}
+
+static void
+nma_vpn_password_dialog_class_init (NMAVpnPasswordDialogClass *klass)
+{
+       GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+       g_type_ensure (NM_TYPE_DEVICE);
+       gtk_widget_class_set_template_from_resource (widget_class,
+                                                    
"/org/freedesktop/network-manager-applet/nma-vpn-password-dialog.ui");
+
+       gtk_widget_class_bind_template_child_private (widget_class, NMAVpnPasswordDialog, message_label);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAVpnPasswordDialog, password_label);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAVpnPasswordDialog, 
password_label_secondary);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAVpnPasswordDialog, 
password_label_tertiary);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAVpnPasswordDialog, password_entry);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAVpnPasswordDialog, 
password_entry_secondary);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAVpnPasswordDialog, 
password_entry_tertiary);
+       gtk_widget_class_bind_template_child_private (widget_class, NMAVpnPasswordDialog, 
show_passwords_checkbox);
+
+       gtk_widget_class_bind_template_callback (widget_class, dialog_close_callback);
+       gtk_widget_class_bind_template_callback (widget_class, dialog_show_callback);
+       gtk_widget_class_bind_template_callback (widget_class, nma_gtk_widget_activate_default);
+       gtk_widget_class_bind_template_callback (widget_class, show_passwords_toggled_cb);
+}
+
+static void
+nma_vpn_password_dialog_init (NMAVpnPasswordDialog *dialog)
+{
+       gtk_widget_init_template (GTK_WIDGET (dialog));
+}
+
+/* GtkDialog callbacks */
+static void
+dialog_show_callback (GtkWidget *widget, gpointer callback_data)
+{
+       NMAVpnPasswordDialog *dialog = NMA_VPN_PASSWORD_DIALOG (callback_data);
+       NMAVpnPasswordDialogPrivate *priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       GtkWidget *to_focus = NULL;
+
+
+       if (   gtk_widget_get_visible (priv->password_entry)
+           && gtk_entry_get_text_length (GTK_ENTRY (priv->password_entry)) == 0)
+               to_focus = priv->password_entry;
+       else if (   gtk_widget_get_visible (priv->password_entry_secondary)
+                && gtk_entry_get_text_length (GTK_ENTRY (priv->password_entry_secondary)) == 0)
+               to_focus = priv->password_entry_secondary;
+       else if (   gtk_widget_get_visible (priv->password_entry_tertiary)
+                && gtk_entry_get_text_length (GTK_ENTRY (priv->password_entry_tertiary)) == 0)
+               to_focus = priv->password_entry_tertiary;
+
+       gtk_widget_grab_focus (to_focus ?: priv->password_entry);
+}
+
+static void
+dialog_close_callback (GtkWidget *widget, gpointer callback_data)
+{
+       gtk_widget_hide (widget);
+}
+
+/* Public NMAVpnPasswordDialog methods */
+GtkWidget *
+nma_vpn_password_dialog_new (const char *title,
+                             const char *message,
+                             const char *password)
+{
+       GtkWidget *dialog;
+       NMAVpnPasswordDialogPrivate *priv;
+
+       dialog = gtk_widget_new (NMA_VPN_TYPE_PASSWORD_DIALOG, "title", title, NULL);
+       if (!dialog)
+               return NULL;
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+
+       if (message) {
+               gtk_label_set_text (GTK_LABEL (priv->message_label), message);
+               gtk_widget_show (priv->message_label);
+       }
+
+       nma_vpn_password_dialog_set_password (NMA_VPN_PASSWORD_DIALOG (dialog), password);
+       
+       return GTK_WIDGET (dialog);
+}
+
+gboolean
+nma_vpn_password_dialog_run_and_block (NMAVpnPasswordDialog *dialog)
+{
+       gint button_clicked;
+
+       g_return_val_if_fail (dialog != NULL, FALSE);
+       g_return_val_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog), FALSE);
+
+       button_clicked = gtk_dialog_run (GTK_DIALOG (dialog));
+       gtk_widget_hide (GTK_WIDGET (dialog));
+
+       return button_clicked == GTK_RESPONSE_OK;
+}
+
+void
+nma_vpn_password_dialog_set_password (NMAVpnPasswordDialog     *dialog,
+                                      const char *password)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       gtk_editable_set_text (GTK_EDITABLE (priv->password_entry), password ? password : "");
+}
+
+void
+nma_vpn_password_dialog_set_password_secondary (NMAVpnPasswordDialog *dialog,
+                                                const char *password_secondary)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       gtk_editable_set_text (GTK_EDITABLE (priv->password_entry_secondary),
+                           password_secondary ? password_secondary : "");
+}
+
+void
+nma_vpn_password_dialog_set_password_ternary (NMAVpnPasswordDialog *dialog,
+                                              const char *password_tertiary)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       gtk_editable_set_text (GTK_EDITABLE (priv->password_entry_tertiary),
+                           password_tertiary ? password_tertiary : "");
+}
+
+void
+nma_vpn_password_dialog_set_show_password (NMAVpnPasswordDialog *dialog, gboolean show)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_if_fail (dialog != NULL);
+       g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       gtk_widget_set_visible (priv->password_label, show);
+       gtk_widget_set_visible (priv->password_entry, show);
+}
+
+void
+nma_vpn_password_dialog_set_show_password_secondary (NMAVpnPasswordDialog *dialog,
+                                                     gboolean show)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_if_fail (dialog != NULL);
+       g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       gtk_widget_set_visible (priv->password_label_secondary, show);
+       gtk_widget_set_visible (priv->password_entry_secondary, show);
+}
+
+void
+nma_vpn_password_dialog_set_show_password_ternary (NMAVpnPasswordDialog *dialog,
+                                                   gboolean show)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_if_fail (dialog != NULL);
+       g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       gtk_widget_set_visible (priv->password_label_tertiary, show);
+       gtk_widget_set_visible (priv->password_entry_tertiary, show);
+}
+
+void
+nma_vpn_password_dialog_focus_password (NMAVpnPasswordDialog *dialog)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_if_fail (dialog != NULL);
+       g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       if (gtk_widget_get_visible (priv->password_entry))
+               gtk_widget_grab_focus (priv->password_entry);
+}
+
+void
+nma_vpn_password_dialog_focus_password_secondary (NMAVpnPasswordDialog *dialog)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_if_fail (dialog != NULL);
+       g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       if (gtk_widget_get_visible (priv->password_entry_secondary))
+               gtk_widget_grab_focus (priv->password_entry_secondary);
+}
+
+void
+nma_vpn_password_dialog_focus_password_ternary (NMAVpnPasswordDialog *dialog)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_if_fail (dialog != NULL);
+       g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       if (gtk_widget_get_visible (priv->password_entry_tertiary))
+               gtk_widget_grab_focus (priv->password_entry_tertiary);
+}
+
+const char *
+nma_vpn_password_dialog_get_password (NMAVpnPasswordDialog *dialog)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_val_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog), NULL);
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       return gtk_editable_get_text (GTK_EDITABLE (priv->password_entry));
+}
+
+const char *
+nma_vpn_password_dialog_get_password_secondary (NMAVpnPasswordDialog *dialog)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_val_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog), NULL);
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       return gtk_editable_get_text (GTK_EDITABLE (priv->password_entry_secondary));
+}
+
+const char *
+nma_vpn_password_dialog_get_password_ternary (NMAVpnPasswordDialog *dialog)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_val_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog), NULL);
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+       return gtk_editable_get_text (GTK_EDITABLE (priv->password_entry_tertiary));
+}
+
+void nma_vpn_password_dialog_set_password_label (NMAVpnPasswordDialog *dialog,
+                                                 const char *label)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_if_fail (dialog != NULL);
+       g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+
+       gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->password_label), label);
+}
+
+void nma_vpn_password_dialog_set_password_secondary_label (NMAVpnPasswordDialog *dialog,
+                                                           const char *label)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_if_fail (dialog != NULL);
+       g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+
+       gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->password_label_secondary), label);
+}
+
+void
+nma_vpn_password_dialog_set_password_ternary_label (NMAVpnPasswordDialog *dialog,
+                                                    const char *label)
+{
+       NMAVpnPasswordDialogPrivate *priv;
+
+       g_return_if_fail (dialog != NULL);
+       g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
+
+       priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
+
+       gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->password_label_tertiary), label);
+}
diff --git a/src/libnma/nma-vpn-password-dialog.h b/src/libnma/nma-vpn-password-dialog.h
new file mode 100644
index 00000000..5e274222
--- /dev/null
+++ b/src/libnma/nma-vpn-password-dialog.h
@@ -0,0 +1,85 @@
+/* vpn-password-dialog.c - A use password prompting dialog widget.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the ree Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * Copyright (C) 1999, 2000 Eazel, Inc.
+ * Copyright (C) 2011, 2013 Red Hat, Inc.
+ *
+ * Authors: Ramiro Estrugo <ramiro eazel com>
+ *          Dan Williams <dcbw redhat com>
+ */
+
+#ifndef NMA_VPN_PASSWORD_DIALOG_H
+#define NMA_VPN_PASSWORD_DIALOG_H
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define NMA_VPN_TYPE_PASSWORD_DIALOG            (nma_vpn_password_dialog_get_type ())
+#define NMA_VPN_PASSWORD_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
NMA_VPN_TYPE_PASSWORD_DIALOG, NMAVpnPasswordDialog))
+#define NMA_VPN_PASSWORD_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), 
NMA_VPN_TYPE_PASSWORD_DIALOG, NMAVpnPasswordDialogClass))
+#define NMA_VPN_IS_PASSWORD_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
NMA_VPN_TYPE_PASSWORD_DIALOG))
+#define NMA_VPN_IS_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), 
NMA_VPN_TYPE_PASSWORD_DIALOG))
+
+typedef struct NMAVpnPasswordDialog        NMAVpnPasswordDialog;
+typedef struct NMAVpnPasswordDialogClass   NMAVpnPasswordDialogClass;
+
+struct NMAVpnPasswordDialog {
+       GtkDialog parent;
+};
+
+struct NMAVpnPasswordDialogClass {
+       GtkDialogClass parent_class;
+};
+
+GType      nma_vpn_password_dialog_get_type      (void);
+GtkWidget* nma_vpn_password_dialog_new           (const char *title,
+                                                  const char *message,
+                                                  const char *password);
+
+gboolean   nma_vpn_password_dialog_run_and_block (NMAVpnPasswordDialog *dialog);
+
+/* Attribute mutators */
+void nma_vpn_password_dialog_set_show_password            (NMAVpnPasswordDialog *dialog,
+                                                           gboolean              show);
+void nma_vpn_password_dialog_focus_password               (NMAVpnPasswordDialog *dialog);
+void nma_vpn_password_dialog_set_password                 (NMAVpnPasswordDialog *dialog,
+                                                           const char           *password);
+void nma_vpn_password_dialog_set_password_label           (NMAVpnPasswordDialog *dialog,
+                                                           const char           *label);
+
+void nma_vpn_password_dialog_set_show_password_secondary  (NMAVpnPasswordDialog *dialog,
+                                                           gboolean              show);
+void nma_vpn_password_dialog_focus_password_secondary     (NMAVpnPasswordDialog *dialog);
+void nma_vpn_password_dialog_set_password_secondary       (NMAVpnPasswordDialog *dialog,
+                                                           const char           *password_secondary);
+void nma_vpn_password_dialog_set_password_secondary_label (NMAVpnPasswordDialog *dialog,
+                                                           const char           *label);
+
+void nma_vpn_password_dialog_set_show_password_ternary  (NMAVpnPasswordDialog *dialog,
+                                                         gboolean              show);
+void nma_vpn_password_dialog_focus_password_ternary     (NMAVpnPasswordDialog *dialog);
+void nma_vpn_password_dialog_set_password_ternary       (NMAVpnPasswordDialog *dialog,
+                                                         const char           *password_ternary);
+void nma_vpn_password_dialog_set_password_ternary_label (NMAVpnPasswordDialog *dialog,
+                                                         const char           *label);
+
+/* Attribute accessors */
+const char *nma_vpn_password_dialog_get_password           (NMAVpnPasswordDialog *dialog);
+
+const char *nma_vpn_password_dialog_get_password_secondary (NMAVpnPasswordDialog *dialog);
+
+const char *nma_vpn_password_dialog_get_password_ternary (NMAVpnPasswordDialog *dialog);
+
+G_END_DECLS
+
+#endif /* NMA_VPN_PASSWORD_DIALOG_H */
diff --git a/src/libnma/nma-vpn-password-dialog.ui b/src/libnma/nma-vpn-password-dialog.ui
new file mode 100644
index 00000000..4774d2e4
--- /dev/null
+++ b/src/libnma/nma-vpn-password-dialog.ui
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.2 -->
+<interface domain="nm-applet">
+  <requires lib="gtk+" version="3.20"/>
+  <template class="NMAVpnPasswordDialog" parent="GtkDialog">
+    <property name="can_focus">False</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">dialog</property>
+    <signal name="close" handler="dialog_close_callback" swapped="no"/>
+    <signal name="show" handler="dialog_show_callback" swapped="no"/>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkButton" id="cancel_button">
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="valign">baseline</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="ok_button">
+                <property name="label" translatable="yes">_OK</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="valign">baseline</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_start">12</property>
+            <property name="margin_end">12</property>
+            <property name="margin_top">12</property>
+            <property name="margin_bottom">12</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
+            <child>
+              <object class="GtkCheckButton" id="show_passwords_checkbox">
+                <property name="label" translatable="yes">Sh_ow passwords</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="halign">start</property>
+                <property name="draw_indicator">True</property>
+                <signal name="toggled" handler="show_passwords_toggled_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="password_entry_tertiary">
+                <property name="visible">False</property>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
+                <property name="width_chars">20</property>
+                <signal name="activate" handler="nma_gtk_widget_activate_default" swapped="yes"/>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="password_entry_secondary">
+                <property name="visible">False</property>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
+                <property name="width_chars">20</property>
+                <signal name="activate" handler="nma_gtk_widget_activate_default" swapped="yes"/>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="password_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
+                <property name="width_chars">20</property>
+                <signal name="activate" handler="nma_gtk_widget_activate_default" swapped="yes"/>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="password_label_tertiary">
+                <property name="visible">False</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Tertiary Password:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">password_entry_tertiary</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="password_label_secondary">
+                <property name="visible">False</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Secondary Password:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">password_entry_secondary</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="password_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Password:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">password_entry</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="message_label">
+                <property name="visible">False</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</property>
+                <property name="margin_bottom">12</property>
+                <property name="hexpand">True</property>
+                <property name="wrap">True</property>
+                <property name="max_width_chars">35</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_start">6</property>
+                <property name="margin_end">12</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+                <property name="valign">start</property>
+                <property name="icon_name">dialog-password</property>
+                <property name="icon_size">6</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="height">5</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">cancel_button</action-widget>
+      <action-widget response="-5">ok_button</action-widget>
+    </action-widgets>
+    <child>
+      <placeholder/>
+    </child>
+  </template>
+</interface>
diff --git a/src/libnma/nma-wifi-dialog.c b/src/libnma/nma-wifi-dialog.c
new file mode 100644
index 00000000..2a572ccf
--- /dev/null
+++ b/src/libnma/nma-wifi-dialog.c
@@ -0,0 +1,1559 @@
+// SPDX-License-Identifier: GPL-2.0+
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Dan Williams <dcbw redhat com>
+ *
+ * Copyright 2007 - 2017 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+#include "nma-private.h"
+
+#include <string.h>
+#include <netinet/ether.h>
+
+#include <NetworkManager.h>
+
+#include "nma-wifi-dialog.h"
+#include "wireless-security.h"
+#include "eap-method.h"
+
+G_DEFINE_TYPE (NMAWifiDialog, nma_wifi_dialog, GTK_TYPE_DIALOG)
+
+#define NMA_WIFI_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+                                        NMA_TYPE_WIFI_DIALOG, \
+                                        NMAWifiDialogPrivate))
+
+typedef struct {
+       NMAWifiDialog *self;
+       NMConnection *connection;
+       gboolean canceled;
+} GetSecretsInfo;
+
+typedef struct {
+       NMClient *client;
+
+       GtkBuilder *builder;
+
+       NMConnection *specific_connection;
+       NMConnection *connection;
+       NMDevice *device;
+       NMAccessPoint *ap;
+       guint operation;
+
+       GtkTreeModel *device_model;
+       GtkTreeModel *connection_model;
+       GtkSizeGroup *group;
+       GtkWidget *sec_combo;
+       GtkWidget *ok_response_button;
+
+       gboolean network_name_focus;
+
+       gboolean secrets_only;
+
+       guint revalidate_id;
+
+       GetSecretsInfo *secrets_info;
+} NMAWifiDialogPrivate;
+
+enum {
+       OP_NONE = 0,
+       OP_CREATE_ADHOC,
+       OP_CONNECT_HIDDEN,
+};
+
+#define D_NAME_COLUMN          0
+#define D_DEV_COLUMN           1
+
+#define S_NAME_COLUMN          0
+#define S_SEC_COLUMN           1
+
+#define C_NAME_COLUMN          0
+#define C_CON_COLUMN           1
+#define C_SEP_COLUMN           2
+#define C_NEW_COLUMN           3
+
+static gboolean security_combo_init (NMAWifiDialog *self, gboolean secrets_only,
+                                     const char *secrets_setting_name,
+                                     const char *const*secrets_hints);
+static void ssid_entry_changed (GtkWidget *entry, gpointer user_data);
+
+void
+nma_wifi_dialog_set_nag_ignored (NMAWifiDialog *self, gboolean ignored)
+{
+}
+
+gboolean
+nma_wifi_dialog_get_nag_ignored (NMAWifiDialog *self)
+{
+       return TRUE;
+}
+
+static void
+size_group_clear (GtkSizeGroup *group)
+{
+       GSList *iter;
+
+       g_return_if_fail (group != NULL);
+
+       iter = gtk_size_group_get_widgets (group);
+       while (iter) {
+               gtk_size_group_remove_widget (group, GTK_WIDGET (iter->data));
+               iter = gtk_size_group_get_widgets (group);
+       }
+}
+
+static void
+_set_ok_sensitive (NMAWifiDialog *self, gboolean is_sensitive, const char *error_tooltip)
+{
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+       gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, is_sensitive);
+
+       if (priv->ok_response_button) {
+               gtk_widget_set_tooltip_text (priv->ok_response_button,
+                                            is_sensitive ? _("Click to connect") : error_tooltip);
+       }
+}
+
+static void
+size_group_add_permanent (GtkSizeGroup *group,
+                          GtkBuilder *builder)
+{
+       GtkWidget *widget;
+
+       g_return_if_fail (group != NULL);
+       g_return_if_fail (builder != NULL);
+
+       widget = GTK_WIDGET (gtk_builder_get_object (builder, "network_name_label"));
+       gtk_size_group_add_widget (group, widget);
+
+       widget = GTK_WIDGET (gtk_builder_get_object (builder, "security_combo_label"));
+       gtk_size_group_add_widget (group, widget);
+
+       widget = GTK_WIDGET (gtk_builder_get_object (builder, "device_label"));
+       gtk_size_group_add_widget (group, widget);
+}
+
+static void
+security_combo_changed (GtkWidget *combo,
+                        gpointer user_data)
+{
+       NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+       GtkWidget *vbox, *sec_widget, *def_widget;
+       GList *elt, *children;
+       GtkTreeIter iter;
+       GtkTreeModel *model;
+       WirelessSecurity *sec = NULL;
+
+       vbox = GTK_WIDGET (gtk_builder_get_object (priv->builder, "security_vbox"));
+       g_assert (vbox);
+
+       size_group_clear (priv->group);
+
+       /* Remove any previous wireless security widgets */
+       children = gtk_container_get_children (GTK_CONTAINER (vbox));
+       for (elt = children; elt; elt = g_list_next (elt))
+               gtk_container_remove (GTK_CONTAINER (vbox), GTK_WIDGET (elt->data));
+       g_list_free (children);
+
+       model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
+       if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) {
+               g_warning ("%s: no active security combo box item.", __func__);
+               return;
+       }
+
+       gtk_tree_model_get (model, &iter, S_SEC_COLUMN, &sec, -1);
+       if (!sec) {
+               /* Revalidate dialog if the user picked "None" so the OK button
+                * gets enabled if there's already a valid SSID.
+                */
+               ssid_entry_changed (NULL, self);
+               return;
+       }
+
+       sec_widget = wireless_security_get_widget (sec);
+       g_assert (sec_widget);
+       gtk_widget_unparent (sec_widget);
+
+       size_group_add_permanent (priv->group, priv->builder);
+       wireless_security_add_to_size_group (sec, priv->group);
+
+       gtk_container_add (GTK_CONTAINER (vbox), sec_widget);
+
+       /* Re-validate */
+       wireless_security_changed_cb (NULL, sec);
+
+       /* Set focus to the security method's default widget, but only if the
+        * network name entry should not be focused.
+        */
+       if (!priv->network_name_focus && sec->default_field) {
+               def_widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, sec->default_field));
+               if (def_widget)
+                       gtk_widget_grab_focus (def_widget);
+       }
+
+       wireless_security_unref (sec);
+}
+
+static void
+security_combo_changed_manually (GtkWidget *combo,
+                                 gpointer user_data)
+{
+       NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+
+       /* Flag that the combo was changed manually to allow focus to move
+        * to the security method's default widget instead of the network name.
+        */
+       priv->network_name_focus = FALSE;
+       security_combo_changed (combo, user_data);
+}
+
+static GBytes *
+validate_dialog_ssid (NMAWifiDialog *self)
+{
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+       GtkWidget *widget;
+       const char *ssid;
+       GBytes *ssid_bytes;
+
+       widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "network_name_entry"));
+
+       ssid = gtk_editable_get_text (GTK_EDITABLE (widget));
+
+       if (!ssid || strlen (ssid) == 0 || strlen (ssid) > 32)
+               return NULL;
+
+       ssid_bytes = g_bytes_new (ssid, strlen (ssid));
+       return ssid_bytes;
+}
+
+static void
+stuff_changed_cb (WirelessSecurity *sec, gpointer user_data)
+{
+       NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+       GBytes *ssid = NULL;
+       gboolean free_ssid = TRUE;
+       gboolean valid = FALSE;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+       WirelessSecurity *sel_sec = NULL;
+       gs_free_error GError *error = NULL;
+
+       model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->sec_combo));
+       if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->sec_combo), &iter))
+               gtk_tree_model_get (model, &iter, S_SEC_COLUMN, &sel_sec, -1);
+
+       if (sel_sec)
+               wireless_security_unref (sel_sec);
+
+       if (sel_sec != sec)
+               return;
+
+       if (priv->connection) {
+               NMSettingWireless *s_wireless;
+               s_wireless = nm_connection_get_setting_wireless (priv->connection);
+               g_assert (s_wireless);
+               ssid = nm_setting_wireless_get_ssid (s_wireless);
+               free_ssid = FALSE;
+       } else {
+               ssid = validate_dialog_ssid (self);
+       }
+
+       if (ssid) {
+               valid = wireless_security_validate (sec, &error);
+               if (free_ssid)
+                       g_bytes_unref (ssid);
+       }
+
+       /* But if there's an in-progress secrets call (which might require authorization)
+        * then we don't want to enable the OK button because we don't have all the
+        * connection details yet.
+        */
+       if (priv->secrets_info)
+               valid = FALSE;
+
+       _set_ok_sensitive (self, valid, error ? error->message : NULL);
+}
+
+static void
+ssid_entry_changed (GtkWidget *entry, gpointer user_data)
+{
+       NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+       GtkTreeIter iter;
+       WirelessSecurity *sec = NULL;
+       GtkTreeModel *model;
+       gboolean valid = FALSE;
+       GBytes *ssid;
+       gs_free_error GError *error = NULL;
+
+       /* If the network name entry was touched at all, allow focus to go to
+        * the default widget of the security method now.
+        */
+       priv->network_name_focus = FALSE;
+
+       ssid = validate_dialog_ssid (self);
+       if (!ssid)
+               goto out;
+
+       g_bytes_unref (ssid);
+
+       model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->sec_combo));
+       if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->sec_combo), &iter))
+               gtk_tree_model_get (model, &iter, S_SEC_COLUMN, &sec, -1);
+
+       if (sec) {
+               valid = wireless_security_validate (sec, &error);
+               wireless_security_unref (sec);
+       } else {
+               valid = TRUE;
+       }
+
+out:
+       /* But if there's an in-progress secrets call (which might require authorization)
+        * then we don't want to enable the OK button because we don't have all the
+        * connection details yet.
+        */
+       if (priv->secrets_info)
+               valid = FALSE;
+
+       _set_ok_sensitive (self, valid, error ? error->message : NULL);
+}
+
+static void
+connection_combo_changed (GtkWidget *combo,
+                          gpointer user_data)
+{
+       NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+       GtkTreeIter iter;
+       GtkTreeModel *model;
+       gboolean is_new = FALSE;
+       NMSettingWireless *s_wireless;
+       char *utf8_ssid;
+       GtkWidget *widget;
+
+       if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) {
+               g_warning ("%s: no active connection combo box item.", __func__);
+               return;
+       }
+
+       model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
+
+       if (priv->connection)
+               g_object_unref (priv->connection);
+
+       gtk_tree_model_get (model, &iter,
+                           C_CON_COLUMN, &priv->connection,
+                           C_NEW_COLUMN, &is_new, -1);
+
+       if (priv->connection)
+               eap_method_ca_cert_ignore_load (priv->connection);
+
+       if (!security_combo_init (self, priv->secrets_only, NULL, NULL)) {
+               g_warning ("Couldn't change Wi-Fi security combo box.");
+               return;
+       }
+       security_combo_changed (priv->sec_combo, self);
+
+       widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "network_name_entry"));
+       if (priv->connection) {
+               GBytes *ssid;
+
+               s_wireless = nm_connection_get_setting_wireless (priv->connection);
+               ssid = nm_setting_wireless_get_ssid (s_wireless);
+               utf8_ssid = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid));
+               gtk_editable_set_text (GTK_EDITABLE (widget), utf8_ssid);
+               g_free (utf8_ssid);
+       } else {
+               gtk_editable_set_text (GTK_EDITABLE (widget), "");
+       }
+
+       gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (priv->builder, "network_name_entry")), 
is_new);
+       gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (priv->builder, "network_name_label")), 
is_new);
+       gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (priv->builder, "security_combo")), 
is_new);
+       gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (priv->builder, 
"security_combo_label")), is_new);
+       gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (priv->builder, "security_vbox")), 
is_new);
+}
+
+static gboolean
+connection_combo_separator_cb (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+       gboolean is_separator = FALSE;
+
+       gtk_tree_model_get (model, iter, C_SEP_COLUMN, &is_separator, -1);
+       return is_separator;
+}
+
+static gint
+alphabetize_connections (NMConnection *a, NMConnection *b)
+{
+       NMSettingConnection *asc, *bsc;
+
+       asc = nm_connection_get_setting_connection (a);
+       bsc = nm_connection_get_setting_connection (b);
+
+       return strcmp (nm_setting_connection_get_id (asc),
+                      nm_setting_connection_get_id (bsc));
+}
+
+static gboolean
+connection_combo_init (NMAWifiDialog *self)
+{
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+       GtkListStore *store;
+       int num_added = 0;
+       GtkTreeIter tree_iter;
+       GtkWidget *widget;
+       NMSettingConnection *s_con;
+       GtkCellRenderer *renderer;
+       const char *id;
+
+       g_clear_object (&priv->connection_model);
+       g_clear_object (&priv->connection);
+
+       /* New model */
+       store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_OBJECT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
+       priv->connection_model = GTK_TREE_MODEL (store);
+
+       if (priv->specific_connection) {
+               s_con = nm_connection_get_setting_connection (priv->specific_connection);
+               g_assert (s_con);
+               id = nm_setting_connection_get_id (s_con);
+               if (id == NULL) {
+                       /* New connections which will be completed by NM won't have an ID
+                        * yet, but that doesn't matter because we don't show the connection
+                        * combo anyway when there's a predefined connection.
+                        */
+                       id = "blahblah";
+               }
+
+               gtk_list_store_append (store, &tree_iter);
+               gtk_list_store_set (store, &tree_iter,
+                                   C_NAME_COLUMN, id,
+                                   C_CON_COLUMN, priv->specific_connection, -1);
+       } else {
+               GSList *to_add = NULL, *iter;
+               const GPtrArray *connections;
+               int i;
+
+               gtk_list_store_append (store, &tree_iter);
+               gtk_list_store_set (store, &tree_iter,
+                                   C_NAME_COLUMN, _("New…"),
+                                   C_NEW_COLUMN, TRUE, -1);
+
+               gtk_list_store_append (store, &tree_iter);
+               gtk_list_store_set (store, &tree_iter, C_SEP_COLUMN, TRUE, -1);
+
+               connections = nm_client_get_connections (priv->client);
+               for (i = 0; i < connections->len; i++) {
+                       NMConnection *candidate = NM_CONNECTION (connections->pdata[i]);
+                       NMSettingWireless *s_wireless;
+                       const char *connection_type;
+                       const char *mode;
+                       const char *setting_mac, *hw_addr;
+
+                       s_con = nm_connection_get_setting_connection (candidate);
+                       connection_type = s_con ? nm_setting_connection_get_connection_type (s_con) : NULL;
+                       if (!connection_type)
+                               continue;
+
+                       if (strcmp (connection_type, NM_SETTING_WIRELESS_SETTING_NAME))
+                               continue;
+
+                       s_wireless = nm_connection_get_setting_wireless (candidate);
+                       if (!s_wireless)
+                               continue;
+
+                       /* If creating a new Ad-Hoc network, only show shared network connections */
+                       if (priv->operation == OP_CREATE_ADHOC) {
+                               NMSettingIPConfig *s_ip4;
+                               const char *method = NULL;
+
+                               s_ip4 = nm_connection_get_setting_ip4_config (candidate);
+                               if (s_ip4)
+                                       method = nm_setting_ip_config_get_method (s_ip4);
+
+                               if (!s_ip4 || strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_SHARED))
+                                       continue;
+
+                               /* Ignore non-Ad-Hoc connections too */
+                               mode = nm_setting_wireless_get_mode (s_wireless);
+                               if (!mode || (strcmp (mode, "adhoc") && strcmp (mode, "ap")))
+                                       continue;
+                       }
+
+                       /* Ignore connections that don't apply to the selected device */
+                       setting_mac = nm_setting_wireless_get_mac_address (s_wireless);
+                       hw_addr = nm_device_wifi_get_hw_address (NM_DEVICE_WIFI (priv->device));
+                       if (   setting_mac
+                           && hw_addr 
+                           && !nm_utils_hwaddr_matches (setting_mac, -1, hw_addr, -1))
+                               continue;
+
+                       to_add = g_slist_append (to_add, candidate);
+               }
+
+               /* Alphabetize the list then add the connections */
+               to_add = g_slist_sort (to_add, (GCompareFunc) alphabetize_connections);
+               for (iter = to_add; iter; iter = g_slist_next (iter)) {
+                       NMConnection *candidate = NM_CONNECTION (iter->data);
+
+                       s_con = nm_connection_get_setting_connection (candidate);
+                       gtk_list_store_append (store, &tree_iter);
+                       gtk_list_store_set (store, &tree_iter,
+                                           C_NAME_COLUMN, nm_setting_connection_get_id (s_con),
+                                           C_CON_COLUMN, candidate, -1);
+                       num_added++;
+               }
+               g_slist_free (to_add);
+       }
+
+       widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "connection_combo"));
+
+       gtk_cell_layout_clear (GTK_CELL_LAYOUT (widget));
+       renderer = gtk_cell_renderer_text_new ();
+       gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, TRUE);
+       gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer,
+                                      "text", C_NAME_COLUMN);
+#if !GTK_CHECK_VERSION(3,96,0)
+       gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (widget), 1);
+#endif
+
+       gtk_combo_box_set_model (GTK_COMBO_BOX (widget), priv->connection_model);
+
+       gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (widget),
+                                             connection_combo_separator_cb,
+                                             NULL,
+                                             NULL);
+
+       gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
+
+       g_signal_handlers_disconnect_by_func (widget, connection_combo_changed, self);
+       if (priv->specific_connection || !num_added) {
+               gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->builder, "connection_label")));
+               gtk_widget_hide (widget);
+       } else {
+               g_signal_connect (widget, "changed",
+                                 G_CALLBACK (connection_combo_changed), self);
+       }
+       if (gtk_tree_model_get_iter_first (priv->connection_model, &tree_iter))
+               gtk_tree_model_get (priv->connection_model, &tree_iter, C_CON_COLUMN, &priv->connection, -1);
+
+       return TRUE;
+}
+
+static void
+device_combo_changed (GtkWidget *combo,
+                      gpointer user_data)
+{
+       NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+       GtkTreeIter iter;
+       GtkTreeModel *model;
+
+       if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) {
+               g_warning ("%s: no active device combo box item.", __func__);
+               return;
+       }
+       model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
+
+       g_object_unref (priv->device);
+       gtk_tree_model_get (model, &iter, D_DEV_COLUMN, &priv->device, -1);
+
+       if (!connection_combo_init (self)) {
+               g_warning ("Couldn't change connection combo box.");
+               return;
+       }
+
+       if (!security_combo_init (self, priv->secrets_only, NULL, NULL)) {
+               g_warning ("Couldn't change Wi-Fi security combo box.");
+               return;
+       }
+
+       security_combo_changed (priv->sec_combo, self);
+}
+
+static void
+add_device_to_model (GtkListStore *model, NMDevice *device)
+{
+       GtkTreeIter iter;
+       const char *desc;
+
+       desc = nm_device_get_description (device);
+       gtk_list_store_append (model, &iter);
+       gtk_list_store_set (model, &iter, D_NAME_COLUMN, desc, D_DEV_COLUMN, device, -1);
+}
+
+static gboolean
+can_use_device (NMDevice *device)
+{
+       /* Ignore unsupported devices */
+       if (!(nm_device_get_capabilities (device) & NM_DEVICE_CAP_NM_SUPPORTED))
+               return FALSE;
+
+       if (!NM_IS_DEVICE_WIFI (device))
+               return FALSE;
+
+       if (nm_device_get_state (device) < NM_DEVICE_STATE_DISCONNECTED)
+               return FALSE;
+
+       return TRUE;
+}
+
+static gboolean
+device_combo_init (NMAWifiDialog *self, NMDevice *device)
+{
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+       const GPtrArray *devices;
+       GtkListStore *store;
+       int i, num_added = 0;
+
+       g_return_val_if_fail (priv->device == NULL, FALSE);
+
+       store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_OBJECT);
+       priv->device_model = GTK_TREE_MODEL (store);
+
+       if (device) {
+               if (!can_use_device (device))
+                       return FALSE;
+               add_device_to_model (store, device);
+               num_added++;
+       } else {
+               devices = nm_client_get_devices (priv->client);
+               if (!devices)
+                       return FALSE;
+
+               for (i = 0; devices && (i < devices->len); i++) {
+                       device = NM_DEVICE (g_ptr_array_index (devices, i));
+                       if (can_use_device (device)) {
+                               add_device_to_model (store, device);
+                               num_added++;
+                       }
+               }
+       }
+
+       if (num_added > 0) {
+               GtkWidget *widget;
+               GtkTreeIter iter;
+
+               widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "device_combo"));
+               gtk_combo_box_set_model (GTK_COMBO_BOX (widget), priv->device_model);
+               gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
+               g_signal_connect (G_OBJECT (widget), "changed",
+                                 G_CALLBACK (device_combo_changed), self);
+               if (num_added == 1) {
+                       gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->builder, "device_label")));
+                       gtk_widget_hide (widget);
+               }
+               if (gtk_tree_model_get_iter_first (priv->device_model, &iter))
+                       gtk_tree_model_get (priv->device_model, &iter, D_DEV_COLUMN, &priv->device, -1);
+       }
+
+       return num_added > 0 ? TRUE : FALSE;
+}
+
+static gboolean
+find_proto (NMSettingWirelessSecurity *sec, const char *item)
+{
+       guint32 i;
+
+       for (i = 0; i < nm_setting_wireless_security_get_num_protos (sec); i++) {
+               if (!strcmp (item, nm_setting_wireless_security_get_proto (sec, i)))
+                       return TRUE;
+       }
+       return FALSE;
+}
+
+static NMUtilsSecurityType
+get_default_type_for_security (NMSettingWirelessSecurity *sec,
+                               gboolean have_ap,
+                               guint32 ap_flags,
+                               guint32 dev_caps)
+{
+       const char *key_mgmt, *auth_alg;
+
+       g_return_val_if_fail (sec != NULL, NMU_SEC_NONE);
+
+       key_mgmt = nm_setting_wireless_security_get_key_mgmt (sec);
+       auth_alg = nm_setting_wireless_security_get_auth_alg (sec);
+
+       /* No IEEE 802.1x */
+       if (!strcmp (key_mgmt, "none"))
+               return NMU_SEC_STATIC_WEP;
+
+       if (   !strcmp (key_mgmt, "ieee8021x")
+           && (!have_ap || (ap_flags & NM_802_11_AP_FLAGS_PRIVACY))) {
+               if (auth_alg && !strcmp (auth_alg, "leap"))
+                       return NMU_SEC_LEAP;
+               return NMU_SEC_DYNAMIC_WEP;
+       }
+
+       if (!strcmp (key_mgmt, "sae"))
+               return NMU_SEC_SAE;
+
+       if (   !strcmp (key_mgmt, "wpa-none")
+           || !strcmp (key_mgmt, "wpa-psk")) {
+               if (!have_ap || (ap_flags & NM_802_11_AP_FLAGS_PRIVACY)) {
+                       if (find_proto (sec, "rsn"))
+                               return NMU_SEC_WPA2_PSK;
+                       else if (find_proto (sec, "wpa"))
+                               return NMU_SEC_WPA_PSK;
+                       else
+                               return NMU_SEC_WPA_PSK;
+               }
+       }
+
+       if (   !strcmp (key_mgmt, "wpa-eap")
+           && (!have_ap || (ap_flags & NM_802_11_AP_FLAGS_PRIVACY))) {
+                       if (find_proto (sec, "rsn"))
+                               return NMU_SEC_WPA2_ENTERPRISE;
+                       else if (find_proto (sec, "wpa"))
+                               return NMU_SEC_WPA_ENTERPRISE;
+                       else
+                               return NMU_SEC_WPA_ENTERPRISE;
+       }
+
+       return NMU_SEC_INVALID;
+}
+
+static void
+add_security_item (NMAWifiDialog *self,
+                   WirelessSecurity *sec,
+                   GtkListStore *model,
+                   GtkTreeIter *iter,
+                   const char *text)
+{
+       wireless_security_set_changed_notify (sec, stuff_changed_cb, self);
+       gtk_list_store_append (model, iter);
+       gtk_list_store_set (model, iter, S_NAME_COLUMN, text, S_SEC_COLUMN, sec, -1);
+       wireless_security_unref (sec);
+}
+
+static void
+get_secrets_cb (GObject *object,
+                GAsyncResult *result,
+                gpointer user_data)
+{
+       GetSecretsInfo *info = user_data;
+       NMRemoteConnection *connection = NM_REMOTE_CONNECTION (object);
+       NMAWifiDialogPrivate *priv;
+       GVariant *secrets;
+       GVariantIter variant_iter;
+       const char *setting_name;
+       GVariant *setting_dict;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+       GError *error = NULL;
+       gboolean current_secrets = FALSE;
+
+       if (info->canceled)
+               goto out;
+
+       priv = NMA_WIFI_DIALOG_GET_PRIVATE (info->self);
+       if (priv->secrets_info == info) {
+               priv->secrets_info = NULL;
+
+               /* Buttons should only be re-enabled if this secrets response is the
+                * in-progress one.
+                */
+               gtk_dialog_set_response_sensitive (GTK_DIALOG (info->self), GTK_RESPONSE_CANCEL, TRUE);
+               current_secrets = TRUE;
+       }
+
+       secrets = nm_remote_connection_get_secrets_finish (connection, result, &error);
+       if (error) {
+               g_warning ("%s: error getting connection secrets: (%d) %s",
+                          __func__,
+                          error ? error->code : -1,
+                          error && error->message ? error->message : "(unknown)");
+               goto out;
+       }
+
+       if (current_secrets)
+               _set_ok_sensitive (info->self, TRUE, NULL);
+
+       /* User might have changed the connection while the secrets call was in
+        * progress, so don't try to update the wrong connection with the secrets
+        * we just received.
+        */
+       if (   (priv->connection != info->connection)
+           || !secrets)
+               goto out;
+
+       /* Try to update the connection's secrets; log errors but we don't care */
+       g_variant_iter_init (&variant_iter, secrets);
+       while (g_variant_iter_next (&variant_iter, "{&s@a{sv}}", &setting_name, &setting_dict)) {
+               GError *update_error = NULL;
+
+               if (!nm_connection_update_secrets (priv->connection,
+                                                  setting_name,
+                                                  setting_dict,
+                                                  &update_error)) {
+                       g_warning ("%s: error updating connection secrets: (%d) %s",
+                                  __func__,
+                                  update_error ? update_error->code : -1,
+                                  update_error && update_error->message ? update_error->message : 
"(unknown)");
+                       g_clear_error (&update_error);
+               }
+               g_variant_unref (setting_dict);
+       }
+
+       /* Update each security method's UI elements with the new secrets */
+       model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->sec_combo));
+       if (gtk_tree_model_get_iter_first (model, &iter)) {
+               do {
+                       WirelessSecurity *sec = NULL;
+
+                       gtk_tree_model_get (model, &iter, S_SEC_COLUMN, &sec, -1);
+                       if (sec) {
+                               wireless_security_update_secrets (sec, priv->connection);
+                               wireless_security_unref (sec);
+                       }
+               } while (gtk_tree_model_iter_next (model, &iter));
+       }
+
+out:
+       g_object_unref (info->connection);
+       g_free (info);
+}
+
+static gboolean
+security_valid (NMUtilsSecurityType sectype,
+                NM80211Mode mode,
+                NMDeviceWifiCapabilities wifi_caps,
+                gboolean have_ap,
+                NM80211ApFlags ap_flags,
+                NM80211ApSecurityFlags ap_wpa,
+                NM80211ApSecurityFlags ap_rsn)
+{
+       switch (mode) {
+       case NM_802_11_MODE_AP:
+               if (sectype == NMU_SEC_SAE)
+                       return TRUE;
+               return nm_utils_ap_mode_security_valid (sectype, wifi_caps);
+       case NM_802_11_MODE_ADHOC:
+       case NM_802_11_MODE_INFRA:
+       default:
+               return nm_utils_security_valid (sectype,
+                                               wifi_caps,
+                                               have_ap,
+                                               (mode == NM_802_11_MODE_ADHOC),
+                                               ap_flags, ap_wpa, ap_rsn);
+       }
+       g_assert_not_reached ();
+}
+
+static gboolean
+security_combo_init (NMAWifiDialog *self, gboolean secrets_only,
+                     const char *secrets_setting_name, const char *const*secrets_hints)
+{
+       NMAWifiDialogPrivate *priv;
+       GtkListStore *sec_model;
+       GtkTreeIter iter;
+       guint32 ap_flags = 0;
+       guint32 ap_wpa = 0;
+       guint32 ap_rsn = 0;
+       guint32 dev_caps;
+       NMSettingWirelessSecurity *wsec = NULL;
+       NMUtilsSecurityType default_type = NMU_SEC_NONE;
+       NMWepKeyType wep_type = NM_WEP_KEY_TYPE_KEY;
+       int active = -1;
+       int item = 0;
+       NMSettingWireless *s_wireless = NULL;
+       NM80211Mode mode;
+       const char *setting_name;
+
+       g_return_val_if_fail (self != NULL, FALSE);
+
+       priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+       g_return_val_if_fail (priv->device != NULL, FALSE);
+       g_return_val_if_fail (priv->sec_combo != NULL, FALSE);
+
+       mode = (priv->operation == OP_CREATE_ADHOC) ? NM_802_11_MODE_ADHOC : NM_802_11_MODE_INFRA;
+
+       /* The security options displayed are filtered based on device
+        * capabilities, and if provided, additionally by access point capabilities.
+        * If a connection is given, that connection's options should be selected
+        * by default.  If hints is non-empty only filter based on the setting
+        * keys on the hints list.
+        */
+       dev_caps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (priv->device));
+       if (priv->ap != NULL) {
+               ap_flags = nm_access_point_get_flags (priv->ap);
+               ap_wpa = nm_access_point_get_wpa_flags (priv->ap);
+               ap_rsn = nm_access_point_get_rsn_flags (priv->ap);
+       }
+
+       if (priv->connection) {
+               const char *mode_str;
+
+               s_wireless = nm_connection_get_setting_wireless (priv->connection);
+
+               mode_str = nm_setting_wireless_get_mode (s_wireless);
+               if (mode_str && !strcmp (mode_str, "adhoc"))
+                       mode = NM_802_11_MODE_ADHOC;
+               else if (mode_str && !strcmp (mode_str, "ap"))
+                       mode = NM_802_11_MODE_AP;
+               else
+                       mode = NM_802_11_MODE_INFRA;
+
+               wsec = nm_connection_get_setting_wireless_security (priv->connection);
+
+               if (wsec) {
+                       default_type = get_default_type_for_security (wsec, !!priv->ap, ap_flags, dev_caps);
+                       if (default_type == NMU_SEC_STATIC_WEP)
+                               wep_type = nm_setting_wireless_security_get_wep_key_type (wsec);
+                       if (wep_type == NM_WEP_KEY_TYPE_UNKNOWN)
+                               wep_type = NM_WEP_KEY_TYPE_KEY;
+               }
+       } else if (mode == NM_802_11_MODE_ADHOC) {
+               default_type = NMU_SEC_STATIC_WEP;
+               wep_type = NM_WEP_KEY_TYPE_PASSPHRASE;
+       }
+
+       sec_model = gtk_list_store_new (2, G_TYPE_STRING, WIRELESS_TYPE_SECURITY);
+
+       if (security_valid (NMU_SEC_NONE, mode, dev_caps, !!priv->ap, ap_flags, ap_wpa, ap_rsn)) {
+               gtk_list_store_append (sec_model, &iter);
+               gtk_list_store_set (sec_model, &iter,
+                                   S_NAME_COLUMN, C_("Wifi/wired security", "None"),
+                                   -1);
+               if (default_type == NMU_SEC_NONE)
+                       active = item;
+               item++;
+       }
+
+       /* Don't show Static WEP if both the AP and the device are capable of WPA,
+        * even though technically it's possible to have this configuration.
+        */
+       if (   security_valid (NMU_SEC_STATIC_WEP, mode, dev_caps, !!priv->ap, ap_flags, ap_wpa, ap_rsn)
+           && ((!ap_wpa && !ap_rsn) || !(dev_caps & (NM_WIFI_DEVICE_CAP_WPA | NM_WIFI_DEVICE_CAP_RSN)))) {
+               WirelessSecurityWEPKey *ws_wep;
+
+               ws_wep = ws_wep_key_new (priv->connection, NM_WEP_KEY_TYPE_KEY, mode == NM_802_11_MODE_ADHOC, 
secrets_only);
+               if (ws_wep) {
+                       add_security_item (self, WIRELESS_SECURITY (ws_wep), sec_model,
+                                          &iter, _("WEP 40/128-bit Key (Hex or ASCII)"));
+                       if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (wep_type == 
NM_WEP_KEY_TYPE_KEY))
+                               active = item;
+                       item++;
+               }
+
+               ws_wep = ws_wep_key_new (priv->connection, NM_WEP_KEY_TYPE_PASSPHRASE, mode == 
NM_802_11_MODE_ADHOC, secrets_only);
+               if (ws_wep) {
+                       add_security_item (self, WIRELESS_SECURITY (ws_wep), sec_model,
+                                          &iter, _("WEP 128-bit Passphrase"));
+                       if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (wep_type == 
NM_WEP_KEY_TYPE_PASSPHRASE))
+                               active = item;
+                       item++;
+               }
+       }
+
+       /* Don't show LEAP if both the AP and the device are capable of WPA,
+        * even though technically it's possible to have this configuration.
+        */
+       if (   security_valid (NMU_SEC_LEAP, mode, dev_caps, !!priv->ap, ap_flags, ap_wpa, ap_rsn)
+           && ((!ap_wpa && !ap_rsn) || !(dev_caps & (NM_WIFI_DEVICE_CAP_WPA | NM_WIFI_DEVICE_CAP_RSN)))) {
+               WirelessSecurityLEAP *ws_leap;
+
+               ws_leap = ws_leap_new (priv->connection, secrets_only);
+               if (ws_leap) {
+                       add_security_item (self, WIRELESS_SECURITY (ws_leap), sec_model,
+                                          &iter, _("LEAP"));
+                       if ((active < 0) && (default_type == NMU_SEC_LEAP))
+                               active = item;
+                       item++;
+               }
+       }
+
+       if (security_valid (NMU_SEC_DYNAMIC_WEP, mode, dev_caps, !!priv->ap, ap_flags, ap_wpa, ap_rsn)) {
+               WirelessSecurityDynamicWEP *ws_dynamic_wep;
+
+               ws_dynamic_wep = ws_dynamic_wep_new (priv->connection, FALSE, secrets_only);
+               if (ws_dynamic_wep) {
+                       add_security_item (self, WIRELESS_SECURITY (ws_dynamic_wep), sec_model,
+                                          &iter, _("Dynamic WEP (802.1x)"));
+                       if ((active < 0) && (default_type == NMU_SEC_DYNAMIC_WEP))
+                               active = item;
+                       item++;
+               }
+       }
+
+       if (   security_valid (NMU_SEC_WPA_PSK, mode, dev_caps, !!priv->ap, ap_flags, ap_wpa, ap_rsn)
+           || security_valid (NMU_SEC_WPA2_PSK, mode, dev_caps, !!priv->ap, ap_flags, ap_wpa, ap_rsn)) {
+               WirelessSecurityWPAPSK *ws_wpa_psk;
+
+               ws_wpa_psk = ws_wpa_psk_new (priv->connection, secrets_only);
+               if (ws_wpa_psk) {
+                       add_security_item (self, WIRELESS_SECURITY (ws_wpa_psk), sec_model,
+                                          &iter, _("WPA & WPA2 Personal"));
+                       if ((active < 0) && ((default_type == NMU_SEC_WPA_PSK) || (default_type == 
NMU_SEC_WPA2_PSK)))
+                               active = item;
+                       item++;
+               }
+       }
+
+       if (   security_valid (NMU_SEC_WPA_ENTERPRISE, mode, dev_caps, !!priv->ap, ap_flags, ap_wpa, ap_rsn)
+           || security_valid (NMU_SEC_WPA2_ENTERPRISE, mode, dev_caps, !!priv->ap, ap_flags, ap_wpa, 
ap_rsn)) {
+               WirelessSecurityWPAEAP *ws_wpa_eap;
+               const char *const*hints = NULL;
+
+               if (secrets_setting_name && !strcmp (secrets_setting_name, NM_SETTING_802_1X_SETTING_NAME))
+                       hints = secrets_hints;
+
+               ws_wpa_eap = ws_wpa_eap_new (priv->connection, FALSE, secrets_only, hints);
+               if (ws_wpa_eap) {
+                       add_security_item (self, WIRELESS_SECURITY (ws_wpa_eap), sec_model,
+                                          &iter, _("WPA & WPA2 Enterprise"));
+                       if ((active < 0) && ((default_type == NMU_SEC_WPA_ENTERPRISE) || (default_type == 
NMU_SEC_WPA2_ENTERPRISE)))
+                               active = item;
+                       item++;
+               }
+       }
+
+       if (security_valid (NMU_SEC_SAE, mode, dev_caps, !!priv->ap, ap_flags, ap_wpa, ap_rsn)) {
+               WirelessSecuritySAE *ws_sae;
+
+               ws_sae = ws_sae_new (priv->connection, secrets_only);
+               if (ws_sae) {
+                       add_security_item (self, WIRELESS_SECURITY (ws_sae), sec_model,
+                                          &iter, _("WPA3 Personal"));
+                       if (active < 0 && default_type == NMU_SEC_SAE)
+                               active = item;
+                       item++;
+               }
+       }
+
+       gtk_combo_box_set_model (GTK_COMBO_BOX (priv->sec_combo), GTK_TREE_MODEL (sec_model));
+       gtk_combo_box_set_active (GTK_COMBO_BOX (priv->sec_combo), active < 0 ? 0 : (guint32) active);
+       g_object_unref (G_OBJECT (sec_model));
+
+       /* If the dialog was given a connection when it was created, that connection
+        * will already be populated with secrets.  If no connection was given,
+        * then we need to get any existing secrets to populate the dialog with.
+        */
+       if (priv->connection) {
+               if (secrets_setting_name)
+                       setting_name = secrets_setting_name;
+               else
+                       setting_name = nm_connection_need_secrets (priv->connection, NULL);
+       } else
+               setting_name = NULL;
+
+       if (setting_name && NM_IS_REMOTE_CONNECTION (priv->connection)) {
+               GetSecretsInfo *info;
+
+               /* Desensitize the dialog's buttons while we wait for the secrets
+                * operation to complete.
+                */
+               _set_ok_sensitive (self, FALSE, NULL);
+               gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_CANCEL, FALSE);
+
+               info = g_malloc0 (sizeof (GetSecretsInfo));
+               info->self = self;
+               info->connection = g_object_ref (priv->connection);
+               priv->secrets_info = info;
+
+               nm_remote_connection_get_secrets_async (NM_REMOTE_CONNECTION (priv->connection),
+                                                       setting_name, NULL, get_secrets_cb, info);
+       }
+
+       return TRUE;
+}
+
+static gboolean
+revalidate (gpointer user_data)
+{
+       NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+
+       priv->revalidate_id = 0;
+       security_combo_changed (priv->sec_combo, self);
+       return FALSE;
+}
+
+static gboolean
+internal_init (NMAWifiDialog *self,
+               NMConnection *specific_connection,
+               NMDevice *specific_device,
+               gboolean secrets_only,
+               const char *secrets_setting_name,
+               const char *const*secrets_hints)
+{
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+       GtkWidget *widget;
+       char *label, *icon_name = "network-wireless";
+       gboolean security_combo_focus = FALSE;
+
+       gtk_window_set_position (GTK_WINDOW (self), GTK_WIN_POS_CENTER_ALWAYS);
+       gtk_window_set_default_size (GTK_WINDOW (self), 488, -1);
+       gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
+
+       priv->secrets_only = secrets_only;
+       if (secrets_only)
+               icon_name = "dialog-password";
+       else
+               icon_name = "network-wireless";
+
+       if (specific_connection)
+               priv->specific_connection = g_object_ref (specific_connection);
+
+       gtk_window_set_icon_name (GTK_WINDOW (self), icon_name);
+       widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "image1"));
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_image_set_from_icon_name (GTK_IMAGE (widget), icon_name);
+#else
+       gtk_image_set_from_icon_name (GTK_IMAGE (widget), icon_name, GTK_ICON_SIZE_DIALOG);
+#endif
+
+       gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 2);
+
+       widget = gtk_dialog_add_button (GTK_DIALOG (self), _("_Cancel"), GTK_RESPONSE_CANCEL);
+
+       /* Connect/Create button */
+       if (priv->operation == OP_CREATE_ADHOC) {
+               widget = gtk_dialog_add_button (GTK_DIALOG (self), _("C_reate"), GTK_RESPONSE_OK);
+       } else {
+               widget = gtk_dialog_add_button (GTK_DIALOG (self), _("C_onnect"), GTK_RESPONSE_OK);
+               priv->ok_response_button = widget;
+       }
+
+#if !GTK_CHECK_VERSION(3,96,0)
+       g_object_set (G_OBJECT (widget), "can-default", TRUE, NULL);
+       gtk_widget_grab_default (widget);
+#endif
+
+       widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "wifi_dialog"));
+       if (!widget) {
+               g_warning ("Couldn't find Wi-Fi_dialog widget.");
+               return FALSE;
+       }
+
+       gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (self))), widget);
+
+       /* If given a valid connection, hide the SSID bits and connection combo */
+       if (specific_connection) {
+               widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "network_name_label"));
+               gtk_widget_hide (widget);
+
+               widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "network_name_entry"));
+               gtk_widget_hide (widget);
+
+               security_combo_focus = TRUE;
+               priv->network_name_focus = FALSE;
+       } else {
+               widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "network_name_entry"));
+               g_signal_connect (G_OBJECT (widget), "changed", (GCallback) ssid_entry_changed, self);
+               priv->network_name_focus = TRUE;
+       }
+
+       _set_ok_sensitive (self, FALSE, NULL);
+
+       if (!device_combo_init (self, specific_device)) {
+               g_warning ("No Wi-Fi devices available.");
+               return FALSE;
+       }
+
+       if (!connection_combo_init (self)) {
+               g_warning ("Couldn't set up connection combo box.");
+               return FALSE;
+       }
+
+       if (!security_combo_init (self, priv->secrets_only, secrets_setting_name, secrets_hints)) {
+               g_warning ("Couldn't set up Wi-Fi security combo box.");
+               return FALSE;
+       }
+
+       security_combo_changed (priv->sec_combo, self);
+       g_signal_connect (G_OBJECT (priv->sec_combo), "changed",
+                         G_CALLBACK (security_combo_changed_manually), self);
+
+       if (secrets_only) {
+               gtk_widget_hide (priv->sec_combo);
+               widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "security_combo_label"));
+               gtk_widget_hide (widget);
+       }
+
+       if (security_combo_focus && !secrets_only)
+               gtk_widget_grab_focus (priv->sec_combo);
+       else if (priv->network_name_focus) {
+               widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "network_name_entry"));
+               gtk_widget_grab_focus (widget);
+       }
+
+       if (priv->connection) {
+               char *tmp;
+               char *esc_ssid = NULL;
+               NMSettingWireless *s_wireless;
+               GBytes *ssid;
+
+               s_wireless = nm_connection_get_setting_wireless (priv->connection);
+               ssid = s_wireless ? nm_setting_wireless_get_ssid (s_wireless) : NULL;
+               if (ssid)
+                       esc_ssid = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL), g_bytes_get_size 
(ssid));
+
+               tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the Wi-Fi 
network “%s”."),
+                                      esc_ssid ? esc_ssid : "<unknown>");
+               gtk_window_set_title (GTK_WINDOW (self), _("Wi-Fi Network Authentication Required"));
+               label = g_markup_printf_escaped ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
+                                                _("Authentication required by Wi-Fi network"),
+                                                tmp);
+               g_free (esc_ssid);
+               g_free (tmp);
+       } else if (priv->operation == OP_CREATE_ADHOC) {
+               gtk_window_set_title (GTK_WINDOW (self), _("Create New Wi-Fi Network"));
+               label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
+                                        _("New Wi-Fi network"),
+                                        _("Enter a name for the Wi-Fi network you wish to create."));
+       } else if (priv->operation == OP_CONNECT_HIDDEN) {
+               gtk_window_set_title (GTK_WINDOW (self), _("Connect to Hidden Wi-Fi Network"));
+               label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
+                                        _("Hidden Wi-Fi network"),
+                                        _("Enter the name and security details of the hidden Wi-Fi network 
you wish to connect to."));
+       } else
+               g_assert_not_reached ();
+
+       widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "caption_label"));
+       gtk_label_set_markup (GTK_LABEL (widget), label);
+       g_free (label);
+
+       /* Re-validate from an idle handler so that widgets like file choosers
+        * have had time to find their files.
+        */
+       priv->revalidate_id = g_idle_add (revalidate, self);
+
+       return TRUE;
+}
+
+/**
+ * nma_wifi_dialog_get_connection:
+ * @self: an #NMAWifiDialog
+ * @device: (out):
+ * @ap: (out):
+ *
+ * Returns: (transfer full):
+ */
+NMConnection *
+nma_wifi_dialog_get_connection (NMAWifiDialog *self,
+                                NMDevice **device,
+                                NMAccessPoint **ap)
+{
+       NMAWifiDialogPrivate *priv;
+       GtkWidget *combo;
+       GtkTreeModel *model;
+       WirelessSecurity *sec = NULL;
+       GtkTreeIter iter;
+       NMConnection *connection;
+       NMSettingWireless *s_wireless;
+
+       g_return_val_if_fail (self != NULL, NULL);
+
+       priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+
+       if (!priv->connection) {
+               NMSettingConnection *s_con;
+               char *uuid;
+               GBytes *ssid;
+
+               connection = nm_simple_connection_new ();
+
+               s_con = (NMSettingConnection *) nm_setting_connection_new ();
+               uuid = nm_utils_uuid_generate ();
+               g_object_set (s_con,
+                             NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRELESS_SETTING_NAME,
+                             NM_SETTING_CONNECTION_UUID, uuid,
+                             NULL);
+               g_free (uuid);
+               nm_connection_add_setting (connection, (NMSetting *) s_con);
+
+               s_wireless = (NMSettingWireless *) nm_setting_wireless_new ();
+               ssid = validate_dialog_ssid (self);
+               g_object_set (s_wireless, NM_SETTING_WIRELESS_SSID, ssid, NULL);
+               g_bytes_unref (ssid);
+
+               if (priv->operation == OP_CREATE_ADHOC) {
+                       NMSetting *s_ip4;
+
+                       g_object_set (s_wireless, NM_SETTING_WIRELESS_MODE, "adhoc", NULL);
+
+                       s_ip4 = nm_setting_ip4_config_new ();
+                       g_object_set (s_ip4,
+                                     NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_SHARED,
+                                     NULL);
+                       nm_connection_add_setting (connection, s_ip4);
+               } else if (priv->operation == OP_CONNECT_HIDDEN) {
+                       /* Mark as a hidden SSID network */
+                       g_object_set (s_wireless, NM_SETTING_WIRELESS_HIDDEN, TRUE, NULL);
+               } else
+                       g_assert_not_reached ();
+
+               nm_connection_add_setting (connection, (NMSetting *) s_wireless);
+       } else
+               connection = g_object_ref (priv->connection);
+
+       /* Fill security */
+       model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->sec_combo));
+       if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->sec_combo), &iter))
+               gtk_tree_model_get (model, &iter, S_SEC_COLUMN, &sec, -1);
+       if (sec) {
+               wireless_security_fill_connection (sec, connection);
+               wireless_security_unref (sec);
+       }
+
+       /* Save new CA cert ignore values to GSettings */
+       eap_method_ca_cert_ignore_save (connection);
+
+       /* Fill device */
+       if (device) {
+               combo = GTK_WIDGET (gtk_builder_get_object (priv->builder, "device_combo"));
+               gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter);
+               gtk_tree_model_get (priv->device_model, &iter, D_DEV_COLUMN, device, -1);
+               g_object_unref (*device);
+       }
+
+       if (ap)
+               *ap = priv->ap;
+
+       return connection;
+}
+
+static GtkWidget *
+internal_new_dialog (NMClient *client,
+                     NMConnection *connection,
+                     NMDevice *device,
+                     NMAccessPoint *ap,
+                     gboolean secrets_only,
+                     const char *secrets_setting_name,
+                     const char *const*secrets_hints)
+{
+       NMAWifiDialog *self;
+       NMAWifiDialogPrivate *priv;
+
+       g_return_val_if_fail (NM_IS_CLIENT (client), NULL);
+       g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
+
+       self = NMA_WIFI_DIALOG (g_object_new (NMA_TYPE_WIFI_DIALOG, NULL));
+       if (self) {
+               priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+
+               priv->client = g_object_ref (client);
+               if (ap)
+                       priv->ap = g_object_ref (ap);
+
+               priv->sec_combo = GTK_WIDGET (gtk_builder_get_object (priv->builder, "security_combo"));
+               priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+               /* Handle CA cert ignore stuff */
+               eap_method_ca_cert_ignore_load (connection);
+
+               if (!internal_init (self, connection, device, secrets_only, secrets_setting_name, 
secrets_hints)) {
+                       g_warning ("Couldn't create Wi-Fi security dialog.");
+                       gtk_widget_destroy (GTK_WIDGET (self));
+                       self = NULL;
+               }
+       }
+
+       return GTK_WIDGET (self);
+}
+
+/**
+ * nma_wifi_dialog_new:
+ * @client: client to retrieve list of devices or connections from
+ * @connection: connection to be shown/edited or %NULL
+ * @device: device to check connection compatibility against
+ * @ap: AP to check connection compatibility against
+ * @secrets_only: whether to only ask for secrets for given connection
+ *
+ * Creates a wifi connection dialog and populates it with settings from
+ * @connection if given.  If @device is not given a device selection combo box
+ * will be included.  If @connection is not given a connection selection combo
+ * box will be included.  If @secrets_only is %FALSE a complete connection
+ * creator/editor dialog is returned, otherwise only wifi security secrets
+ * relevant to the security settings in @connection are going to be shown and
+ * will be editable.
+ *
+ * Returns: the dialog widget or %NULL in case of error
+ */
+GtkWidget *
+nma_wifi_dialog_new (NMClient *client,
+                     NMConnection *connection,
+                     NMDevice *device,
+                     NMAccessPoint *ap,
+                     gboolean secrets_only)
+{
+       guint32 dev_caps;
+
+       /* Ensure device validity */
+       if (device) {
+               dev_caps = nm_device_get_capabilities (device);
+               g_return_val_if_fail (dev_caps & NM_DEVICE_CAP_NM_SUPPORTED, NULL);
+               g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), NULL);
+       }
+
+       return internal_new_dialog (client,
+                                   connection,
+                                   device,
+                                   ap,
+                                   secrets_only,
+                                   NULL,
+                                   NULL);
+}
+
+/**
+ * nma_wifi_dialog_new_for_secrets:
+ * @client: client to retrieve list of devices or connections from
+ * @connection: connection for which secrets are requested
+ * @secrets_setting_name: setting name whose secrets are requested
+ *   or %NULL
+ * @secrets_hints: array of setting key names within the setting given in
+ *   @secrets_setting_name which are requested or %NULL
+ *
+ * Creates a wifi secrets dialog and populates it with setting values from
+ * @connection.  If @secrets_setting_name and @secrets_hints are not given
+ * this function creates an identical dialog as nma_wifi_dialog_new() would
+ * create with the @secrets_only parameter %TRUE.  Otherwise
+ * @secrets_setting_name and @secrets_hints determine the list of specific
+ * secrets that are being requested from the user and no editable entries
+ * are shown for any other settings.
+ *
+ * Note: only a subset of all settings and setting keys is supported as
+ * @secrets_setting_name and @secrets_hints.
+ *
+ * Returns: the dialog widget or %NULL in case of error
+ */
+GtkWidget *
+nma_wifi_dialog_new_for_secrets (NMClient *client,
+                                 NMConnection *connection,
+                                 const char *secrets_setting_name,
+                                 const char *const*secrets_hints)
+{
+       return internal_new_dialog (client,
+                                   connection,
+                                   NULL,
+                                   NULL,
+                                   TRUE,
+                                   secrets_setting_name,
+                                   secrets_hints);
+}
+
+static GtkWidget *
+internal_new_operation (NMClient *client,
+                        guint operation)
+{
+       NMAWifiDialog *self;
+       NMAWifiDialogPrivate *priv;
+
+       g_return_val_if_fail (NM_IS_CLIENT (client), NULL);
+
+       self = NMA_WIFI_DIALOG (g_object_new (NMA_TYPE_WIFI_DIALOG, NULL));
+       if (!self)
+               return NULL;
+
+       priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+
+       priv->client = g_object_ref (client);
+       priv->sec_combo = GTK_WIDGET (gtk_builder_get_object (priv->builder, "security_combo"));
+       priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+       priv->operation = operation;
+
+       if (!internal_init (self, NULL, NULL, FALSE, NULL, NULL)) {
+               g_warning ("Couldn't create Wi-Fi security dialog.");
+               gtk_widget_destroy (GTK_WIDGET (self));
+               return NULL;
+       }
+
+       return GTK_WIDGET (self);
+}
+
+GtkWidget *
+nma_wifi_dialog_new_for_hidden (NMClient *client)
+{
+       return internal_new_operation (client, OP_CONNECT_HIDDEN);
+}
+
+GtkWidget *
+nma_wifi_dialog_new_for_other (NMClient *client)
+{
+       return internal_new_operation (client, OP_CONNECT_HIDDEN);
+}
+
+GtkWidget *
+nma_wifi_dialog_new_for_create (NMClient *client)
+{
+       return internal_new_operation (client, OP_CREATE_ADHOC);
+}
+
+/**
+ * nma_wifi_dialog_nag_user:
+ * @self:
+ *
+ * Returns: (transfer full):
+ */
+GtkWidget *
+nma_wifi_dialog_nag_user (NMAWifiDialog *self)
+{
+       return NULL;
+}
+
+static void
+nma_wifi_dialog_init (NMAWifiDialog *self)
+{
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
+       GError *error = NULL;
+
+       priv->builder = gtk_builder_new ();
+
+       if (!gtk_builder_add_from_resource (priv->builder, "/org/freedesktop/network-manager-applet/wifi.ui", 
&error)) {
+               g_warning ("Couldn't load builder resource: %s", error->message);
+               g_error_free (error);
+       }
+}
+
+static void
+dispose (GObject *object)
+{
+       NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (object);
+
+
+       if (priv->secrets_info) {
+               priv->secrets_info->canceled = TRUE;
+               priv->secrets_info = NULL;
+       }
+
+       g_clear_object (&priv->client);
+       g_clear_object (&priv->builder);
+
+       g_clear_object (&priv->device_model);
+       g_clear_object (&priv->connection_model);
+
+       g_clear_object (&priv->group);
+
+       g_clear_object (&priv->specific_connection);
+       g_clear_object (&priv->connection);
+
+       g_clear_object (&priv->device);
+
+       g_clear_object (&priv->ap);
+
+       if (priv->revalidate_id) {
+               g_source_remove (priv->revalidate_id);
+               priv->revalidate_id = 0;
+       }
+
+       G_OBJECT_CLASS (nma_wifi_dialog_parent_class)->dispose (object);
+}
+
+static void
+nma_wifi_dialog_class_init (NMAWifiDialogClass *nmad_class)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (nmad_class);
+
+       g_type_class_add_private (nmad_class, sizeof (NMAWifiDialogPrivate));
+
+       /* virtual methods */
+       object_class->dispose = dispose;
+}
diff --git a/src/libnma/nma-wifi-dialog.h b/src/libnma/nma-wifi-dialog.h
new file mode 100644
index 00000000..18c43b0a
--- /dev/null
+++ b/src/libnma/nma-wifi-dialog.h
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-2.0+
+/* NetworkManager Wireless Applet -- Display wireless access points and allow user control
+ *
+ * Dan Williams <dcbw redhat com>
+ *
+ * Copyright 2007 - 2014 Red Hat, Inc.
+ */
+
+#ifndef NMA_WIFI_DIALOG_H
+#define NMA_WIFI_DIALOG_H
+
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <glib-object.h>
+
+#include <NetworkManager.h>
+
+#include "nma-version.h"
+
+#define NMA_TYPE_WIFI_DIALOG            (nma_wifi_dialog_get_type ())
+#define NMA_WIFI_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMA_TYPE_WIFI_DIALOG, 
NMAWifiDialog))
+#define NMA_WIFI_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NMA_TYPE_WIFI_DIALOG, 
NMAWifiDialogClass))
+#define NMA_IS_WIFI_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMA_TYPE_WIFI_DIALOG))
+#define NMA_IS_WIFI_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NMA_TYPE_WIFI_DIALOG))
+#define NMA_WIFI_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NMA_TYPE_WIFI_DIALOG, 
NMAWifiDialogClass))
+
+typedef struct {
+       GtkDialog parent;
+} NMAWifiDialog;
+
+typedef struct {
+       GtkDialogClass parent;
+} NMAWifiDialogClass;
+
+GType nma_wifi_dialog_get_type (void);
+
+GtkWidget *nma_wifi_dialog_new (NMClient *client,
+                                NMConnection *connection,
+                                NMDevice *device,
+                                NMAccessPoint *ap,
+                                gboolean secrets_only);
+
+GtkWidget *nma_wifi_dialog_new_for_secrets (NMClient *client,
+                                            NMConnection *connection,
+                                            const char *secrets_setting_name,
+                                            const char *const*secrets_hints);
+
+GtkWidget *nma_wifi_dialog_new_for_hidden (NMClient *client);
+
+GtkWidget *nma_wifi_dialog_new_for_create (NMClient *client);
+
+NMConnection * nma_wifi_dialog_get_connection (NMAWifiDialog *self,
+                                               NMDevice **device,
+                                               NMAccessPoint **ap);
+
+NMA_DEPRECATED_IN_1_2
+GtkWidget * nma_wifi_dialog_nag_user (NMAWifiDialog *self);
+
+NMA_DEPRECATED_IN_1_2
+void nma_wifi_dialog_set_nag_ignored (NMAWifiDialog *self, gboolean ignored);
+
+NMA_DEPRECATED_IN_1_2
+gboolean nma_wifi_dialog_get_nag_ignored (NMAWifiDialog *self);
+
+NMA_DEPRECATED_IN_1_2_FOR(nma_wifi_dialog_new_for_hidden)
+GtkWidget *nma_wifi_dialog_new_for_other (NMClient *client);
+
+#endif /* NMA_WIFI_DIALOG_H */
+
diff --git a/src/libnma/nma.gresource.xml b/src/libnma/nma.gresource.xml
new file mode 100644
index 00000000..ee1fcb20
--- /dev/null
+++ b/src/libnma/nma.gresource.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+       <gresource prefix="/org/freedesktop/network-manager-applet">
+               <file preprocess="xml-stripblanks">wifi.ui</file>
+               <file preprocess="xml-stripblanks">nma-pkcs11-token-login-dialog.ui</file>
+               <file preprocess="xml-stripblanks">nma-pkcs11-cert-chooser-dialog.ui</file>
+               <file preprocess="xml-stripblanks">nma-mobile-wizard.ui</file>
+               <file preprocess="xml-stripblanks">nma-vpn-password-dialog.ui</file>
+               <file preprocess="xml-stripblanks">nma-bar-code-widget.ui</file>
+       </gresource>
+</gresources>
diff --git a/src/libnma/qrcodegen.c b/src/libnma/qrcodegen.c
new file mode 100644
index 00000000..7cda9659
--- /dev/null
+++ b/src/libnma/qrcodegen.c
@@ -0,0 +1,1009 @@
+/*
+ * QR Code generator library (C)
+ *
+ * Copyright (c) Project Nayuki. (MIT License)
+ * https://www.nayuki.io/page/qr-code-generator-library
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ * - The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ * - The Software is provided "as is", without warranty of any kind, express or
+ *   implied, including but not limited to the warranties of merchantability,
+ *   fitness for a particular purpose and noninfringement. In no event shall the
+ *   authors or copyright holders be liable for any claim, damages or other
+ *   liability, whether in an action of contract, tort or otherwise, arising from,
+ *   out of or in connection with the Software or the use or other dealings in the
+ *   Software.
+ */
+
+#include <assert.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include "qrcodegen.h"
+
+#ifndef QRCODEGEN_TEST
+       #define testable static  // Keep functions private
+#else
+       #define testable  // Expose private functions
+#endif
+
+
+/*---- Forward declarations for private functions ----*/
+
+// Regarding all public and private functions defined in this source file:
+// - They require all pointer/array arguments to be not null unless the array length is zero.
+// - They only read input scalar/array arguments, write to output pointer/array
+//   arguments, and return scalar values; they are "pure" functions.
+// - They don't read mutable global variables or write to any global variables.
+// - They don't perform I/O, read the clock, print to console, etc.
+// - They allocate a small and constant amount of stack memory.
+// - They don't allocate or free any memory on the heap.
+// - They don't recurse or mutually recurse. All the code
+//   could be inlined into the top-level public functions.
+// - They run in at most quadratic time with respect to input arguments.
+//   Most functions run in linear time, and some in constant time.
+//   There are no unbounded loops or non-obvious termination conditions.
+// - They are completely thread-safe if the caller does not give the
+//   same writable buffer to concurrent calls to these functions.
+
+testable void appendBitsToBuffer(unsigned int val, int numBits, uint8_t buffer[], int *bitLen);
+
+testable void addEccAndInterleave(uint8_t data[], int version, enum qrcodegen_Ecc ecl, uint8_t result[]);
+testable int getNumDataCodewords(int version, enum qrcodegen_Ecc ecl);
+testable int getNumRawDataModules(int ver);
+
+testable void calcReedSolomonGenerator(int degree, uint8_t result[]);
+testable void calcReedSolomonRemainder(const uint8_t data[], int dataLen,
+       const uint8_t generator[], int degree, uint8_t result[]);
+testable uint8_t finiteFieldMultiply(uint8_t x, uint8_t y);
+
+testable void initializeFunctionModules(int version, uint8_t qrcode[]);
+static void drawWhiteFunctionModules(uint8_t qrcode[], int version);
+static void drawFormatBits(enum qrcodegen_Ecc ecl, enum qrcodegen_Mask mask, uint8_t qrcode[]);
+testable int getAlignmentPatternPositions(int version, uint8_t result[7]);
+static void fillRectangle(int left, int top, int width, int height, uint8_t qrcode[]);
+
+static void drawCodewords(const uint8_t data[], int dataLen, uint8_t qrcode[]);
+static void applyMask(const uint8_t functionModules[], uint8_t qrcode[], enum qrcodegen_Mask mask);
+static long getPenaltyScore(const uint8_t qrcode[]);
+static void addRunToHistory(unsigned char run, unsigned char history[7]);
+static bool hasFinderLikePattern(unsigned char runHistory[7]);
+
+testable bool getModule(const uint8_t qrcode[], int x, int y);
+testable void setModule(uint8_t qrcode[], int x, int y, bool isBlack);
+testable void setModuleBounded(uint8_t qrcode[], int x, int y, bool isBlack);
+static bool getBit(int x, int i);
+
+testable int calcSegmentBitLength(enum qrcodegen_Mode mode, size_t numChars);
+testable int getTotalBits(const struct qrcodegen_Segment segs[], size_t len, int version);
+static int numCharCountBits(enum qrcodegen_Mode mode, int version);
+
+
+
+/*---- Private tables of constants ----*/
+
+// The set of all legal characters in alphanumeric mode, where each character
+// value maps to the index in the string. For checking text and encoding segments.
+static const char *ALPHANUMERIC_CHARSET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:";
+
+// For generating error correction codes.
+testable const int8_t ECC_CODEWORDS_PER_BLOCK[4][41] = {
+       // Version: (note that index 0 is for padding, and is set to an illegal value)
+       //0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40    Error correction level
+       {-1,  7, 10, 15, 20, 26, 18, 20, 24, 30, 18, 20, 24, 26, 30, 22, 24, 28, 30, 28, 28, 28, 28, 30, 30, 
26, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},  // Low
+       {-1, 10, 16, 26, 18, 24, 16, 18, 22, 22, 26, 30, 22, 22, 24, 24, 28, 28, 26, 26, 26, 26, 28, 28, 28, 
28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28},  // Medium
+       {-1, 13, 22, 18, 26, 18, 24, 18, 22, 20, 24, 28, 26, 24, 20, 30, 24, 28, 28, 26, 30, 28, 30, 30, 30, 
30, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},  // Quartile
+       {-1, 17, 28, 22, 16, 22, 28, 26, 26, 24, 28, 24, 28, 22, 24, 24, 30, 28, 28, 26, 28, 30, 24, 30, 30, 
30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},  // High
+};
+
+#define qrcodegen_REED_SOLOMON_DEGREE_MAX 30  // Based on the table above
+
+// For generating error correction codes.
+testable const int8_t NUM_ERROR_CORRECTION_BLOCKS[4][41] = {
+       // Version: (note that index 0 is for padding, and is set to an illegal value)
+       //0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 
27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40    Error correction level
+       {-1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4,  4,  4,  4,  4,  6,  6,  6,  6,  7,  8,  8,  9,  9, 10, 12, 12, 
12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25},  // Low
+       {-1, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5,  5,  8,  9,  9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 
25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49},  // Medium
+       {-1, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8,  8, 10, 12, 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 
34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68},  // Quartile
+       {-1, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16, 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 
40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81},  // High
+};
+
+// For automatic mask pattern selection.
+static const int PENALTY_N1 =  3;
+static const int PENALTY_N2 =  3;
+static const int PENALTY_N3 = 40;
+static const int PENALTY_N4 = 10;
+
+
+
+/*---- High-level QR Code encoding functions ----*/
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[],
+               enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool 
boostEcl) {
+
+       size_t textLen = strlen(text);
+       if (textLen == 0)
+               return qrcodegen_encodeSegmentsAdvanced(NULL, 0, ecl, minVersion, maxVersion, mask, boostEcl, 
tempBuffer, qrcode);
+       size_t bufLen = qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion);
+
+       struct qrcodegen_Segment seg;
+       if (qrcodegen_isNumeric(text)) {
+               if (qrcodegen_calcSegmentBufferSize(qrcodegen_Mode_NUMERIC, textLen) > bufLen)
+                       goto fail;
+               seg = qrcodegen_makeNumeric(text, tempBuffer);
+       } else if (qrcodegen_isAlphanumeric(text)) {
+               if (qrcodegen_calcSegmentBufferSize(qrcodegen_Mode_ALPHANUMERIC, textLen) > bufLen)
+                       goto fail;
+               seg = qrcodegen_makeAlphanumeric(text, tempBuffer);
+       } else {
+               if (textLen > bufLen)
+                       goto fail;
+               for (size_t i = 0; i < textLen; i++)
+                       tempBuffer[i] = (uint8_t)text[i];
+               seg.mode = qrcodegen_Mode_BYTE;
+               seg.bitLength = calcSegmentBitLength(seg.mode, textLen);
+               if (seg.bitLength == -1)
+                       goto fail;
+               seg.numChars = (int)textLen;
+               seg.data = tempBuffer;
+       }
+       return qrcodegen_encodeSegmentsAdvanced(&seg, 1, ecl, minVersion, maxVersion, mask, boostEcl, 
tempBuffer, qrcode);
+
+fail:
+       qrcode[0] = 0;  // Set size to invalid value for safety
+       return false;
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcode[],
+               enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool 
boostEcl) {
+
+       struct qrcodegen_Segment seg;
+       seg.mode = qrcodegen_Mode_BYTE;
+       seg.bitLength = calcSegmentBitLength(seg.mode, dataLen);
+       if (seg.bitLength == -1) {
+               qrcode[0] = 0;  // Set size to invalid value for safety
+               return false;
+       }
+       seg.numChars = (int)dataLen;
+       seg.data = dataAndTemp;
+       return qrcodegen_encodeSegmentsAdvanced(&seg, 1, ecl, minVersion, maxVersion, mask, boostEcl, 
dataAndTemp, qrcode);
+}
+
+
+// Appends the given number of low-order bits of the given value to the given byte-based
+// bit buffer, increasing the bit length. Requires 0 <= numBits <= 16 and val < 2^numBits.
+testable void appendBitsToBuffer(unsigned int val, int numBits, uint8_t buffer[], int *bitLen) {
+       assert(0 <= numBits && numBits <= 16 && (unsigned long)val >> numBits == 0);
+       for (int i = numBits - 1; i >= 0; i--, (*bitLen)++)
+               buffer[*bitLen >> 3] |= ((val >> i) & 1) << (7 - (*bitLen & 7));
+}
+
+
+
+/*---- Low-level QR Code encoding functions ----*/
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len,
+               enum qrcodegen_Ecc ecl, uint8_t tempBuffer[], uint8_t qrcode[]) {
+       return qrcodegen_encodeSegmentsAdvanced(segs, len, ecl,
+               qrcodegen_VERSION_MIN, qrcodegen_VERSION_MAX, -1, true, tempBuffer, qrcode);
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc 
ecl,
+               int minVersion, int maxVersion, int mask, bool boostEcl, uint8_t tempBuffer[], uint8_t 
qrcode[]) {
+       assert(segs != NULL || len == 0);
+       assert(qrcodegen_VERSION_MIN <= minVersion && minVersion <= maxVersion && maxVersion <= 
qrcodegen_VERSION_MAX);
+       assert(0 <= (int)ecl && (int)ecl <= 3 && -1 <= (int)mask && (int)mask <= 7);
+
+       // Find the minimal version number to use
+       int version, dataUsedBits;
+       for (version = minVersion; ; version++) {
+               int dataCapacityBits = getNumDataCodewords(version, ecl) * 8;  // Number of data bits 
available
+               dataUsedBits = getTotalBits(segs, len, version);
+               if (dataUsedBits != -1 && dataUsedBits <= dataCapacityBits)
+                       break;  // This version number is found to be suitable
+               if (version >= maxVersion) {  // All versions in the range could not fit the given data
+                       qrcode[0] = 0;  // Set size to invalid value for safety
+                       return false;
+               }
+       }
+       assert(dataUsedBits != -1);
+
+       // Increase the error correction level while the data still fits in the current version number
+       for (int i = (int)qrcodegen_Ecc_MEDIUM; i <= (int)qrcodegen_Ecc_HIGH; i++) {  // From low to high
+               if (boostEcl && dataUsedBits <= getNumDataCodewords(version, (enum qrcodegen_Ecc)i) * 8)
+                       ecl = (enum qrcodegen_Ecc)i;
+       }
+
+       // Concatenate all segments to create the data bit string
+       memset(qrcode, 0, qrcodegen_BUFFER_LEN_FOR_VERSION(version) * sizeof(qrcode[0]));
+       int bitLen = 0;
+       for (size_t i = 0; i < len; i++) {
+               const struct qrcodegen_Segment *seg = &segs[i];
+               appendBitsToBuffer((int)seg->mode, 4, qrcode, &bitLen);
+               appendBitsToBuffer(seg->numChars, numCharCountBits(seg->mode, version), qrcode, &bitLen);
+               for (int j = 0; j < seg->bitLength; j++)
+                       appendBitsToBuffer((seg->data[j >> 3] >> (7 - (j & 7))) & 1, 1, qrcode, &bitLen);
+       }
+       assert(bitLen == dataUsedBits);
+
+       // Add terminator and pad up to a byte if applicable
+       int dataCapacityBits = getNumDataCodewords(version, ecl) * 8;
+       assert(bitLen <= dataCapacityBits);
+       int terminatorBits = dataCapacityBits - bitLen;
+       if (terminatorBits > 4)
+               terminatorBits = 4;
+       appendBitsToBuffer(0, terminatorBits, qrcode, &bitLen);
+       appendBitsToBuffer(0, (8 - bitLen % 8) % 8, qrcode, &bitLen);
+       assert(bitLen % 8 == 0);
+
+       // Pad with alternating bytes until data capacity is reached
+       for (uint8_t padByte = 0xEC; bitLen < dataCapacityBits; padByte ^= 0xEC ^ 0x11)
+               appendBitsToBuffer(padByte, 8, qrcode, &bitLen);
+
+       // Draw function and data codeword modules
+       addEccAndInterleave(qrcode, version, ecl, tempBuffer);
+       initializeFunctionModules(version, qrcode);
+       drawCodewords(tempBuffer, getNumRawDataModules(version) / 8, qrcode);
+       drawWhiteFunctionModules(qrcode, version);
+       initializeFunctionModules(version, tempBuffer);
+
+       // Handle masking
+       if (mask == qrcodegen_Mask_AUTO) {  // Automatically choose best mask
+               long minPenalty = LONG_MAX;
+               for (int i = 0; i < 8; i++) {
+                       enum qrcodegen_Mask msk = (enum qrcodegen_Mask)i;
+                       drawFormatBits(ecl, msk, qrcode);
+                       applyMask(tempBuffer, qrcode, msk);
+                       long penalty = getPenaltyScore(qrcode);
+                       if (penalty < minPenalty) {
+                               mask = msk;
+                               minPenalty = penalty;
+                       }
+                       applyMask(tempBuffer, qrcode, msk);  // Undoes the mask due to XOR
+               }
+       }
+       assert(0 <= (int)mask && (int)mask <= 7);
+       drawFormatBits(ecl, mask, qrcode);
+       applyMask(tempBuffer, qrcode, mask);
+       return true;
+}
+
+
+
+/*---- Error correction code generation functions ----*/
+
+// Appends error correction bytes to each block of the given data array, then interleaves
+// bytes from the blocks and stores them in the result array. data[0 : dataLen] contains
+// the input data. data[dataLen : rawCodewords] is used as a temporary work area and will
+// be clobbered by this function. The final answer is stored in result[0 : rawCodewords].
+testable void addEccAndInterleave(uint8_t data[], int version, enum qrcodegen_Ecc ecl, uint8_t result[]) {
+       // Calculate parameter numbers
+       assert(0 <= (int)ecl && (int)ecl < 4 && qrcodegen_VERSION_MIN <= version && version <= 
qrcodegen_VERSION_MAX);
+       int numBlocks = NUM_ERROR_CORRECTION_BLOCKS[(int)ecl][version];
+       int blockEccLen = ECC_CODEWORDS_PER_BLOCK  [(int)ecl][version];
+       int rawCodewords = getNumRawDataModules(version) / 8;
+       int dataLen = getNumDataCodewords(version, ecl);
+       int numShortBlocks = numBlocks - rawCodewords % numBlocks;
+       int shortBlockDataLen = rawCodewords / numBlocks - blockEccLen;
+
+       // Split data into blocks, calculate ECC, and interleave
+       // (not concatenate) the bytes into a single sequence
+       uint8_t generator[qrcodegen_REED_SOLOMON_DEGREE_MAX];
+       calcReedSolomonGenerator(blockEccLen, generator);
+       const uint8_t *dat = data;
+       for (int i = 0; i < numBlocks; i++) {
+               int datLen = shortBlockDataLen + (i < numShortBlocks ? 0 : 1);
+               uint8_t *ecc = &data[dataLen];  // Temporary storage
+               calcReedSolomonRemainder(dat, datLen, generator, blockEccLen, ecc);
+               for (int j = 0, k = i; j < datLen; j++, k += numBlocks) {  // Copy data
+                       if (j == shortBlockDataLen)
+                               k -= numShortBlocks;
+                       result[k] = dat[j];
+               }
+               for (int j = 0, k = dataLen + i; j < blockEccLen; j++, k += numBlocks)  // Copy ECC
+                       result[k] = ecc[j];
+               dat += datLen;
+       }
+}
+
+
+// Returns the number of 8-bit codewords that can be used for storing data (not ECC),
+// for the given version number and error correction level. The result is in the range [9, 2956].
+testable int getNumDataCodewords(int version, enum qrcodegen_Ecc ecl) {
+       int v = version, e = (int)ecl;
+       assert(0 <= e && e < 4);
+       return getNumRawDataModules(v) / 8
+               - ECC_CODEWORDS_PER_BLOCK    [e][v]
+               * NUM_ERROR_CORRECTION_BLOCKS[e][v];
+}
+
+
+// Returns the number of data bits that can be stored in a QR Code of the given version number, after
+// all function modules are excluded. This includes remainder bits, so it might not be a multiple of 8.
+// The result is in the range [208, 29648]. This could be implemented as a 40-entry lookup table.
+testable int getNumRawDataModules(int ver) {
+       assert(qrcodegen_VERSION_MIN <= ver && ver <= qrcodegen_VERSION_MAX);
+       int result = (16 * ver + 128) * ver + 64;
+       if (ver >= 2) {
+               int numAlign = ver / 7 + 2;
+               result -= (25 * numAlign - 10) * numAlign - 55;
+               if (ver >= 7)
+                       result -= 36;
+       }
+       return result;
+}
+
+
+
+/*---- Reed-Solomon ECC generator functions ----*/
+
+// Calculates the Reed-Solomon generator polynomial of the given degree, storing in result[0 : degree].
+testable void calcReedSolomonGenerator(int degree, uint8_t result[]) {
+       // Start with the monomial x^0
+       assert(1 <= degree && degree <= qrcodegen_REED_SOLOMON_DEGREE_MAX);
+       memset(result, 0, degree * sizeof(result[0]));
+       result[degree - 1] = 1;
+
+       // Compute the product polynomial (x - r^0) * (x - r^1) * (x - r^2) * ... * (x - r^{degree-1}),
+       // drop the highest term, and store the rest of the coefficients in order of descending powers.
+       // Note that r = 0x02, which is a generator element of this field GF(2^8/0x11D).
+       uint8_t root = 1;
+       for (int i = 0; i < degree; i++) {
+               // Multiply the current product by (x - r^i)
+               for (int j = 0; j < degree; j++) {
+                       result[j] = finiteFieldMultiply(result[j], root);
+                       if (j + 1 < degree)
+                               result[j] ^= result[j + 1];
+               }
+               root = finiteFieldMultiply(root, 0x02);
+       }
+}
+
+
+// Calculates the remainder of the polynomial data[0 : dataLen] when divided by the generator[0 : degree], 
where all
+// polynomials are in big endian and the generator has an implicit leading 1 term, storing the result in 
result[0 : degree].
+testable void calcReedSolomonRemainder(const uint8_t data[], int dataLen,
+               const uint8_t generator[], int degree, uint8_t result[]) {
+
+       // Perform polynomial division
+       assert(1 <= degree && degree <= qrcodegen_REED_SOLOMON_DEGREE_MAX);
+       memset(result, 0, degree * sizeof(result[0]));
+       for (int i = 0; i < dataLen; i++) {
+               uint8_t factor = data[i] ^ result[0];
+               memmove(&result[0], &result[1], (degree - 1) * sizeof(result[0]));
+               result[degree - 1] = 0;
+               for (int j = 0; j < degree; j++)
+                       result[j] ^= finiteFieldMultiply(generator[j], factor);
+       }
+}
+
+#undef qrcodegen_REED_SOLOMON_DEGREE_MAX
+
+
+// Returns the product of the two given field elements modulo GF(2^8/0x11D).
+// All inputs are valid. This could be implemented as a 256*256 lookup table.
+testable uint8_t finiteFieldMultiply(uint8_t x, uint8_t y) {
+       // Russian peasant multiplication
+       uint8_t z = 0;
+       for (int i = 7; i >= 0; i--) {
+               z = (z << 1) ^ ((z >> 7) * 0x11D);
+               z ^= ((y >> i) & 1) * x;
+       }
+       return z;
+}
+
+
+
+/*---- Drawing function modules ----*/
+
+// Clears the given QR Code grid with white modules for the given
+// version's size, then marks every function module as black.
+testable void initializeFunctionModules(int version, uint8_t qrcode[]) {
+       // Initialize QR Code
+       int qrsize = version * 4 + 17;
+       memset(qrcode, 0, ((qrsize * qrsize + 7) / 8 + 1) * sizeof(qrcode[0]));
+       qrcode[0] = (uint8_t)qrsize;
+
+       // Fill horizontal and vertical timing patterns
+       fillRectangle(6, 0, 1, qrsize, qrcode);
+       fillRectangle(0, 6, qrsize, 1, qrcode);
+
+       // Fill 3 finder patterns (all corners except bottom right) and format bits
+       fillRectangle(0, 0, 9, 9, qrcode);
+       fillRectangle(qrsize - 8, 0, 8, 9, qrcode);
+       fillRectangle(0, qrsize - 8, 9, 8, qrcode);
+
+       // Fill numerous alignment patterns
+       uint8_t alignPatPos[7];
+       int numAlign = getAlignmentPatternPositions(version, alignPatPos);
+       for (int i = 0; i < numAlign; i++) {
+               for (int j = 0; j < numAlign; j++) {
+                       // Don't draw on the three finder corners
+                       if (!((i == 0 && j == 0) || (i == 0 && j == numAlign - 1) || (i == numAlign - 1 && j 
== 0)))
+                               fillRectangle(alignPatPos[i] - 2, alignPatPos[j] - 2, 5, 5, qrcode);
+               }
+       }
+
+       // Fill version blocks
+       if (version >= 7) {
+               fillRectangle(qrsize - 11, 0, 3, 6, qrcode);
+               fillRectangle(0, qrsize - 11, 6, 3, qrcode);
+       }
+}
+
+
+// Draws white function modules and possibly some black modules onto the given QR Code, without changing
+// non-function modules. This does not draw the format bits. This requires all function modules to be 
previously
+// marked black (namely by initializeFunctionModules()), because this may skip redrawing black function 
modules.
+static void drawWhiteFunctionModules(uint8_t qrcode[], int version) {
+       // Draw horizontal and vertical timing patterns
+       int qrsize = qrcodegen_getSize(qrcode);
+       for (int i = 7; i < qrsize - 7; i += 2) {
+               setModule(qrcode, 6, i, false);
+               setModule(qrcode, i, 6, false);
+       }
+
+       // Draw 3 finder patterns (all corners except bottom right; overwrites some timing modules)
+       for (int dy = -4; dy <= 4; dy++) {
+               for (int dx = -4; dx <= 4; dx++) {
+                       int dist = abs(dx);
+                       if (abs(dy) > dist)
+                               dist = abs(dy);
+                       if (dist == 2 || dist == 4) {
+                               setModuleBounded(qrcode, 3 + dx, 3 + dy, false);
+                               setModuleBounded(qrcode, qrsize - 4 + dx, 3 + dy, false);
+                               setModuleBounded(qrcode, 3 + dx, qrsize - 4 + dy, false);
+                       }
+               }
+       }
+
+       // Draw numerous alignment patterns
+       uint8_t alignPatPos[7];
+       int numAlign = getAlignmentPatternPositions(version, alignPatPos);
+       for (int i = 0; i < numAlign; i++) {
+               for (int j = 0; j < numAlign; j++) {
+                       if ((i == 0 && j == 0) || (i == 0 && j == numAlign - 1) || (i == numAlign - 1 && j == 
0))
+                               continue;  // Don't draw on the three finder corners
+                       for (int dy = -1; dy <= 1; dy++) {
+                               for (int dx = -1; dx <= 1; dx++)
+                                       setModule(qrcode, alignPatPos[i] + dx, alignPatPos[j] + dy, dx == 0 
&& dy == 0);
+                       }
+               }
+       }
+
+       // Draw version blocks
+       if (version >= 7) {
+               // Calculate error correction code and pack bits
+               int rem = version;  // version is uint6, in the range [7, 40]
+               for (int i = 0; i < 12; i++)
+                       rem = (rem << 1) ^ ((rem >> 11) * 0x1F25);
+               long bits = (long)version << 12 | rem;  // uint18
+               assert(bits >> 18 == 0);
+
+               // Draw two copies
+               for (int i = 0; i < 6; i++) {
+                       for (int j = 0; j < 3; j++) {
+                               int k = qrsize - 11 + j;
+                               setModule(qrcode, k, i, (bits & 1) != 0);
+                               setModule(qrcode, i, k, (bits & 1) != 0);
+                               bits >>= 1;
+                       }
+               }
+       }
+}
+
+
+// Draws two copies of the format bits (with its own error correction code) based
+// on the given mask and error correction level. This always draws all modules of
+// the format bits, unlike drawWhiteFunctionModules() which might skip black modules.
+static void drawFormatBits(enum qrcodegen_Ecc ecl, enum qrcodegen_Mask mask, uint8_t qrcode[]) {
+       // Calculate error correction code and pack bits
+       assert(0 <= (int)mask && (int)mask <= 7);
+       static const int table[] = {1, 0, 3, 2};
+       int data = table[(int)ecl] << 3 | (int)mask;  // errCorrLvl is uint2, mask is uint3
+       int rem = data;
+       for (int i = 0; i < 10; i++)
+               rem = (rem << 1) ^ ((rem >> 9) * 0x537);
+       int bits = (data << 10 | rem) ^ 0x5412;  // uint15
+       assert(bits >> 15 == 0);
+
+       // Draw first copy
+       for (int i = 0; i <= 5; i++)
+               setModule(qrcode, 8, i, getBit(bits, i));
+       setModule(qrcode, 8, 7, getBit(bits, 6));
+       setModule(qrcode, 8, 8, getBit(bits, 7));
+       setModule(qrcode, 7, 8, getBit(bits, 8));
+       for (int i = 9; i < 15; i++)
+               setModule(qrcode, 14 - i, 8, getBit(bits, i));
+
+       // Draw second copy
+       int qrsize = qrcodegen_getSize(qrcode);
+       for (int i = 0; i < 8; i++)
+               setModule(qrcode, qrsize - 1 - i, 8, getBit(bits, i));
+       for (int i = 8; i < 15; i++)
+               setModule(qrcode, 8, qrsize - 15 + i, getBit(bits, i));
+       setModule(qrcode, 8, qrsize - 8, true);  // Always black
+}
+
+
+// Calculates and stores an ascending list of positions of alignment patterns
+// for this version number, returning the length of the list (in the range [0,7]).
+// Each position is in the range [0,177), and are used on both the x and y axes.
+// This could be implemented as lookup table of 40 variable-length lists of unsigned bytes.
+testable int getAlignmentPatternPositions(int version, uint8_t result[7]) {
+       if (version == 1)
+               return 0;
+       int numAlign = version / 7 + 2;
+       int step = (version == 32) ? 26 :
+               (version*4 + numAlign*2 + 1) / (numAlign*2 - 2) * 2;
+       for (int i = numAlign - 1, pos = version * 4 + 10; i >= 1; i--, pos -= step)
+               result[i] = pos;
+       result[0] = 6;
+       return numAlign;
+}
+
+
+// Sets every pixel in the range [left : left + width] * [top : top + height] to black.
+static void fillRectangle(int left, int top, int width, int height, uint8_t qrcode[]) {
+       for (int dy = 0; dy < height; dy++) {
+               for (int dx = 0; dx < width; dx++)
+                       setModule(qrcode, left + dx, top + dy, true);
+       }
+}
+
+
+
+/*---- Drawing data modules and masking ----*/
+
+// Draws the raw codewords (including data and ECC) onto the given QR Code. This requires the initial state 
of
+// the QR Code to be black at function modules and white at codeword modules (including unused remainder 
bits).
+static void drawCodewords(const uint8_t data[], int dataLen, uint8_t qrcode[]) {
+       int qrsize = qrcodegen_getSize(qrcode);
+       int i = 0;  // Bit index into the data
+       // Do the funny zigzag scan
+       for (int right = qrsize - 1; right >= 1; right -= 2) {  // Index of right column in each column pair
+               if (right == 6)
+                       right = 5;
+               for (int vert = 0; vert < qrsize; vert++) {  // Vertical counter
+                       for (int j = 0; j < 2; j++) {
+                               int x = right - j;  // Actual x coordinate
+                               bool upward = ((right + 1) & 2) == 0;
+                               int y = upward ? qrsize - 1 - vert : vert;  // Actual y coordinate
+                               if (!getModule(qrcode, x, y) && i < dataLen * 8) {
+                                       bool black = getBit(data[i >> 3], 7 - (i & 7));
+                                       setModule(qrcode, x, y, black);
+                                       i++;
+                               }
+                               // If this QR Code has any remainder bits (0 to 7), they were assigned as
+                               // 0/false/white by the constructor and are left unchanged by this method
+                       }
+               }
+       }
+       assert(i == dataLen * 8);
+}
+
+
+// XORs the codeword modules in this QR Code with the given mask pattern.
+// The function modules must be marked and the codeword bits must be drawn
+// before masking. Due to the arithmetic of XOR, calling applyMask() with
+// the same mask value a second time will undo the mask. A final well-formed
+// QR Code needs exactly one (not zero, two, etc.) mask applied.
+static void applyMask(const uint8_t functionModules[], uint8_t qrcode[], enum qrcodegen_Mask mask) {
+       assert(0 <= (int)mask && (int)mask <= 7);  // Disallows qrcodegen_Mask_AUTO
+       int qrsize = qrcodegen_getSize(qrcode);
+       for (int y = 0; y < qrsize; y++) {
+               for (int x = 0; x < qrsize; x++) {
+                       if (getModule(functionModules, x, y))
+                               continue;
+                       bool invert;
+                       switch ((int)mask) {
+                               case 0:  invert = (x + y) % 2 == 0;                    break;
+                               case 1:  invert = y % 2 == 0;                          break;
+                               case 2:  invert = x % 3 == 0;                          break;
+                               case 3:  invert = (x + y) % 3 == 0;                    break;
+                               case 4:  invert = (x / 3 + y / 2) % 2 == 0;            break;
+                               case 5:  invert = x * y % 2 + x * y % 3 == 0;          break;
+                               case 6:  invert = (x * y % 2 + x * y % 3) % 2 == 0;    break;
+                               case 7:  invert = ((x + y) % 2 + x * y % 3) % 2 == 0;  break;
+                               default:  assert(false);  return;
+                       }
+                       bool val = getModule(qrcode, x, y);
+                       setModule(qrcode, x, y, val ^ invert);
+               }
+       }
+}
+
+
+// Calculates and returns the penalty score based on state of the given QR Code's current modules.
+// This is used by the automatic mask choice algorithm to find the mask pattern that yields the lowest score.
+static long getPenaltyScore(const uint8_t qrcode[]) {
+       int qrsize = qrcodegen_getSize(qrcode);
+       long result = 0;
+
+       // Adjacent modules in row having same color, and finder-like patterns
+       for (int y = 0; y < qrsize; y++) {
+               unsigned char runHistory[7] = {0};
+               bool color = false;
+               unsigned char runX = 0;
+               for (int x = 0; x < qrsize; x++) {
+                       if (getModule(qrcode, x, y) == color) {
+                               runX++;
+                               if (runX == 5)
+                                       result += PENALTY_N1;
+                               else if (runX > 5)
+                                       result++;
+                       } else {
+                               addRunToHistory(runX, runHistory);
+                               if (!color && hasFinderLikePattern(runHistory))
+                                       result += PENALTY_N3;
+                               color = getModule(qrcode, x, y);
+                               runX = 1;
+                       }
+               }
+               addRunToHistory(runX, runHistory);
+               if (color)
+                       addRunToHistory(0, runHistory);  // Dummy run of white
+               if (hasFinderLikePattern(runHistory))
+                       result += PENALTY_N3;
+       }
+       // Adjacent modules in column having same color, and finder-like patterns
+       for (int x = 0; x < qrsize; x++) {
+               unsigned char runHistory[7] = {0};
+               bool color = false;
+               unsigned char runY = 0;
+               for (int y = 0; y < qrsize; y++) {
+                       if (getModule(qrcode, x, y) == color) {
+                               runY++;
+                               if (runY == 5)
+                                       result += PENALTY_N1;
+                               else if (runY > 5)
+                                       result++;
+                       } else {
+                               addRunToHistory(runY, runHistory);
+                               if (!color && hasFinderLikePattern(runHistory))
+                                       result += PENALTY_N3;
+                               color = getModule(qrcode, x, y);
+                               runY = 1;
+                       }
+               }
+               addRunToHistory(runY, runHistory);
+               if (color)
+                       addRunToHistory(0, runHistory);  // Dummy run of white
+               if (hasFinderLikePattern(runHistory))
+                       result += PENALTY_N3;
+       }
+
+       // 2*2 blocks of modules having same color
+       for (int y = 0; y < qrsize - 1; y++) {
+               for (int x = 0; x < qrsize - 1; x++) {
+                       bool  color = getModule(qrcode, x, y);
+                       if (  color == getModule(qrcode, x + 1, y) &&
+                             color == getModule(qrcode, x, y + 1) &&
+                             color == getModule(qrcode, x + 1, y + 1))
+                               result += PENALTY_N2;
+               }
+       }
+
+       // Balance of black and white modules
+       int black = 0;
+       for (int y = 0; y < qrsize; y++) {
+               for (int x = 0; x < qrsize; x++) {
+                       if (getModule(qrcode, x, y))
+                               black++;
+               }
+       }
+       int total = qrsize * qrsize;  // Note that size is odd, so black/total != 1/2
+       // Compute the smallest integer k >= 0 such that (45-5k)% <= black/total <= (55+5k)%
+       int k = (int)((labs(black * 20L - total * 10L) + total - 1) / total) - 1;
+       result += k * PENALTY_N4;
+       return result;
+}
+
+
+// Inserts the given value to the front of the given array, which shifts over the
+// existing values and deletes the last value. A helper function for getPenaltyScore().
+static void addRunToHistory(unsigned char run, unsigned char history[7]) {
+       memmove(&history[1], &history[0], 6 * sizeof(history[0]));
+       history[0] = run;
+}
+
+
+// Tests whether the given run history has the pattern of ratio 1:1:3:1:1 in the middle, and
+// surrounded by at least 4 on either or both ends. A helper function for getPenaltyScore().
+// Must only be called immediately after a run of white modules has ended.
+static bool hasFinderLikePattern(unsigned char runHistory[7]) {
+       unsigned char n = runHistory[1];
+       // The maximum QR Code size is 177, hence the run length n <= 177.
+       // Arithmetic is promoted to int, so n*4 will not overflow.
+       return n > 0 && runHistory[2] == n && runHistory[4] == n && runHistory[5] == n
+               && runHistory[3] == n * 3 && (runHistory[0] >= n * 4 || runHistory[6] >= n * 4);
+}
+
+
+
+/*---- Basic QR Code information ----*/
+
+// Public function - see documentation comment in header file.
+int qrcodegen_getSize(const uint8_t qrcode[]) {
+       assert(qrcode != NULL);
+       int result = qrcode[0];
+       assert((qrcodegen_VERSION_MIN * 4 + 17) <= result
+               && result <= (qrcodegen_VERSION_MAX * 4 + 17));
+       return result;
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y) {
+       assert(qrcode != NULL);
+       int qrsize = qrcode[0];
+       return (0 <= x && x < qrsize && 0 <= y && y < qrsize) && getModule(qrcode, x, y);
+}
+
+
+// Gets the module at the given coordinates, which must be in bounds.
+testable bool getModule(const uint8_t qrcode[], int x, int y) {
+       int qrsize = qrcode[0];
+       assert(21 <= qrsize && qrsize <= 177 && 0 <= x && x < qrsize && 0 <= y && y < qrsize);
+       int index = y * qrsize + x;
+       return getBit(qrcode[(index >> 3) + 1], index & 7);
+}
+
+
+// Sets the module at the given coordinates, which must be in bounds.
+testable void setModule(uint8_t qrcode[], int x, int y, bool isBlack) {
+       int qrsize = qrcode[0];
+       assert(21 <= qrsize && qrsize <= 177 && 0 <= x && x < qrsize && 0 <= y && y < qrsize);
+       int index = y * qrsize + x;
+       int bitIndex = index & 7;
+       int byteIndex = (index >> 3) + 1;
+       if (isBlack)
+               qrcode[byteIndex] |= 1 << bitIndex;
+       else
+               qrcode[byteIndex] &= (1 << bitIndex) ^ 0xFF;
+}
+
+
+// Sets the module at the given coordinates, doing nothing if out of bounds.
+testable void setModuleBounded(uint8_t qrcode[], int x, int y, bool isBlack) {
+       int qrsize = qrcode[0];
+       if (0 <= x && x < qrsize && 0 <= y && y < qrsize)
+               setModule(qrcode, x, y, isBlack);
+}
+
+
+// Returns true iff the i'th bit of x is set to 1. Requires x >= 0 and 0 <= i <= 14.
+static bool getBit(int x, int i) {
+       return ((x >> i) & 1) != 0;
+}
+
+
+
+/*---- Segment handling ----*/
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_isAlphanumeric(const char *text) {
+       assert(text != NULL);
+       for (; *text != '\0'; text++) {
+               if (strchr(ALPHANUMERIC_CHARSET, *text) == NULL)
+                       return false;
+       }
+       return true;
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_isNumeric(const char *text) {
+       assert(text != NULL);
+       for (; *text != '\0'; text++) {
+               if (*text < '0' || *text > '9')
+                       return false;
+       }
+       return true;
+}
+
+
+// Public function - see documentation comment in header file.
+size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars) {
+       int temp = calcSegmentBitLength(mode, numChars);
+       if (temp == -1)
+               return SIZE_MAX;
+       assert(0 <= temp && temp <= INT16_MAX);
+       return ((size_t)temp + 7) / 8;
+}
+
+
+// Returns the number of data bits needed to represent a segment
+// containing the given number of characters using the given mode. Notes:
+// - Returns -1 on failure, i.e. numChars > INT16_MAX or
+//   the number of needed bits exceeds INT16_MAX (i.e. 32767).
+// - Otherwise, all valid results are in the range [0, INT16_MAX].
+// - For byte mode, numChars measures the number of bytes, not Unicode code points.
+// - For ECI mode, numChars must be 0, and the worst-case number of bits is returned.
+//   An actual ECI segment can have shorter data. For non-ECI modes, the result is exact.
+testable int calcSegmentBitLength(enum qrcodegen_Mode mode, size_t numChars) {
+       // All calculations are designed to avoid overflow on all platforms
+       if (numChars > (unsigned int)INT16_MAX)
+               return -1;
+       long result = (long)numChars;
+       if (mode == qrcodegen_Mode_NUMERIC)
+               result = (result * 10 + 2) / 3;  // ceil(10/3 * n)
+       else if (mode == qrcodegen_Mode_ALPHANUMERIC)
+               result = (result * 11 + 1) / 2;  // ceil(11/2 * n)
+       else if (mode == qrcodegen_Mode_BYTE)
+               result *= 8;
+       else if (mode == qrcodegen_Mode_KANJI)
+               result *= 13;
+       else if (mode == qrcodegen_Mode_ECI && numChars == 0)
+               result = 3 * 8;
+       else {  // Invalid argument
+               assert(false);
+               return -1;
+       }
+       assert(result >= 0);
+       if (result > (unsigned int)INT16_MAX)
+               return -1;
+       return (int)result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, uint8_t buf[]) {
+       assert(data != NULL || len == 0);
+       struct qrcodegen_Segment result;
+       result.mode = qrcodegen_Mode_BYTE;
+       result.bitLength = calcSegmentBitLength(result.mode, len);
+       assert(result.bitLength != -1);
+       result.numChars = (int)len;
+       if (len > 0)
+               memcpy(buf, data, len * sizeof(buf[0]));
+       result.data = buf;
+       return result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]) {
+       assert(digits != NULL);
+       struct qrcodegen_Segment result;
+       size_t len = strlen(digits);
+       result.mode = qrcodegen_Mode_NUMERIC;
+       int bitLen = calcSegmentBitLength(result.mode, len);
+       assert(bitLen != -1);
+       result.numChars = (int)len;
+       if (bitLen > 0)
+               memset(buf, 0, ((size_t)bitLen + 7) / 8 * sizeof(buf[0]));
+       result.bitLength = 0;
+
+       unsigned int accumData = 0;
+       int accumCount = 0;
+       for (; *digits != '\0'; digits++) {
+               char c = *digits;
+               assert('0' <= c && c <= '9');
+               accumData = accumData * 10 + (unsigned int)(c - '0');
+               accumCount++;
+               if (accumCount == 3) {
+                       appendBitsToBuffer(accumData, 10, buf, &result.bitLength);
+                       accumData = 0;
+                       accumCount = 0;
+               }
+       }
+       if (accumCount > 0)  // 1 or 2 digits remaining
+               appendBitsToBuffer(accumData, accumCount * 3 + 1, buf, &result.bitLength);
+       assert(result.bitLength == bitLen);
+       result.data = buf;
+       return result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t buf[]) {
+       assert(text != NULL);
+       struct qrcodegen_Segment result;
+       size_t len = strlen(text);
+       result.mode = qrcodegen_Mode_ALPHANUMERIC;
+       int bitLen = calcSegmentBitLength(result.mode, len);
+       assert(bitLen != -1);
+       result.numChars = (int)len;
+       if (bitLen > 0)
+               memset(buf, 0, ((size_t)bitLen + 7) / 8 * sizeof(buf[0]));
+       result.bitLength = 0;
+
+       unsigned int accumData = 0;
+       int accumCount = 0;
+       for (; *text != '\0'; text++) {
+               const char *temp = strchr(ALPHANUMERIC_CHARSET, *text);
+               assert(temp != NULL);
+               accumData = accumData * 45 + (unsigned int)(temp - ALPHANUMERIC_CHARSET);
+               accumCount++;
+               if (accumCount == 2) {
+                       appendBitsToBuffer(accumData, 11, buf, &result.bitLength);
+                       accumData = 0;
+                       accumCount = 0;
+               }
+       }
+       if (accumCount > 0)  // 1 character remaining
+               appendBitsToBuffer(accumData, 6, buf, &result.bitLength);
+       assert(result.bitLength == bitLen);
+       result.data = buf;
+       return result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]) {
+       struct qrcodegen_Segment result;
+       result.mode = qrcodegen_Mode_ECI;
+       result.numChars = 0;
+       result.bitLength = 0;
+       if (assignVal < 0)
+               assert(false);
+       else if (assignVal < (1 << 7)) {
+               memset(buf, 0, 1 * sizeof(buf[0]));
+               appendBitsToBuffer(assignVal, 8, buf, &result.bitLength);
+       } else if (assignVal < (1 << 14)) {
+               memset(buf, 0, 2 * sizeof(buf[0]));
+               appendBitsToBuffer(2, 2, buf, &result.bitLength);
+               appendBitsToBuffer(assignVal, 14, buf, &result.bitLength);
+       } else if (assignVal < 1000000L) {
+               memset(buf, 0, 3 * sizeof(buf[0]));
+               appendBitsToBuffer(6, 3, buf, &result.bitLength);
+               appendBitsToBuffer(assignVal >> 10, 11, buf, &result.bitLength);
+               appendBitsToBuffer(assignVal & 0x3FF, 10, buf, &result.bitLength);
+       } else
+               assert(false);
+       result.data = buf;
+       return result;
+}
+
+
+// Calculates the number of bits needed to encode the given segments at the given version.
+// Returns a non-negative number if successful. Otherwise returns -1 if a segment has too
+// many characters to fit its length field, or the total bits exceeds INT16_MAX.
+testable int getTotalBits(const struct qrcodegen_Segment segs[], size_t len, int version) {
+       assert(segs != NULL || len == 0);
+       long result = 0;
+       for (size_t i = 0; i < len; i++) {
+               int numChars  = segs[i].numChars;
+               int bitLength = segs[i].bitLength;
+               assert(0 <= numChars  && numChars  <= INT16_MAX);
+               assert(0 <= bitLength && bitLength <= INT16_MAX);
+               int ccbits = numCharCountBits(segs[i].mode, version);
+               assert(0 <= ccbits && ccbits <= 16);
+               if (numChars >= (1L << ccbits))
+                       return -1;  // The segment's length doesn't fit the field's bit width
+               result += 4L + ccbits + bitLength;
+               if (result > INT16_MAX)
+                       return -1;  // The sum might overflow an int type
+       }
+       assert(0 <= result && result <= INT16_MAX);
+       return (int)result;
+}
+
+
+// Returns the bit width of the character count field for a segment in the given mode
+// in a QR Code at the given version number. The result is in the range [0, 16].
+static int numCharCountBits(enum qrcodegen_Mode mode, int version) {
+       assert(qrcodegen_VERSION_MIN <= version && version <= qrcodegen_VERSION_MAX);
+       int i = (version + 7) / 17;
+       switch (mode) {
+               case qrcodegen_Mode_NUMERIC     : { static const int temp[] = {10, 12, 14}; return temp[i]; }
+               case qrcodegen_Mode_ALPHANUMERIC: { static const int temp[] = { 9, 11, 13}; return temp[i]; }
+               case qrcodegen_Mode_BYTE        : { static const int temp[] = { 8, 16, 16}; return temp[i]; }
+               case qrcodegen_Mode_KANJI       : { static const int temp[] = { 8, 10, 12}; return temp[i]; }
+               case qrcodegen_Mode_ECI         : return 0;
+               default:  assert(false);  return -1;  // Dummy value
+       }
+}
diff --git a/src/libnma/qrcodegen.h b/src/libnma/qrcodegen.h
new file mode 100644
index 00000000..55e2bfec
--- /dev/null
+++ b/src/libnma/qrcodegen.h
@@ -0,0 +1,311 @@
+/*
+ * QR Code generator library (C)
+ *
+ * Copyright (c) Project Nayuki. (MIT License)
+ * https://www.nayuki.io/page/qr-code-generator-library
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ * - The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ * - The Software is provided "as is", without warranty of any kind, express or
+ *   implied, including but not limited to the warranties of merchantability,
+ *   fitness for a particular purpose and noninfringement. In no event shall the
+ *   authors or copyright holders be liable for any claim, damages or other
+ *   liability, whether in an action of contract, tort or otherwise, arising from,
+ *   out of or in connection with the Software or the use or other dealings in the
+ *   Software.
+ */
+
+#pragma once
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+ * This library creates QR Code symbols, which is a type of two-dimension barcode.
+ * Invented by Denso Wave and described in the ISO/IEC 18004 standard.
+ * A QR Code structure is an immutable square grid of black and white cells.
+ * The library provides functions to create a QR Code from text or binary data.
+ * The library covers the QR Code Model 2 specification, supporting all versions (sizes)
+ * from 1 to 40, all 4 error correction levels, and 4 character encoding modes.
+ *
+ * Ways to create a QR Code object:
+ * - High level: Take the payload data and call qrcodegen_encodeText() or qrcodegen_encodeBinary().
+ * - Low level: Custom-make the list of segments and call
+ *   qrcodegen_encodeSegments() or qrcodegen_encodeSegmentsAdvanced().
+ * (Note that all ways require supplying the desired error correction level and various byte buffers.)
+ */
+
+
+/*---- Enum and struct types----*/
+
+/*
+ * The error correction level in a QR Code symbol.
+ */
+enum qrcodegen_Ecc {
+       // Must be declared in ascending order of error protection
+       // so that an internal qrcodegen function works properly
+       qrcodegen_Ecc_LOW = 0 ,  // The QR Code can tolerate about  7% erroneous codewords
+       qrcodegen_Ecc_MEDIUM  ,  // The QR Code can tolerate about 15% erroneous codewords
+       qrcodegen_Ecc_QUARTILE,  // The QR Code can tolerate about 25% erroneous codewords
+       qrcodegen_Ecc_HIGH    ,  // The QR Code can tolerate about 30% erroneous codewords
+};
+
+
+/*
+ * The mask pattern used in a QR Code symbol.
+ */
+enum qrcodegen_Mask {
+       // A special value to tell the QR Code encoder to
+       // automatically select an appropriate mask pattern
+       qrcodegen_Mask_AUTO = -1,
+       // The eight actual mask patterns
+       qrcodegen_Mask_0 = 0,
+       qrcodegen_Mask_1,
+       qrcodegen_Mask_2,
+       qrcodegen_Mask_3,
+       qrcodegen_Mask_4,
+       qrcodegen_Mask_5,
+       qrcodegen_Mask_6,
+       qrcodegen_Mask_7,
+};
+
+
+/*
+ * Describes how a segment's data bits are interpreted.
+ */
+enum qrcodegen_Mode {
+       qrcodegen_Mode_NUMERIC      = 0x1,
+       qrcodegen_Mode_ALPHANUMERIC = 0x2,
+       qrcodegen_Mode_BYTE         = 0x4,
+       qrcodegen_Mode_KANJI        = 0x8,
+       qrcodegen_Mode_ECI          = 0x7,
+};
+
+
+/*
+ * A segment of character/binary/control data in a QR Code symbol.
+ * The mid-level way to create a segment is to take the payload data
+ * and call a factory function such as qrcodegen_makeNumeric().
+ * The low-level way to create a segment is to custom-make the bit buffer
+ * and initialize a qrcodegen_Segment struct with appropriate values.
+ * Even in the most favorable conditions, a QR Code can only hold 7089 characters of data.
+ * Any segment longer than this is meaningless for the purpose of generating QR Codes.
+ * Moreover, the maximum allowed bit length is 32767 because
+ * the largest QR Code (version 40) has 31329 modules.
+ */
+struct qrcodegen_Segment {
+       // The mode indicator of this segment.
+       enum qrcodegen_Mode mode;
+
+       // The length of this segment's unencoded data. Measured in characters for
+       // numeric/alphanumeric/kanji mode, bytes for byte mode, and 0 for ECI mode.
+       // Always zero or positive. Not the same as the data's bit length.
+       int numChars;
+
+       // The data bits of this segment, packed in bitwise big endian.
+       // Can be null if the bit length is zero.
+       uint8_t *data;
+
+       // The number of valid data bits used in the buffer. Requires
+       // 0 <= bitLength <= 32767, and bitLength <= (capacity of data array) * 8.
+       // The character count (numChars) must agree with the mode and the bit buffer length.
+       int bitLength;
+};
+
+
+
+/*---- Macro constants and functions ----*/
+
+#define qrcodegen_VERSION_MIN   1  // The minimum version number supported in the QR Code Model 2 standard
+#define qrcodegen_VERSION_MAX  40  // The maximum version number supported in the QR Code Model 2 standard
+
+// Calculates the number of bytes needed to store any QR Code up to and including the given version number,
+// as a compile-time constant. For example, 'uint8_t buffer[qrcodegen_BUFFER_LEN_FOR_VERSION(25)];'
+// can store any single QR Code from version 1 to 25 (inclusive). The result fits in an int (or int16).
+// Requires qrcodegen_VERSION_MIN <= n <= qrcodegen_VERSION_MAX.
+#define qrcodegen_BUFFER_LEN_FOR_VERSION(n)  ((((n) * 4 + 17) * ((n) * 4 + 17) + 7) / 8 + 1)
+
+// The worst-case number of bytes needed to store one QR Code, up to and including
+// version 40. This value equals 3918, which is just under 4 kilobytes.
+// Use this more convenient value to avoid calculating tighter memory bounds for buffers.
+#define qrcodegen_BUFFER_LEN_MAX  qrcodegen_BUFFER_LEN_FOR_VERSION(qrcodegen_VERSION_MAX)
+
+
+
+/*---- Functions (high level) to generate QR Codes ----*/
+
+/*
+ * Encodes the given text string to a QR Code, returning true if encoding succeeded.
+ * If the data is too long to fit in any version in the given range
+ * at the given ECC level, then false is returned.
+ * - The input text must be encoded in UTF-8 and contain no NULs.
+ * - The variables ecl and mask must correspond to enum constant values.
+ * - Requires 1 <= minVersion <= maxVersion <= 40.
+ * - The arrays tempBuffer and qrcode must each have a length
+ *   of at least qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion).
+ * - After the function returns, tempBuffer contains no useful data.
+ * - If successful, the resulting QR Code may use numeric,
+ *   alphanumeric, or byte mode to encode the text.
+ * - In the most optimistic case, a QR Code at version 40 with low ECC
+ *   can hold any UTF-8 string up to 2953 bytes, or any alphanumeric string
+ *   up to 4296 characters, or any digit string up to 7089 characters.
+ *   These numbers represent the hard upper limit of the QR Code standard.
+ * - Please consult the QR Code specification for information on
+ *   data capacities per version, ECC level, and text encoding mode.
+ */
+bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[],
+       enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl);
+
+
+/*
+ * Encodes the given binary data to a QR Code, returning true if encoding succeeded.
+ * If the data is too long to fit in any version in the given range
+ * at the given ECC level, then false is returned.
+ * - The input array range dataAndTemp[0 : dataLen] should normally be
+ *   valid UTF-8 text, but is not required by the QR Code standard.
+ * - The variables ecl and mask must correspond to enum constant values.
+ * - Requires 1 <= minVersion <= maxVersion <= 40.
+ * - The arrays dataAndTemp and qrcode must each have a length
+ *   of at least qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion).
+ * - After the function returns, the contents of dataAndTemp may have changed,
+ *   and does not represent useful data anymore.
+ * - If successful, the resulting QR Code will use byte mode to encode the data.
+ * - In the most optimistic case, a QR Code at version 40 with low ECC can hold any byte
+ *   sequence up to length 2953. This is the hard upper limit of the QR Code standard.
+ * - Please consult the QR Code specification for information on
+ *   data capacities per version, ECC level, and text encoding mode.
+ */
+bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcode[],
+       enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl);
+
+
+/*---- Functions (low level) to generate QR Codes ----*/
+
+/*
+ * Renders a QR Code representing the given segments at the given error correction level.
+ * The smallest possible QR Code version is automatically chosen for the output. Returns true if
+ * QR Code creation succeeded, or false if the data is too long to fit in any version. The ECC level
+ * of the result may be higher than the ecl argument if it can be done without increasing the version.
+ * This function allows the user to create a custom sequence of segments that switches
+ * between modes (such as alphanumeric and byte) to encode text in less space.
+ * This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary().
+ * To save memory, the segments' data buffers can alias/overlap tempBuffer, and will
+ * result in them being clobbered, but the QR Code output will still be correct.
+ * But the qrcode array must not overlap tempBuffer or any segment's data buffer.
+ */
+bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len,
+       enum qrcodegen_Ecc ecl, uint8_t tempBuffer[], uint8_t qrcode[]);
+
+
+/*
+ * Renders a QR Code representing the given segments with the given encoding parameters.
+ * Returns true if QR Code creation succeeded, or false if the data is too long to fit in the range of 
versions.
+ * The smallest possible QR Code version within the given range is automatically
+ * chosen for the output. Iff boostEcl is true, then the ECC level of the result
+ * may be higher than the ecl argument if it can be done without increasing the
+ * version. The mask number is either between 0 to 7 (inclusive) to force that
+ * mask, or -1 to automatically choose an appropriate mask (which may be slow).
+ * This function allows the user to create a custom sequence of segments that switches
+ * between modes (such as alphanumeric and byte) to encode text in less space.
+ * This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary().
+ * To save memory, the segments' data buffers can alias/overlap tempBuffer, and will
+ * result in them being clobbered, but the QR Code output will still be correct.
+ * But the qrcode array must not overlap tempBuffer or any segment's data buffer.
+ */
+bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc 
ecl,
+       int minVersion, int maxVersion, int mask, bool boostEcl, uint8_t tempBuffer[], uint8_t qrcode[]);
+
+
+/*
+ * Tests whether the given string can be encoded as a segment in alphanumeric mode.
+ * A string is encodable iff each character is in the following set: 0 to 9, A to Z
+ * (uppercase only), space, dollar, percent, asterisk, plus, hyphen, period, slash, colon.
+ */
+bool qrcodegen_isAlphanumeric(const char *text);
+
+
+/*
+ * Tests whether the given string can be encoded as a segment in numeric mode.
+ * A string is encodable iff each character is in the range 0 to 9.
+ */
+bool qrcodegen_isNumeric(const char *text);
+
+
+/*
+ * Returns the number of bytes (uint8_t) needed for the data buffer of a segment
+ * containing the given number of characters using the given mode. Notes:
+ * - Returns SIZE_MAX on failure, i.e. numChars > INT16_MAX or
+ *   the number of needed bits exceeds INT16_MAX (i.e. 32767).
+ * - Otherwise, all valid results are in the range [0, ceil(INT16_MAX / 8)], i.e. at most 4096.
+ * - It is okay for the user to allocate more bytes for the buffer than needed.
+ * - For byte mode, numChars measures the number of bytes, not Unicode code points.
+ * - For ECI mode, numChars must be 0, and the worst-case number of bytes is returned.
+ *   An actual ECI segment can have shorter data. For non-ECI modes, the result is exact.
+ */
+size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars);
+
+
+/*
+ * Returns a segment representing the given binary data encoded in
+ * byte mode. All input byte arrays are acceptable. Any text string
+ * can be converted to UTF-8 bytes and encoded as a byte mode segment.
+ */
+struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, uint8_t buf[]);
+
+
+/*
+ * Returns a segment representing the given string of decimal digits encoded in numeric mode.
+ */
+struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]);
+
+
+/*
+ * Returns a segment representing the given text string encoded in alphanumeric mode.
+ * The characters allowed are: 0 to 9, A to Z (uppercase only), space,
+ * dollar, percent, asterisk, plus, hyphen, period, slash, colon.
+ */
+struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t buf[]);
+
+
+/*
+ * Returns a segment representing an Extended Channel Interpretation
+ * (ECI) designator with the given assignment value.
+ */
+struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]);
+
+
+/*---- Functions to extract raw data from QR Codes ----*/
+
+/*
+ * Returns the side length of the given QR Code, assuming that encoding succeeded.
+ * The result is in the range [21, 177]. Note that the length of the array buffer
+ * is related to the side length - every 'uint8_t qrcode[]' must have length at least
+ * qrcodegen_BUFFER_LEN_FOR_VERSION(version), which equals ceil(size^2 / 8 + 1).
+ */
+int qrcodegen_getSize(const uint8_t qrcode[]);
+
+
+/*
+ * Returns the color of the module (pixel) at the given coordinates, which is false
+ * for white or true for black. The top left corner has the coordinates (x=0, y=0).
+ * If the given coordinates are out of bounds, then false (white) is returned.
+ */
+bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y);
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libnma/tests/bar-code.c b/src/libnma/tests/bar-code.c
new file mode 100644
index 00000000..f85a0cfa
--- /dev/null
+++ b/src/libnma/tests/bar-code.c
@@ -0,0 +1,178 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the ree Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * Copyright 2018, 2019 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+#include "nma-private.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "nma-bar-code-widget.h"
+
+static gboolean
+delete (GtkWidget *widget, GdkEvent *event, gpointer user_data)
+{
+        gtk_main_quit ();
+
+        return FALSE;
+}
+
+static void
+ssid_changed (GtkEditable *editable, gpointer user_data)
+{
+       NMConnection *connection = NM_CONNECTION (user_data);
+       NMSettingWireless *s_wireless = nm_connection_get_setting_wireless (connection);
+       gs_unref_bytes GBytes *ssid = NULL;
+       GtkEntryBuffer *buffer;
+
+       g_return_if_fail (s_wireless);
+
+       buffer = gtk_entry_get_buffer (GTK_ENTRY (editable));
+       ssid = g_bytes_new_static (gtk_entry_buffer_get_text (buffer),
+                                  gtk_entry_buffer_get_bytes (buffer));
+
+       g_object_set (s_wireless,
+                     NM_SETTING_WIRELESS_SSID, ssid,
+                     NULL);
+}
+
+static void
+password_changed (GtkEditable *editable, gpointer user_data)
+{
+       NMConnection *connection = NM_CONNECTION (user_data);
+       NMSettingWirelessSecurity *s_wsec = nm_connection_get_setting_wireless_security (connection);
+
+       if (!s_wsec)
+               return;
+
+       g_object_set (s_wsec,
+                     NM_SETTING_WIRELESS_SECURITY_PSK,
+                     gtk_editable_get_text (editable),
+                     NULL);
+}
+
+static void
+key_mgmt_changed (GtkComboBox *combo_box, gpointer user_data)
+{
+       NMConnection *connection = NM_CONNECTION (user_data);
+       const char *key_mgmt = gtk_combo_box_get_active_id (combo_box);
+       NMSettingWirelessSecurity *s_wsec = nm_connection_get_setting_wireless_security (connection);
+       GtkWidget *pass = g_object_get_data (G_OBJECT (combo_box), "pass");
+
+       if (!key_mgmt) {
+               nm_connection_remove_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY);
+               gtk_widget_set_sensitive (pass, FALSE);
+               return;
+       }
+
+       if (!s_wsec) {
+               s_wsec = NM_SETTING_WIRELESS_SECURITY (nm_setting_wireless_security_new ());
+               nm_connection_add_setting (connection, NM_SETTING (s_wsec));
+               gtk_widget_set_sensitive (pass, TRUE);
+               password_changed (GTK_EDITABLE (pass), connection);
+       }
+
+       g_object_set (s_wsec,
+                     NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, key_mgmt,
+                     NULL);
+}
+
+int
+main (int argc, char *argv[])
+{
+       GtkWidget *w, *pass;
+       GtkWidget *grid;
+       NMConnection *connection = NULL;
+       gs_unref_bytes GBytes *ssid = g_bytes_new_static ("\"ab:cd\"", 13);
+
+       connection = nm_simple_connection_new ();
+       nm_connection_add_setting (connection,
+               g_object_new (NM_TYPE_SETTING_CONNECTION,
+                             NM_SETTING_CONNECTION_ID, "fifik",
+                             NULL));
+       nm_connection_add_setting (connection,
+                                  nm_setting_wireless_new ());
+
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
+       gtk_init (&argc, &argv);
+#endif
+
+       w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+       gtk_widget_show (w);
+       gtk_window_set_default_size (GTK_WINDOW (w), 800, 680);
+       g_signal_connect (w, "delete-event", G_CALLBACK (delete), NULL);
+
+       grid = gtk_grid_new ();
+       gtk_widget_show (grid);
+       gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+       gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+       g_object_set (grid,
+                     "margin_start", 6,
+                     "margin_end", 6,
+                     "margin_top", 6,
+                     "margin_bottom", 6,
+                     NULL);
+       gtk_container_add (GTK_CONTAINER (w), grid);
+
+       w = gtk_label_new ("SSID");
+       gtk_widget_show (w);
+       g_object_set (w, "xalign", 1.0, NULL);
+       gtk_grid_attach (GTK_GRID (grid), w, 0, 0, 1, 1);
+
+       w = gtk_entry_new ();
+       g_signal_connect (w, "changed", G_CALLBACK (ssid_changed), connection);
+       gtk_editable_set_text (GTK_EDITABLE (w), "\"ab:cd\"");
+       gtk_widget_show (w);
+       gtk_grid_attach (GTK_GRID (grid), w, 1, 0, 1, 1);
+
+       w = gtk_label_new ("Password");
+       gtk_widget_show (w);
+       g_object_set (w, "xalign", 1.0, NULL);
+       gtk_grid_attach (GTK_GRID (grid), w, 0, 1, 1, 1);
+
+       pass = gtk_entry_new ();
+       g_signal_connect (pass, "changed", G_CALLBACK (password_changed), connection);
+       gtk_editable_set_text (GTK_EDITABLE (pass), "lolofon");
+       gtk_widget_show (pass);
+       gtk_grid_attach (GTK_GRID (grid), pass, 1, 1, 1, 1);
+
+       w = gtk_label_new ("Key Management");
+       gtk_widget_show (w);
+       g_object_set (w, "xalign", 1.0, NULL);
+       gtk_grid_attach (GTK_GRID (grid), w, 0, 2, 1, 1);
+
+       w = gtk_combo_box_text_new ();
+       gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (w), NULL, "No Password");
+       gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (w), "none", "WEP: none");
+       gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (w), "ieee8021x", "WEP: ieee8021x");
+       gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (w), "wpa-none", "WPA: wpa-none");
+       gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (w), "wpa-psk", "WPA: wpa-psk");
+       g_object_set_data (G_OBJECT (w), "pass", pass);
+       g_signal_connect (w, "changed", G_CALLBACK (key_mgmt_changed), connection);
+       gtk_combo_box_set_active_id (GTK_COMBO_BOX (w), "wpa-psk");
+       gtk_widget_show (w);
+       gtk_grid_attach (GTK_GRID (grid), w, 1, 2, 1, 1);
+
+       w = nma_bar_code_widget_new (connection);
+       gtk_widget_show (w);
+       gtk_widget_set_vexpand (w, TRUE);
+       gtk_widget_set_hexpand (w, TRUE);
+       gtk_grid_attach (GTK_GRID (grid), w, 0, 3, 2, 1);
+
+       gtk_main ();
+}
diff --git a/src/libnma/tests/cert-chooser.c b/src/libnma/tests/cert-chooser.c
new file mode 100644
index 00000000..99808d12
--- /dev/null
+++ b/src/libnma/tests/cert-chooser.c
@@ -0,0 +1,104 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the ree Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * Copyright 2019 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include <gtk/gtk.h>
+#include "nma-cert-chooser.h"
+
+int
+main (int argc, char *argv[])
+{
+       GtkWidget *dialog;
+       GtkBox *content;
+       GtkWidget *widget;
+
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
+       gtk_init (&argc, &argv);
+#endif
+
+       dialog = gtk_dialog_new_with_buttons ("NMACertChooser test",
+                                             NULL, GTK_DIALOG_MODAL,
+                                             "Dismiss",  GTK_RESPONSE_DELETE_EVENT,
+                                             NULL);
+       content = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_box_set_spacing (content, 6);
+#endif
+
+       widget = nma_cert_chooser_new ("Any", 0);
+       gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
+       gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
+
+       widget = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+       gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
+       gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
+
+       widget = nma_cert_chooser_new ("FLAG_PASSWORDS", NMA_CERT_CHOOSER_FLAG_PASSWORDS);
+       nma_cert_chooser_set_cert (NMA_CERT_CHOOSER (widget),
+                                  "pkcs11:object=praise;type=satan",
+                                  NM_SETTING_802_1X_CK_SCHEME_PKCS11);
+       nma_cert_chooser_set_key_uri (NMA_CERT_CHOOSER (widget),
+                                     "pkcs11:object=worship;type=doom");
+       gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
+       gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
+
+       widget = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+       gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
+       gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
+
+       widget = nma_cert_chooser_new ("FLAG_CERT", NMA_CERT_CHOOSER_FLAG_CERT);
+       gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
+       gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
+
+       widget = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+       gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
+       gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
+
+       widget = nma_cert_chooser_new ("FLAG_PEM", NMA_CERT_CHOOSER_FLAG_PEM);
+       gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
+       gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
+
+       gtk_dialog_run (GTK_DIALOG (dialog));
+}
diff --git a/src/libnma/tests/meson.build b/src/libnma/tests/meson.build
new file mode 100644
index 00000000..253de9e7
--- /dev/null
+++ b/src/libnma/tests/meson.build
@@ -0,0 +1,31 @@
+tests = [
+  'bar-code',
+  'cert-chooser',
+  'mobile-wizard',
+  'run-vpn',
+  'vpn-password-dialog',
+  'wifi-dialog',
+  'wifi-dialog-secrets',
+]
+
+foreach tst : tests
+  executable(
+    tst,
+    tst + '.c',
+    include_directories: incs,
+    dependencies: [ gtk_dep, libnm_dep, libnma_dep ],
+    c_args: cflags,
+    install: false
+  )
+
+  if enable_libnma_gtk4
+    executable(
+      tst + '-gtk4',
+      tst + '.c',
+      include_directories: incs,
+      dependencies: [ gtk4_dep, libnm_dep, libnma_gtk4_dep ],
+      c_args: cflags,
+      install: false
+    )
+  endif
+endforeach
diff --git a/src/libnma/tests/mobile-wizard.c b/src/libnma/tests/mobile-wizard.c
new file mode 100644
index 00000000..1e21868f
--- /dev/null
+++ b/src/libnma/tests/mobile-wizard.c
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2018 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include <gtk/gtk.h>
+#include "nma-mobile-wizard.h"
+
+static void
+wizard_cb (NMAMobileWizard *self, gboolean canceled, NMAMobileWizardAccessMethod *method, gpointer user_data)
+{
+       gtk_main_quit ();
+}
+
+int
+main (int argc, char *argv[])
+{
+       NMAMobileWizard *wizard;
+
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
+       gtk_init (&argc, &argv);
+#endif
+
+       wizard = nma_mobile_wizard_new (NULL, NULL, NM_DEVICE_MODEM_CAPABILITY_NONE, TRUE, wizard_cb, NULL);
+
+       nma_mobile_wizard_present (wizard);
+       gtk_main ();
+       nma_mobile_wizard_destroy (wizard);
+}
diff --git a/src/libnma/tests/run-vpn.c b/src/libnma/tests/run-vpn.c
new file mode 100644
index 00000000..b0e39d9d
--- /dev/null
+++ b/src/libnma/tests/run-vpn.c
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * run-vpn - VPN plugin runner for testing
+ *
+ * (C) Copyright 2018 Lubomir Rintel
+ */
+
+#include "nm-default.h"
+
+#include <NetworkManager.h>
+#include <gtk/gtk.h>
+#include <stdlib.h>
+
+static gboolean
+window_deleted (GtkWidget *widget,
+                GdkEvent *event,
+                gpointer user_data)
+{
+       GMainLoop *main_loop = user_data;
+       g_main_loop_quit (main_loop);
+       return TRUE;
+}
+
+int
+main (int argc, char *argv[])
+{
+       gs_unref_object NMVpnEditorPlugin *plugin = NULL;
+       gs_unref_object NMVpnEditor *editor = NULL;
+       gs_unref_object NMConnection *connection = NULL;
+       gs_free char *service_type = NULL;
+       GMainLoop *main_loop;
+       GtkWidget *window;
+       GtkWidget *widget;
+       gs_free_error GError *error = NULL;
+
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
+       gtk_init (&argc, &argv);
+#endif
+
+       if (argc != 2) {
+               g_printerr ("Usage: %s libnm-vpn-plugin-<name>.so\n", argv[0]);
+               return EXIT_FAILURE;
+       }
+
+       plugin = nm_vpn_editor_plugin_load (argv[1], NULL, &error);
+       if (!plugin) {
+               g_printerr ("Error: %s\n", error->message);
+               return EXIT_FAILURE;
+       }
+
+       g_object_get (G_OBJECT (plugin), "service", &service_type, NULL);
+       g_return_val_if_fail (service_type, EXIT_FAILURE);
+
+       connection = nm_simple_connection_new ();
+       nm_connection_add_setting (connection,
+               g_object_new (NM_TYPE_SETTING_VPN,
+                             "service-type", service_type,
+                             NULL));
+
+       editor = nm_vpn_editor_plugin_get_editor (plugin, connection, &error);
+       if (!editor) {
+               g_printerr ("Error: %s\n", error->message);
+               return EXIT_FAILURE;
+       }
+
+       main_loop = g_main_loop_new (NULL, FALSE);
+       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+       gtk_widget_show (window);
+       g_signal_connect (G_OBJECT (window), "delete-event", G_CALLBACK (window_deleted), main_loop);
+
+       widget = GTK_WIDGET (nm_vpn_editor_get_widget (editor));
+       gtk_widget_show (widget);
+       gtk_container_add (GTK_CONTAINER (window), widget);
+       g_main_loop_run (main_loop);
+
+       if (!nm_vpn_editor_update_connection (editor, connection, &error)) {
+               g_printerr ("Error: %s\n", error->message);
+               return EXIT_FAILURE;
+       }
+
+       gtk_widget_destroy (widget);
+       nm_connection_dump (connection);
+
+       return EXIT_SUCCESS;
+}
diff --git a/src/libnma/tests/vpn-password-dialog.c b/src/libnma/tests/vpn-password-dialog.c
new file mode 100644
index 00000000..2a65b432
--- /dev/null
+++ b/src/libnma/tests/vpn-password-dialog.c
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2018 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include <gtk/gtk.h>
+#include "nma-vpn-password-dialog.h"
+
+int
+main (int argc, char *argv[])
+{
+       GtkWidget *widget;
+
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
+       gtk_init (&argc, &argv);
+#endif
+
+       widget = nma_vpn_password_dialog_new ("Title", "Message", "Password");
+
+       nma_vpn_password_dialog_set_password (NMA_VPN_PASSWORD_DIALOG (widget), "Password One");
+       nma_vpn_password_dialog_set_password_label (NMA_VPN_PASSWORD_DIALOG (widget), "First _Label");
+
+       nma_vpn_password_dialog_set_password_secondary (NMA_VPN_PASSWORD_DIALOG (widget), "");
+       nma_vpn_password_dialog_set_password_secondary_label (NMA_VPN_PASSWORD_DIALOG (widget), "_Second 
Label");
+       nma_vpn_password_dialog_set_show_password_secondary (NMA_VPN_PASSWORD_DIALOG (widget), TRUE);
+
+       nma_vpn_password_dialog_set_password_ternary_label (NMA_VPN_PASSWORD_DIALOG (widget), "_Third Label");
+       nma_vpn_password_dialog_set_show_password_ternary (NMA_VPN_PASSWORD_DIALOG (widget), TRUE);
+
+       nma_vpn_password_dialog_run_and_block (NMA_VPN_PASSWORD_DIALOG (widget));
+       gtk_widget_destroy (widget);
+}
diff --git a/src/libnma/tests/wifi-dialog-secrets.c b/src/libnma/tests/wifi-dialog-secrets.c
new file mode 100644
index 00000000..f6d9ef95
--- /dev/null
+++ b/src/libnma/tests/wifi-dialog-secrets.c
@@ -0,0 +1,100 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2018 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include <gtk/gtk.h>
+#include <NetworkManager.h>
+#include "nma-wifi-dialog.h"
+
+static void
+response_cb (GtkDialog *obj, gint response, gpointer user_data)
+{
+       NMAWifiDialog *dialog = NMA_WIFI_DIALOG (obj);
+
+       g_print ("response %i\n", response);
+
+       if (response == GTK_RESPONSE_OK) {
+               GHashTable *diff = NULL, *setting_diff;
+               GHashTableIter iter, setting_iter;
+               const char *setting, *key;
+               NMConnection *connection = nma_wifi_dialog_get_connection (dialog, NULL, NULL);
+               NMConnection *orig = user_data;
+
+               g_print ("settings changed:\n");
+               nm_connection_diff (connection, orig, NM_SETTING_COMPARE_FLAG_EXACT, &diff);
+               if (!diff)
+                       return;
+
+               g_hash_table_iter_init (&iter, diff);
+               while (g_hash_table_iter_next (&iter, (gpointer) &setting, (gpointer) &setting_diff)) {
+                       g_hash_table_iter_init (&setting_iter, setting_diff);
+                       while (g_hash_table_iter_next (&setting_iter, (gpointer) &key, NULL))
+                               g_print (" %s.%s\n", setting, key);
+               }
+
+               g_hash_table_destroy (diff);
+       }
+}
+
+int
+main (int argc, char *argv[])
+{
+       GtkWidget *dialog;
+       NMClient *client = NULL;
+       NMConnection *connection = NULL;
+       GError *error = NULL;
+       gs_unref_bytes GBytes *ssid = g_bytes_new_static ("<Maj Vaj Faj>", 13);
+       const char *hints[] = {
+               NM_SETTING_802_1X_IDENTITY,
+               NM_SETTING_802_1X_PASSWORD,
+               NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD,
+               NULL
+       };
+
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
+       gtk_init (&argc, &argv);
+#endif
+
+       client = nm_client_new (NULL, NULL);
+       connection = nm_simple_connection_new ();
+       nm_connection_add_setting (connection,
+               g_object_new (NM_TYPE_SETTING_CONNECTION,
+                             NM_SETTING_CONNECTION_ID, "<Maj Vaj Faj>",
+                             NULL));
+       nm_connection_add_setting (connection,
+               g_object_new (NM_TYPE_SETTING_WIRELESS,
+                             NM_SETTING_WIRELESS_SSID, ssid,
+                             NULL));
+       nm_connection_add_setting (connection,
+               g_object_new (NM_TYPE_SETTING_WIRELESS_SECURITY,
+                             NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-eap",
+                             NULL));
+       nm_connection_add_setting (connection,
+               g_object_new (NM_TYPE_SETTING_802_1X,
+                             NM_SETTING_802_1X_EAP, (const char * const []){ "peap", NULL },
+                             NM_SETTING_802_1X_IDENTITY, "budulinek",
+                             NM_SETTING_802_1X_PHASE2_AUTH, "gtc",
+                             NULL));
+
+       if (!nm_connection_normalize (connection, NULL, NULL, &error)) {
+               nm_connection_dump (connection);
+               g_printerr ("Error: %s\n", error->message);
+               g_error_free (error);
+               return 1;
+       }
+
+       dialog = nma_wifi_dialog_new_for_secrets (client,
+                                                 nm_simple_connection_new_clone (connection),
+                                                 NM_SETTING_802_1X_SETTING_NAME,
+                                                 hints);
+       g_signal_connect (dialog, "response", G_CALLBACK (response_cb), connection);
+       gtk_dialog_run (GTK_DIALOG (dialog));
+       gtk_widget_destroy (dialog);
+
+       g_object_unref (connection);
+}
diff --git a/src/libnma/tests/wifi-dialog.c b/src/libnma/tests/wifi-dialog.c
new file mode 100644
index 00000000..1f8219ae
--- /dev/null
+++ b/src/libnma/tests/wifi-dialog.c
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2018 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include <gtk/gtk.h>
+#include "nma-wifi-dialog.h"
+
+int
+main (int argc, char *argv[])
+{
+       GtkWidget *dialog;
+       NMClient *client = NULL;
+       NMConnection *connection = NULL;
+       NMDevice *device = NULL;
+       NMAccessPoint *ap = NULL;
+       gboolean secrets_only = FALSE;
+       GError *error = NULL;
+       gs_unref_bytes GBytes *ssid = g_bytes_new_static ("<Maj Vaj Faj>", 13);
+
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
+       gtk_init (&argc, &argv);
+#endif
+
+       client = nm_client_new (NULL, NULL);
+       connection = nm_simple_connection_new ();
+       nm_connection_add_setting (connection,
+               g_object_new (NM_TYPE_SETTING_CONNECTION,
+                             NM_SETTING_CONNECTION_ID, "<Maj Vaj Faj>",
+                             NULL));
+       nm_connection_add_setting (connection,
+               g_object_new (NM_TYPE_SETTING_WIRELESS,
+                             NM_SETTING_WIRELESS_SSID, ssid,
+                             NULL));
+       nm_connection_add_setting (connection,
+               g_object_new (NM_TYPE_SETTING_WIRELESS_SECURITY,
+                             NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-eap",
+                             NULL));
+       nm_connection_add_setting (connection,
+               g_object_new (NM_TYPE_SETTING_802_1X,
+                             NM_SETTING_802_1X_EAP, (const char * const []){ "peap", NULL },
+                             NM_SETTING_802_1X_IDENTITY, "budulinek",
+                             NM_SETTING_802_1X_PHASE2_AUTH, "gtc",
+                             NULL));
+
+       if (!nm_connection_normalize (connection, NULL, NULL, &error)) {
+               nm_connection_dump (connection);
+               g_printerr ("Error: %s\n", error->message);
+               g_error_free (error);
+               return 1;
+       }
+
+       dialog = nma_wifi_dialog_new (client, connection, device, ap, secrets_only);
+       gtk_dialog_run (GTK_DIALOG (dialog));
+       gtk_widget_destroy (dialog);
+}
diff --git a/src/libnma/wifi.ui b/src/libnma/wifi.ui
new file mode 100644
index 00000000..9e212057
--- /dev/null
+++ b/src/libnma/wifi.ui
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="nm-applet">
+  <requires lib="gtk+" version="3.10"/>
+  <object class="GtkListStore" id="model1">
+    <columns>
+      <!-- column-name gchararray -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0"> </col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model2">
+    <columns>
+      <!-- column-name gchararray -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0"> </col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkGrid" id="wifi_dialog">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="margin_start">12</property>
+    <property name="margin_end">12</property>
+    <property name="margin_top">12</property>
+    <property name="margin_bottom">12</property>
+    <property name="row_spacing">12</property>
+    <property name="column_spacing">12</property>
+    <child>
+      <object class="GtkImage" id="image1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="valign">start</property>
+        <property name="margin_start">12</property>
+        <property name="margin_end">12</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">12</property>
+        <property name="icon_name">network-wireless</property>
+        <property name="icon_size">6</property>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="caption_label">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_start">12</property>
+        <property name="margin_end">12</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">12</property>
+        <property name="use_markup">True</property>
+        <property name="wrap">True</property>
+        <property name="max_width_chars">50</property>
+        <property name="xalign">0</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="top_attach">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkGrid" id="table1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="row_spacing">6</property>
+        <property name="column_spacing">6</property>
+        <child>
+          <object class="GtkBox" id="security_vbox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">4</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="security_combo_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Wi-Fi _security</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">security_combo</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBox" id="security_combo">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="model">model1</property>
+            <child>
+              <object class="GtkCellRendererText" id="renderer1"/>
+              <attributes>
+                <attribute name="text">0</attribute>
+              </attributes>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="network_name_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">_Network name</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">network_name_entry</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="network_name_entry">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="activates_default">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="connection_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">C_onnection</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">connection_combo</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBox" id="connection_combo">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="device_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Wi-Fi _adapter</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">device_combo</property>
+            <property name="xalign">1</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBox" id="device_combo">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="model">model2</property>
+            <child>
+              <object class="GtkCellRendererText" id="renderer2"/>
+              <attributes>
+                <attribute name="text">0</attribute>
+              </attributes>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">1</property>
+        <property name="width">2</property>
+      </packing>
+    </child>
+  </object>
+</interface>
diff --git a/src/meson.build b/src/meson.build
index 9647a428..af133352 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,12 +1,28 @@
 src_inc = include_directories('.')
 
+# FIXME: although this file is contained in the libnma directory
+#        it should be generated before because it's used at
+#        wireless-security directory, which is needed later for
+#        libnma directory.
+libnma_inc = include_directories('libnma')
+
 version_conf = configuration_data()
 version_conf.set('NMA_MAJOR_VERSION', nma_major_version)
 version_conf.set('NMA_MINOR_VERSION', nma_minor_version)
 version_conf.set('NMA_MICRO_VERSION', nma_micro_version)
 
+version = 'nma-version.h'
+
+version_header = configure_file(
+  input: 'libnma/' + version + '.in',
+  output: version,
+  configuration: version_conf,
+  install_dir: join_paths(nma_includedir, 'libnma')
+)
+
 subdir('utils')
 subdir('wireless-security')
+subdir('libnma')
 
 subdir('connection-editor')
 
diff --git a/src/wireless-security/meson.build b/src/wireless-security/meson.build
index 288f341e..a621cb2e 100644
--- a/src/wireless-security/meson.build
+++ b/src/wireless-security/meson.build
@@ -1,6 +1,6 @@
 wireless_security_inc = include_directories('.')
 
-sources = files(
+sources = [version_header] + files(
   'eap-method.c',
   'eap-method-fast.c',
   'eap-method-leap.c',
@@ -42,13 +42,13 @@ sources += gnome.compile_resources(
 incs = [
   top_inc,
   shared_inc,
-  src_inc
+  src_inc,
+  libnma_inc
 ]
 
 deps = [
   gtk_dep,
   libnm_dep,
-  libnma_dep,
   libutils_libnm_dep
 ]
 
@@ -58,3 +58,19 @@ libwireless_security_libnm = static_library(
   include_directories: incs,
   dependencies: deps
 )
+
+if enable_libnma_gtk4
+  deps = [
+    gtk4_dep,
+    libnm_dep,
+    libutils_libnm_dep
+  ]
+
+  libwireless_security_libnma_gtk4 = static_library(
+    'wireless-security-libnma-gtk4',
+    sources: sources,
+    include_directories: incs,
+    dependencies: deps,
+    c_args: cflags
+  )
+endif


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