diff -Nru network-manager-applet-1.8.4/aclocal.m4 network-manager-applet-1.8.10/aclocal.m4 --- network-manager-applet-1.8.4/aclocal.m4 2017-09-20 13:28:03.000000000 +0000 +++ network-manager-applet-1.8.10/aclocal.m4 2017-12-19 12:26:58.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -965,7 +965,7 @@ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -980,7 +980,7 @@ [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -996,14 +996,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1055,7 +1055,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1086,7 +1086,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1277,7 +1277,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1353,7 +1353,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1550,7 +1550,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1571,7 +1571,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1593,7 +1593,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1628,7 +1628,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1678,7 +1678,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1717,7 +1717,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1746,7 +1746,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1793,7 +1793,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1812,7 +1812,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1893,7 +1893,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1953,7 +1953,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1981,7 +1981,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2000,7 +2000,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru network-manager-applet-1.8.4/compile network-manager-applet-1.8.10/compile --- network-manager-applet-1.8.4/compile 2017-02-10 06:47:11.000000000 +0000 +++ network-manager-applet-1.8.10/compile 2017-08-15 07:25:07.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -342,6 +343,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru network-manager-applet-1.8.4/config.guess network-manager-applet-1.8.10/config.guess --- network-manager-applet-1.8.4/config.guess 2017-02-10 06:47:11.000000000 +0000 +++ network-manager-applet-1.8.10/config.guess 2017-08-15 07:25:07.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2016-10-02' +timestamp='2017-08-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -259,6 +259,9 @@ *:Sortix:*:*) echo ${UNAME_MACHINE}-unknown-sortix exit ;; + *:Redox:*:*) + echo ${UNAME_MACHINE}-unknown-redox + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -837,10 +840,11 @@ UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_PROCESSOR} in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -1303,14 +1307,21 @@ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub @@ -1334,15 +1345,18 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) + NEO-*:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; - NSR-?:NONSTOP_KERNEL:*:*) + NSR-*:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk${UNAME_RELEASE} + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux exit ;; @@ -1418,8 +1432,8 @@ $0: unable to guess system type This script (version $timestamp), has failed to recognize the -operating system you are using. If your script is old, overwrite -config.guess and config.sub with the latest versions from: +operating system you are using. If your script is old, overwrite *all* +copies of config.guess and config.sub with the latest versions from: http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and diff -Nru network-manager-applet-1.8.4/config.h.meson network-manager-applet-1.8.10/config.h.meson --- network-manager-applet-1.8.4/config.h.meson 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-1.8.10/config.h.meson 2017-12-19 11:44:30.000000000 +0000 @@ -0,0 +1,67 @@ +/* Gettext package */ +#mesondefine GETTEXT_PACKAGE + +/* Define if you have libnotify 0.7 or later */ +#mesondefine HAVE_LIBNOTIFY_07 + +/* ISO codes prefix */ +#mesondefine ISO_CODES_PREFIX + +/* Define if more asserts are enabled */ +#mesondefine NM_MORE_ASSERTS + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif + +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif + +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif + +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif + +/* Version number of package */ +#mesondefine VERSION + +/* Enable using libappindicator */ +#mesondefine WITH_APPINDICATOR + +/* Define if Gcr is available */ +#mesondefine WITH_GCR + +/* Define if Jansson is available */ +#mesondefine WITH_JANSSON + +/* Define if libselinux is available */ +#mesondefine WITH_SELINUX + +/* Define if you have ModemManager/WWAN support */ +#mesondefine WITH_WWAN + +/* Define to 1 if on MINIX. */ +#mesondefine _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#mesondefine _POSIX_1_SOURCE + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#mesondefine _POSIX_SOURCE + +/* Define to `int' if does not define. */ +#mesondefine pid_t diff -Nru network-manager-applet-1.8.4/config.sub network-manager-applet-1.8.10/config.sub --- network-manager-applet-1.8.4/config.sub 2017-02-10 06:47:11.000000000 +0000 +++ network-manager-applet-1.8.10/config.sub 2017-08-15 07:25:07.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2016-09-05' +timestamp='2017-04-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -67,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -263,7 +263,7 @@ | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ @@ -301,6 +301,7 @@ | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ @@ -314,6 +315,7 @@ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | visium \ + | wasm32 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -387,7 +389,7 @@ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ | k1om-* \ | le32-* | le64-* \ @@ -428,6 +430,7 @@ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ @@ -444,6 +447,7 @@ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -946,6 +950,9 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -1241,6 +1248,9 @@ basic_machine=a29k-wrs os=-vxworks ;; + wasm32) + basic_machine=wasm32-unknown + ;; w65*) basic_machine=w65-wdc os=-none @@ -1395,7 +1405,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ @@ -1407,7 +1417,7 @@ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1636,6 +1646,9 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; diff -Nru network-manager-applet-1.8.4/configure network-manager-applet-1.8.10/configure --- network-manager-applet-1.8.4/configure 2017-09-20 13:28:03.000000000 +0000 +++ network-manager-applet-1.8.10/configure 2017-12-19 12:28:56.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for nm-applet 1.8.4. +# Generated by GNU Autoconf 2.69 for nm-applet 1.8.10. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='nm-applet' PACKAGE_TARNAME='network-manager-applet' -PACKAGE_VERSION='1.8.4' -PACKAGE_STRING='nm-applet 1.8.4' +PACKAGE_VERSION='1.8.10' +PACKAGE_STRING='nm-applet 1.8.10' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -1505,7 +1505,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nm-applet 1.8.4 to adapt to many kinds of systems. +\`configure' configures nm-applet 1.8.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1576,7 +1576,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nm-applet 1.8.4:";; + short | recursive ) echo "Configuration of nm-applet 1.8.10:";; esac cat <<\_ACEOF @@ -1776,7 +1776,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nm-applet configure 1.8.4 +nm-applet configure 1.8.10 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2199,7 +2199,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nm-applet $as_me 1.8.4, which was +It was created by nm-applet $as_me 1.8.10, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3067,7 +3067,7 @@ # Define the identity of the package. PACKAGE='network-manager-applet' - VERSION='1.8.4' + VERSION='1.8.10' cat >>confdefs.h <<_ACEOF @@ -3225,8 +3225,8 @@ NMA_MAJOR_VERSION=1 NMA_MINOR_VERSION=8 -NMA_MICRO_VERSION=4 -NMA_VERSION=1.8.4 +NMA_MICRO_VERSION=10 +NMA_VERSION=1.8.10 @@ -12531,7 +12531,7 @@ -NMA_GIT_SHA=110ed180adb8d94549e95f278c4f0c6cff015be0 +NMA_GIT_SHA=79bd00df3c1b7eb69db0f890ddb38516d7b4db5e if test """" != "no-config-h" ; then @@ -14886,12 +14886,12 @@ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.10") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.4" 2>/dev/null` + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.10" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14903,12 +14903,12 @@ pkg_cv_GTK_LIBS="$GTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.10") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.4" 2>/dev/null` + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.10" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14929,14 +14929,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.4" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.10" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.4" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.10" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-3.0 >= 3.4) were not met: + as_fn_error $? "Package requirements (gtk+-3.0 >= 3.10) were not met: $GTK_PKG_ERRORS @@ -16509,11 +16509,13 @@ -Wimplicit-fallthrough \ -Wimplicit-function-declaration \ -Winit-self \ + -Wlogical-op \ -Wmissing-declarations \ -Wmissing-include-dirs \ -Wmissing-prototypes \ -Wpointer-arith \ -Wshadow \ + -Wshift-negative-value \ -Wstrict-prototypes \ -Wundef \ -Wno-duplicate-decl-specifier \ @@ -16802,6 +16804,52 @@ + + + CFLAGS_SAVED="$CFLAGS" + CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wmissing-braces" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wmissing-braces works as expected" >&5 +$as_echo_n "checking whether -Wmissing-braces works as expected... " >&6; } + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +union { int a[1]; int b[2]; } c = { 0 } + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wmissing-braces" + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + CFLAGS="$CFLAGS_SAVED" + CFLAGS="$CFLAGS -Wno-missing-braces" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +$as_echo "not supported" >&6; } + CFLAGS="$CFLAGS_SAVED" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + CFLAGS="$CFLAGS_MORE_WARNINGS $CFLAGS" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -17513,7 +17561,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nm-applet $as_me 1.8.4, which was +This file was extended by nm-applet $as_me 1.8.10, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17579,7 +17627,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nm-applet config.status 1.8.4 +nm-applet config.status 1.8.10 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru network-manager-applet-1.8.4/configure.ac network-manager-applet-1.8.10/configure.ac --- network-manager-applet-1.8.4/configure.ac 2017-09-20 13:27:32.000000000 +0000 +++ network-manager-applet-1.8.10/configure.ac 2017-12-19 12:25:58.000000000 +0000 @@ -2,7 +2,7 @@ m4_define([nma_major_version], [1]) m4_define([nma_minor_version], [8]) -m4_define([nma_micro_version], [4]) +m4_define([nma_micro_version], [10]) m4_define([nma_version], [nma_major_version.nma_minor_version.nma_micro_version]) @@ -128,7 +128,7 @@ fi PKG_CHECK_MODULES(NOTIFY, [libnotify >= 0.4.3]) -PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4) +PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.10) GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_4" AC_ARG_WITH([appindicator], AS_HELP_STRING([--with-appindicator|--without-appindicator], [Build with libappindicator support instead of xembed systray support.])) diff -Nru network-manager-applet-1.8.4/debian/changelog network-manager-applet-1.8.10/debian/changelog --- network-manager-applet-1.8.4/debian/changelog 2017-09-22 19:03:15.000000000 +0000 +++ network-manager-applet-1.8.10/debian/changelog 2018-01-22 18:59:16.000000000 +0000 @@ -1,3 +1,58 @@ +network-manager-applet (1.8.10-2ubuntu1) bionic; urgency=medium + + * Sync with Debian. Remaining changes: + - debian/icons/, debian/rules, debian/source/include-binaries: + + Add "secure" icons + - debian/control, debian/rules: + + Build appindicator support + + Run dh_translations + - Add lp341684_device_sensitive_disconnect_notify.patch: + + Show correct notification messages for disconnect events, to be in + line with the other *connect*text patches. + - Add lp460144_correctly_update_notification.patch: cleaner notification + messages, and allow for messages to be updated instead of cleared. + - Add applet-wifi-menu-before-vpn.patch: + + Show Create New and Connect to Hidden wifi menu items with the other + Wifi items, rather than separated by the VPN menus. + - Allow-to-create-and-connect-to-Ad-Hoc-RSN-networks.patch: + + Enable Ad-Hoc using WPA RSN + - Have-the-appindicator-enabled-by-default.patch: + + Enable the indicator by default + - On-Ubuntu-we-use-premade-icons-for-the-indicator-VPN.patch: + + use '-secure'-suffixed icons when connected to the VPN, since we + can't composit icons on the fly. + - Make-sure-the-behavior-for-policykit-restricted-acti.patch, + Support-hiding-rather-than-desensitizing-disallowed-items.patch, + + provide methods to desensitize and hide menu items which are useless + given the current policykit policy level of the user. + + -- Jeremy Bicha Mon, 22 Jan 2018 13:59:16 -0500 + +network-manager-applet (1.8.10-2) unstable; urgency=medium + + * shared/compat: Fix memory handling of nm_setting_vpn_get_*_keys + (Closes: #885525) + + -- Michael Biebl Tue, 16 Jan 2018 16:31:10 +0100 + +network-manager-applet (1.8.10-1) unstable; urgency=medium + + * New upstream version 1.8.10 + * Rebase patches + * Bump Standards-Version to 4.1.2 + * Bump debhelper compat level to 11 + + -- Michael Biebl Mon, 25 Dec 2017 22:42:46 +0100 + +network-manager-applet (1.8.6-1) unstable; urgency=medium + + * New upstream version 1.8.6 + * Don't use Unicode in patch header + * Bump Build-Depends on libgtk-3-dev to (>= 3.10) + * Bump Standards-Version to 4.1.1 + + -- Michael Biebl Tue, 07 Nov 2017 20:57:13 +0100 + network-manager-applet (1.8.4-1ubuntu1) artful; urgency=medium * Sync with Debian. Remaining changes: diff -Nru network-manager-applet-1.8.4/debian/compat network-manager-applet-1.8.10/debian/compat --- network-manager-applet-1.8.4/debian/compat 2017-09-22 19:03:15.000000000 +0000 +++ network-manager-applet-1.8.10/debian/compat 2018-01-22 18:59:16.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru network-manager-applet-1.8.4/debian/control network-manager-applet-1.8.10/debian/control --- network-manager-applet-1.8.4/debian/control 2017-09-22 19:03:15.000000000 +0000 +++ network-manager-applet-1.8.10/debian/control 2018-01-22 18:59:16.000000000 +0000 @@ -4,12 +4,12 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Utopia Maintenance Team Uploaders: Michael Biebl -Build-Depends: debhelper (>= 10.3), +Build-Depends: debhelper (>= 11), dh-translations, gnome-common, intltool, libsecret-1-dev, - libgtk-3-dev (>= 3.4), + libgtk-3-dev (>= 3.10), libglib2.0-dev (>= 2.38), libnotify-dev (>= 0.7), libnm-util-dev (>= 1.8), @@ -31,9 +31,9 @@ gtk-doc-tools, libgtk-3-doc, libglib2.0-doc, -Standards-Version: 4.1.0 +Standards-Version: 4.1.2 Vcs-Git: https://code.launchpad.net/~network-manager/network-manager/+git/ubuntu-applet -Vcs-Browser: https://git.launchpad.net/~network-manager/network-manager/+git/ubuntu-applet?h=artful +Vcs-Browser: https://git.launchpad.net/~network-manager/network-manager/+git/ubuntu-applet?h=bionic Homepage: https://www.gnome.org/projects/NetworkManager/ Package: network-manager-gnome diff -Nru network-manager-applet-1.8.4/debian/gbp.conf network-manager-applet-1.8.10/debian/gbp.conf --- network-manager-applet-1.8.4/debian/gbp.conf 2017-09-22 19:03:15.000000000 +0000 +++ network-manager-applet-1.8.10/debian/gbp.conf 2018-01-22 18:59:16.000000000 +0000 @@ -1,4 +1,4 @@ [DEFAULT] pristine-tar = True patch-numbers = False -debian-branch = artful +debian-branch = bionic diff -Nru network-manager-applet-1.8.4/debian/patches/Allow-to-create-connections-without-admin-privileges.patch network-manager-applet-1.8.10/debian/patches/Allow-to-create-connections-without-admin-privileges.patch --- network-manager-applet-1.8.4/debian/patches/Allow-to-create-connections-without-admin-privileges.patch 2017-09-22 19:03:15.000000000 +0000 +++ network-manager-applet-1.8.10/debian/patches/Allow-to-create-connections-without-admin-privileges.patch 2018-01-22 18:59:16.000000000 +0000 @@ -1,16 +1,13 @@ From: Michael Biebl Date: Tue, 18 Mar 2014 10:49:13 +0100 Subject: Allow to create connections without admin privileges -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit Set passwords as agent-owned when they need to, to allow users without root permissions to easily configure their connections. The logic is: - Bluetooth, CDMA and GSM connections: always user-owned - WEP/WPA connections: system-owned if user has the permissions - (with NM’s config, that is netdev or sudo membership), user-owned + (with NM's config, that is netdev or sudo membership), user-owned otherwise. The password is stored in the keyring for WPA, not for WEP. - WiMax / Wired connections: always system-owned (with 802.1x @@ -127,10 +124,10 @@ nm_connection_add_setting (info->connection, nm_setting_ppp_new ()); } diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c -index 96cfb6c..376f9c0 100644 +index ab40700..14d90cc 100644 --- a/src/connection-editor/page-vpn.c +++ b/src/connection-editor/page-vpn.c -@@ -241,6 +241,7 @@ vpn_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL, +@@ -238,6 +238,7 @@ vpn_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL, gpointer user_data) { NMSetting *s_vpn; @@ -138,7 +135,7 @@ const char *service_type; gs_free char *service_type_free = NULL; gs_free char *add_detail_key_free = NULL; -@@ -314,6 +315,13 @@ vpn_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL, +@@ -311,6 +312,13 @@ vpn_connection_new (FUNC_TAG_PAGE_NEW_CONNECTION_IMPL, if (!service_type) service_type = detail; @@ -153,7 +150,7 @@ g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, service_type, NULL); diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c -index fb648d1..007dac4 100644 +index c6948a5..4db5548 100644 --- a/src/connection-editor/page-wifi.c +++ b/src/connection-editor/page-wifi.c @@ -26,6 +26,8 @@ diff -Nru network-manager-applet-1.8.4/debian/patches/series network-manager-applet-1.8.10/debian/patches/series --- network-manager-applet-1.8.4/debian/patches/series 2017-09-22 19:03:15.000000000 +0000 +++ network-manager-applet-1.8.10/debian/patches/series 2018-01-22 18:59:16.000000000 +0000 @@ -1,5 +1,7 @@ Allow-to-create-connections-without-admin-privileges.patch Force-online-state-with-unmanaged-devices.patch +shared-compat-fix-memory-handling-of-nm_setting_vpn_get_-.patch +shared-compat-fix-memory-handling-of-nm_setting_vpn_get_--1.patch lp341684_device_sensitive_disconnect_notify.patch lp460144_correctly_update_notification.patch applet-wifi-menu-before-vpn.patch diff -Nru network-manager-applet-1.8.4/debian/patches/shared-compat-fix-memory-handling-of-nm_setting_vpn_get_--1.patch network-manager-applet-1.8.10/debian/patches/shared-compat-fix-memory-handling-of-nm_setting_vpn_get_--1.patch --- network-manager-applet-1.8.4/debian/patches/shared-compat-fix-memory-handling-of-nm_setting_vpn_get_--1.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-1.8.10/debian/patches/shared-compat-fix-memory-handling-of-nm_setting_vpn_get_--1.patch 2018-01-22 18:59:16.000000000 +0000 @@ -0,0 +1,78 @@ +From: "Jan Alexander Steffens (heftig)" +Date: Thu, 21 Dec 2017 20:36:48 +0100 +Subject: shared/compat: fix memory handling of nm_setting_vpn_get_*_keys() + +The previous fix was bad because the keys do not come from NMSettingVpn's hash +table but are copies that are freed by nm_setting_vpn_foreach_* before +it returns. + +[thaller@redhat.com: import shared code from NetworkManager, merging +three patches together.] + +Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2 +Fixes: 0c90e08f77b71d2bda699cf032fceec0122bbf82 + +https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00069.html +https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00070.html +(cherry picked from commit a52ccb2fe170558fc0aab4dd1d15ba8808b10951) +--- + shared/nm-utils/nm-compat.c | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) + +diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c +index 47035e6..90328c0 100644 +--- a/shared/nm-utils/nm-compat.c ++++ b/shared/nm-utils/nm-compat.c +@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data) + { + GPtrArray *a = user_data; + +- g_ptr_array_add (a, (gpointer) key); ++ g_ptr_array_add (a, g_strdup (key)); + } + + static const char ** +@@ -40,22 +40,37 @@ _get_keys (NMSettingVpn *setting, + { + guint len; + const char **keys = NULL; +- gs_unref_ptrarray GPtrArray *a = NULL; ++ GPtrArray *a; + + nm_assert (NM_IS_SETTING_VPN (setting)); + +- a = g_ptr_array_new (); ++ if (is_secrets) ++ len = nm_setting_vpn_get_num_secrets (setting); ++ else ++ len = nm_setting_vpn_get_num_data_items (setting); ++ ++ a = g_ptr_array_sized_new (len + 1); ++ + if (is_secrets) + nm_setting_vpn_foreach_secret (setting, _get_keys_cb, a); + else + nm_setting_vpn_foreach_data_item (setting, _get_keys_cb, a); +- len = a->len; + +- if (a->len) { ++ len = a->len; ++ if (len) { + g_ptr_array_sort (a, nm_strcmp_p); + g_ptr_array_add (a, NULL); +- keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE); +- } ++ keys = g_memdup (a->pdata, a->len * sizeof (gpointer)); ++ ++ /* we need to cache the keys *somewhere*. */ ++ g_object_set_qdata_full (G_OBJECT (setting), ++ is_secrets ++ ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys") ++ : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"), ++ g_ptr_array_free (a, FALSE), ++ (GDestroyNotify) g_strfreev); ++ } else ++ g_ptr_array_free (a, TRUE); + + NM_SET_OUT (out_length, len); + return keys; diff -Nru network-manager-applet-1.8.4/debian/patches/shared-compat-fix-memory-handling-of-nm_setting_vpn_get_-.patch network-manager-applet-1.8.10/debian/patches/shared-compat-fix-memory-handling-of-nm_setting_vpn_get_-.patch --- network-manager-applet-1.8.4/debian/patches/shared-compat-fix-memory-handling-of-nm_setting_vpn_get_-.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-1.8.10/debian/patches/shared-compat-fix-memory-handling-of-nm_setting_vpn_get_-.patch 2018-01-22 18:59:16.000000000 +0000 @@ -0,0 +1,48 @@ +From: "Jan Alexander Steffens (heftig)" +Date: Wed, 20 Dec 2017 13:23:12 +0100 +Subject: shared/compat: fix memory handling of nm_setting_vpn_get_*_keys + +The compat implementations return a (transfer none) strv instead of a +(transfer container) one. This has caused double frees in nm-applet: +https://bugs.archlinux.org/task/56772 + +Don't copy the keys and don't free the container later. + +[thaller@redhat.com: patch adjusted to avoid compiler warning] + +Patch imported from NetworkManager commit 8ac8c01162235c2c198bfaf25fb7d1a57a595ce5. + +Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2 +(cherry picked from commit 0c90e08f77b71d2bda699cf032fceec0122bbf82) +--- + shared/nm-utils/nm-compat.c | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c +index 22ab675..47035e6 100644 +--- a/shared/nm-utils/nm-compat.c ++++ b/shared/nm-utils/nm-compat.c +@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data) + { + GPtrArray *a = user_data; + +- g_ptr_array_add (a, g_strdup (key)); ++ g_ptr_array_add (a, (gpointer) key); + } + + static const char ** +@@ -55,14 +55,6 @@ _get_keys (NMSettingVpn *setting, + g_ptr_array_sort (a, nm_strcmp_p); + g_ptr_array_add (a, NULL); + keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE); +- +- /* we need to cache the keys *somewhere*. */ +- g_object_set_qdata_full (G_OBJECT (setting), +- is_secrets +- ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys") +- : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"), +- keys, +- (GDestroyNotify) g_strfreev); + } + + NM_SET_OUT (out_length, len); diff -Nru network-manager-applet-1.8.4/debian/rules network-manager-applet-1.8.10/debian/rules --- network-manager-applet-1.8.4/debian/rules 2017-09-22 19:03:15.000000000 +0000 +++ network-manager-applet-1.8.10/debian/rules 2018-01-22 18:59:16.000000000 +0000 @@ -31,6 +31,7 @@ cp -rf $(CURDIR)/debian/icons/22 icons/ override_dh_install: + find debian/tmp -name '*.la' -print -delete dh_install # workaround for icon-changes # natty fallback icons @@ -68,5 +69,4 @@ debian/network-manager-gnome/usr/share/icons/hicolor/22x22/apps/gsm-3g-full-secure.png override_dh_missing: - find debian/tmp -name '*.la' -print -delete dh_missing --fail-missing diff -Nru network-manager-applet-1.8.4/depcomp network-manager-applet-1.8.10/depcomp --- network-manager-applet-1.8.4/depcomp 2017-02-10 06:47:11.000000000 +0000 +++ network-manager-applet-1.8.10/depcomp 2017-08-15 07:25:07.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -786,6 +786,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru network-manager-applet-1.8.4/gtkdocentities.ent.in network-manager-applet-1.8.10/gtkdocentities.ent.in --- network-manager-applet-1.8.4/gtkdocentities.ent.in 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-1.8.10/gtkdocentities.ent.in 2017-12-19 11:44:30.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru network-manager-applet-1.8.4/gtk-doc.make network-manager-applet-1.8.10/gtk-doc.make --- network-manager-applet-1.8.4/gtk-doc.make 2017-02-10 20:19:40.000000000 +0000 +++ network-manager-applet-1.8.10/gtk-doc.make 2017-07-19 19:03:10.000000000 +0000 @@ -81,55 +81,54 @@ #### setup #### -GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) -GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_@AM_V@) +GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_@AM_DEFAULT_V@) GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ - if test "x$$files" != "x" ; then \ - for file in $$files ; do \ - destdir=`dirname $(abs_builddir)/$$file`; \ - test -d "$$destdir" || mkdir -p "$$destdir"; \ - test -f $(abs_srcdir)/$$file && \ - cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ - done; \ - fi; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ + test -f $(abs_srcdir)/$$file && \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ + fi; \ fi $(AM_V_at)touch setup-build.stamp - #### scan #### -GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) -GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_@AM_V@) +GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_@AM_DEFAULT_V@) GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; -GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V)) -GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_@AM_V@) +GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@) GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - scanobj_options=""; \ - gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$$?" = "0"; then \ - if test "x$(V)" = "x1"; then \ - scanobj_options="--verbose"; \ - fi; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ fi; \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ - gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ else \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ fi $(AM_V_at)touch scan-build.stamp @@ -138,14 +137,14 @@ #### xml #### -GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) -GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML=$(GTK_DOC_V_XML_@AM_V@) +GTK_DOC_V_XML_=$(GTK_DOC_V_XML_@AM_DEFAULT_V@) GTK_DOC_V_XML_0=@echo " DOC Building XML"; sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) $(AM_V_at)touch sgml-build.stamp @@ -166,12 +165,12 @@ #### html #### -GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) -GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_@AM_V@) +GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_@AM_DEFAULT_V@) GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; -GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) -GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_@AM_V@) +GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_@AM_DEFAULT_V@) GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) @@ -190,20 +189,16 @@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@test "x$(HTML_IMAGES)" = "x" || \ for file in $(HTML_IMAGES) ; do \ - if test -f $(abs_srcdir)/$$file ; then \ - cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ - fi; \ - if test -f $(abs_builddir)/$$file ; then \ - cp $(abs_builddir)/$$file $(abs_builddir)/html; \ - fi; \ + test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \ done; $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) $(AM_V_at)touch html-build.stamp #### pdf #### -GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) -GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_@AM_V@) +GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_@AM_DEFAULT_V@) GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) diff -Nru network-manager-applet-1.8.4/html/annotation-glossary.html network-manager-applet-1.8.10/html/annotation-glossary.html --- network-manager-applet-1.8.4/html/annotation-glossary.html 2017-09-20 13:28:19.000000000 +0000 +++ network-manager-applet-1.8.10/html/annotation-glossary.html 2017-12-19 12:30:15.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -54,6 +54,6 @@

Override the parsed C type with given type.

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.26 \ No newline at end of file diff -Nru network-manager-applet-1.8.4/html/api-index-1.8.0.html network-manager-applet-1.8.10/html/api-index-1.8.0.html --- network-manager-applet-1.8.4/html/api-index-1.8.0.html 2017-09-20 13:28:19.000000000 +0000 +++ network-manager-applet-1.8.10/html/api-index-1.8.0.html 2017-12-19 12:30:15.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -25,204 +25,204 @@

N

-
NMACertChooser::cert-password-validate, The “cert-password-validate” signal +
NMACertChooser::cert-password-validate, The “cert-password-validate” signal
-
NMACertChooser::cert-validate, The “cert-validate” signal +
NMACertChooser::cert-validate, The “cert-validate” signal
-
NMACertChooser::changed, The “changed” signal +
NMACertChooser::changed, The “changed” signal
-
NMACertChooser::key-password-validate, The “key-password-validate” signal +
NMACertChooser::key-password-validate, The “key-password-validate” signal
-
NMACertChooser::key-validate, The “key-validate” signal +
NMACertChooser::key-validate, The “key-validate” signal
-
NMACertChooser:flags, The “flags” property +
NMACertChooser:flags, The “flags” property
-
NMACertChooser:title, The “title” property +
NMACertChooser:title, The “title” property
-
NMACertChooserFlags, enum NMACertChooserFlags +
NMACertChooserFlags, enum NMACertChooserFlags
-
NMAMobileFamily, enum NMAMobileFamily +
NMAMobileFamily, enum NMAMobileFamily
-
NMAMobileProvidersDatabase:country-codes, The “country-codes” property +
NMAMobileProvidersDatabase:country-codes, The “country-codes” property
-
NMAMobileProvidersDatabase:service-providers, The “service-providers” property +
NMAMobileProvidersDatabase:service-providers, The “service-providers” property
-
NMAMobileWizard, NMAMobileWizard +
NMAMobileWizard, NMAMobileWizard
-
NMAMobileWizardAccessMethod, NMAMobileWizardAccessMethod +
NMAMobileWizardAccessMethod, NMAMobileWizardAccessMethod
-
NMAMobileWizardCallback, NMAMobileWizardCallback () +
NMAMobileWizardCallback, NMAMobileWizardCallback ()
-
NMAVpnPasswordDialog, NMAVpnPasswordDialog +
NMAVpnPasswordDialog, NMAVpnPasswordDialog
-
NMAVpnPasswordDialogClass, NMAVpnPasswordDialogClass +
NMAVpnPasswordDialogClass, NMAVpnPasswordDialogClass
-
nma_cert_chooser_add_to_size_group, nma_cert_chooser_add_to_size_group () +
nma_cert_chooser_add_to_size_group, nma_cert_chooser_add_to_size_group ()
-
nma_cert_chooser_get_cert, nma_cert_chooser_get_cert () +
nma_cert_chooser_get_cert, nma_cert_chooser_get_cert ()
-
nma_cert_chooser_get_cert_password, nma_cert_chooser_get_cert_password () +
nma_cert_chooser_get_cert_password, nma_cert_chooser_get_cert_password ()
-
nma_cert_chooser_get_cert_password_flags, nma_cert_chooser_get_cert_password_flags () +
nma_cert_chooser_get_cert_password_flags, nma_cert_chooser_get_cert_password_flags ()
-
nma_cert_chooser_get_cert_uri, nma_cert_chooser_get_cert_uri () +
nma_cert_chooser_get_cert_uri, nma_cert_chooser_get_cert_uri ()
-
nma_cert_chooser_get_key, nma_cert_chooser_get_key () +
nma_cert_chooser_get_key, nma_cert_chooser_get_key ()
-
nma_cert_chooser_get_key_password, nma_cert_chooser_get_key_password () +
nma_cert_chooser_get_key_password, nma_cert_chooser_get_key_password ()
-
nma_cert_chooser_get_key_password_flags, nma_cert_chooser_get_key_password_flags () +
nma_cert_chooser_get_key_password_flags, nma_cert_chooser_get_key_password_flags ()
-
nma_cert_chooser_get_key_uri, nma_cert_chooser_get_key_uri () +
nma_cert_chooser_get_key_uri, nma_cert_chooser_get_key_uri ()
-
nma_cert_chooser_new, nma_cert_chooser_new () +
nma_cert_chooser_new, nma_cert_chooser_new ()
-
nma_cert_chooser_setup_cert_password_storage, nma_cert_chooser_setup_cert_password_storage () +
nma_cert_chooser_setup_cert_password_storage, nma_cert_chooser_setup_cert_password_storage ()
-
nma_cert_chooser_setup_key_password_storage, nma_cert_chooser_setup_key_password_storage () +
nma_cert_chooser_setup_key_password_storage, nma_cert_chooser_setup_key_password_storage ()
-
nma_cert_chooser_set_cert, nma_cert_chooser_set_cert () +
nma_cert_chooser_set_cert, nma_cert_chooser_set_cert ()
-
nma_cert_chooser_set_cert_password, nma_cert_chooser_set_cert_password () +
nma_cert_chooser_set_cert_password, nma_cert_chooser_set_cert_password ()
-
nma_cert_chooser_set_cert_uri, nma_cert_chooser_set_cert_uri () +
nma_cert_chooser_set_cert_uri, nma_cert_chooser_set_cert_uri ()
-
nma_cert_chooser_set_key, nma_cert_chooser_set_key () +
nma_cert_chooser_set_key, nma_cert_chooser_set_key ()
-
nma_cert_chooser_set_key_password, nma_cert_chooser_set_key_password () +
nma_cert_chooser_set_key_password, nma_cert_chooser_set_key_password ()
-
nma_cert_chooser_set_key_uri, nma_cert_chooser_set_key_uri () +
nma_cert_chooser_set_key_uri, nma_cert_chooser_set_key_uri ()
-
nma_cert_chooser_update_cert_password_storage, nma_cert_chooser_update_cert_password_storage () +
nma_cert_chooser_update_cert_password_storage, nma_cert_chooser_update_cert_password_storage ()
-
nma_cert_chooser_update_key_password_storage, nma_cert_chooser_update_key_password_storage () +
nma_cert_chooser_update_key_password_storage, nma_cert_chooser_update_key_password_storage ()
-
nma_cert_chooser_validate, nma_cert_chooser_validate () +
nma_cert_chooser_validate, nma_cert_chooser_validate ()
-
nma_country_info_get_country_code, nma_country_info_get_country_code () +
nma_country_info_get_country_code, nma_country_info_get_country_code ()
-
nma_country_info_get_country_name, nma_country_info_get_country_name () +
nma_country_info_get_country_name, nma_country_info_get_country_name ()
-
nma_country_info_get_providers, nma_country_info_get_providers () +
nma_country_info_get_providers, nma_country_info_get_providers ()
-
nma_country_info_ref, nma_country_info_ref () +
nma_country_info_ref, nma_country_info_ref ()
-
nma_country_info_unref, nma_country_info_unref () +
nma_country_info_unref, nma_country_info_unref ()
-
nma_mobile_access_method_get_3gpp_apn, nma_mobile_access_method_get_3gpp_apn () +
nma_mobile_access_method_get_3gpp_apn, nma_mobile_access_method_get_3gpp_apn ()
-
nma_mobile_access_method_get_dns, nma_mobile_access_method_get_dns () +
nma_mobile_access_method_get_dns, nma_mobile_access_method_get_dns ()
-
nma_mobile_access_method_get_family, nma_mobile_access_method_get_family () +
nma_mobile_access_method_get_family, nma_mobile_access_method_get_family ()
-
nma_mobile_access_method_get_gateway, nma_mobile_access_method_get_gateway () +
nma_mobile_access_method_get_gateway, nma_mobile_access_method_get_gateway ()
-
nma_mobile_access_method_get_name, nma_mobile_access_method_get_name () +
nma_mobile_access_method_get_name, nma_mobile_access_method_get_name ()
-
nma_mobile_access_method_get_password, nma_mobile_access_method_get_password () +
nma_mobile_access_method_get_password, nma_mobile_access_method_get_password ()
-
nma_mobile_access_method_get_username, nma_mobile_access_method_get_username () +
nma_mobile_access_method_get_username, nma_mobile_access_method_get_username ()
-
nma_mobile_access_method_ref, nma_mobile_access_method_ref () +
nma_mobile_access_method_ref, nma_mobile_access_method_ref ()
-
nma_mobile_access_method_unref, nma_mobile_access_method_unref () +
nma_mobile_access_method_unref, nma_mobile_access_method_unref ()
-
nma_mobile_providers_database_dump, nma_mobile_providers_database_dump () +
nma_mobile_providers_database_dump, nma_mobile_providers_database_dump ()
-
nma_mobile_providers_database_get_countries, nma_mobile_providers_database_get_countries () +
nma_mobile_providers_database_get_countries, nma_mobile_providers_database_get_countries ()
-
nma_mobile_providers_database_lookup_3gpp_mcc_mnc, nma_mobile_providers_database_lookup_3gpp_mcc_mnc () +
nma_mobile_providers_database_lookup_3gpp_mcc_mnc, nma_mobile_providers_database_lookup_3gpp_mcc_mnc ()
-
nma_mobile_providers_database_lookup_cdma_sid, nma_mobile_providers_database_lookup_cdma_sid () +
nma_mobile_providers_database_lookup_cdma_sid, nma_mobile_providers_database_lookup_cdma_sid ()
-
nma_mobile_providers_database_lookup_country, nma_mobile_providers_database_lookup_country () +
nma_mobile_providers_database_lookup_country, nma_mobile_providers_database_lookup_country ()
-
nma_mobile_providers_database_new, nma_mobile_providers_database_new () +
nma_mobile_providers_database_new, nma_mobile_providers_database_new ()
-
nma_mobile_providers_database_new_finish, nma_mobile_providers_database_new_finish () +
nma_mobile_providers_database_new_finish, nma_mobile_providers_database_new_finish ()
-
nma_mobile_providers_database_new_sync, nma_mobile_providers_database_new_sync () +
nma_mobile_providers_database_new_sync, nma_mobile_providers_database_new_sync ()
-
nma_mobile_providers_split_3gpp_mcc_mnc, nma_mobile_providers_split_3gpp_mcc_mnc () +
nma_mobile_providers_split_3gpp_mcc_mnc, nma_mobile_providers_split_3gpp_mcc_mnc ()
-
nma_mobile_provider_get_3gpp_mcc_mnc, nma_mobile_provider_get_3gpp_mcc_mnc () +
nma_mobile_provider_get_3gpp_mcc_mnc, nma_mobile_provider_get_3gpp_mcc_mnc ()
-
nma_mobile_provider_get_cdma_sid, nma_mobile_provider_get_cdma_sid () +
nma_mobile_provider_get_cdma_sid, nma_mobile_provider_get_cdma_sid ()
-
nma_mobile_provider_get_methods, nma_mobile_provider_get_methods () +
nma_mobile_provider_get_methods, nma_mobile_provider_get_methods ()
-
nma_mobile_provider_get_name, nma_mobile_provider_get_name () +
nma_mobile_provider_get_name, nma_mobile_provider_get_name ()
-
nma_mobile_provider_ref, nma_mobile_provider_ref () +
nma_mobile_provider_ref, nma_mobile_provider_ref ()
-
nma_mobile_provider_unref, nma_mobile_provider_unref () +
nma_mobile_provider_unref, nma_mobile_provider_unref ()
-
nma_mobile_wizard_destroy, nma_mobile_wizard_destroy () +
nma_mobile_wizard_destroy, nma_mobile_wizard_destroy ()
-
nma_mobile_wizard_new, nma_mobile_wizard_new () +
nma_mobile_wizard_new, nma_mobile_wizard_new ()
-
nma_mobile_wizard_present, nma_mobile_wizard_present () +
nma_mobile_wizard_present, nma_mobile_wizard_present ()
-
nma_utils_menu_to_secret_flags, nma_utils_menu_to_secret_flags () +
nma_utils_menu_to_secret_flags, nma_utils_menu_to_secret_flags ()
-
nma_utils_setup_password_storage, nma_utils_setup_password_storage () +
nma_utils_setup_password_storage, nma_utils_setup_password_storage ()
-
nma_utils_update_password_storage, nma_utils_update_password_storage () +
nma_utils_update_password_storage, nma_utils_update_password_storage ()
-
nma_vpn_password_dialog_focus_password, nma_vpn_password_dialog_focus_password () +
nma_vpn_password_dialog_focus_password, nma_vpn_password_dialog_focus_password ()
-
nma_vpn_password_dialog_focus_password_secondary, nma_vpn_password_dialog_focus_password_secondary () +
nma_vpn_password_dialog_focus_password_secondary, nma_vpn_password_dialog_focus_password_secondary ()
-
nma_vpn_password_dialog_focus_password_ternary, nma_vpn_password_dialog_focus_password_ternary () +
nma_vpn_password_dialog_focus_password_ternary, nma_vpn_password_dialog_focus_password_ternary ()
-
nma_vpn_password_dialog_get_password, nma_vpn_password_dialog_get_password () +
nma_vpn_password_dialog_get_password, nma_vpn_password_dialog_get_password ()
-
nma_vpn_password_dialog_get_password_secondary, nma_vpn_password_dialog_get_password_secondary () +
nma_vpn_password_dialog_get_password_secondary, nma_vpn_password_dialog_get_password_secondary ()
-
nma_vpn_password_dialog_get_password_ternary, nma_vpn_password_dialog_get_password_ternary () +
nma_vpn_password_dialog_get_password_ternary, nma_vpn_password_dialog_get_password_ternary ()
-
nma_vpn_password_dialog_new, nma_vpn_password_dialog_new () +
nma_vpn_password_dialog_new, nma_vpn_password_dialog_new ()
-
nma_vpn_password_dialog_run_and_block, nma_vpn_password_dialog_run_and_block () +
nma_vpn_password_dialog_run_and_block, nma_vpn_password_dialog_run_and_block ()
-
nma_vpn_password_dialog_set_password, nma_vpn_password_dialog_set_password () +
nma_vpn_password_dialog_set_password, nma_vpn_password_dialog_set_password ()
-
nma_vpn_password_dialog_set_password_label, nma_vpn_password_dialog_set_password_label () +
nma_vpn_password_dialog_set_password_label, nma_vpn_password_dialog_set_password_label ()
-
nma_vpn_password_dialog_set_password_secondary, nma_vpn_password_dialog_set_password_secondary () +
nma_vpn_password_dialog_set_password_secondary, nma_vpn_password_dialog_set_password_secondary ()
-
nma_vpn_password_dialog_set_password_secondary_label, nma_vpn_password_dialog_set_password_secondary_label () +
nma_vpn_password_dialog_set_password_secondary_label, nma_vpn_password_dialog_set_password_secondary_label ()
-
nma_vpn_password_dialog_set_password_ternary, nma_vpn_password_dialog_set_password_ternary () +
nma_vpn_password_dialog_set_password_ternary, nma_vpn_password_dialog_set_password_ternary ()
-
nma_vpn_password_dialog_set_password_ternary_label, nma_vpn_password_dialog_set_password_ternary_label () +
nma_vpn_password_dialog_set_password_ternary_label, nma_vpn_password_dialog_set_password_ternary_label ()
-
nma_vpn_password_dialog_set_show_password, nma_vpn_password_dialog_set_show_password () +
nma_vpn_password_dialog_set_show_password, nma_vpn_password_dialog_set_show_password ()
-
nma_vpn_password_dialog_set_show_password_secondary, nma_vpn_password_dialog_set_show_password_secondary () +
nma_vpn_password_dialog_set_show_password_secondary, nma_vpn_password_dialog_set_show_password_secondary ()
-
nma_vpn_password_dialog_set_show_password_ternary, nma_vpn_password_dialog_set_show_password_ternary () +
nma_vpn_password_dialog_set_show_password_ternary, nma_vpn_password_dialog_set_show_password_ternary ()
-
nma_wifi_dialog_get_connection, nma_wifi_dialog_get_connection () +
nma_wifi_dialog_get_connection, nma_wifi_dialog_get_connection ()
-
nma_wifi_dialog_get_nag_ignored, nma_wifi_dialog_get_nag_ignored () +
nma_wifi_dialog_get_nag_ignored, nma_wifi_dialog_get_nag_ignored ()
-
nma_wifi_dialog_nag_user, nma_wifi_dialog_nag_user () +
nma_wifi_dialog_nag_user, nma_wifi_dialog_nag_user ()
-
nma_wifi_dialog_new, nma_wifi_dialog_new () +
nma_wifi_dialog_new, nma_wifi_dialog_new ()
-
nma_wifi_dialog_new_for_create, nma_wifi_dialog_new_for_create () +
nma_wifi_dialog_new_for_create, nma_wifi_dialog_new_for_create ()
-
nma_wifi_dialog_new_for_hidden, nma_wifi_dialog_new_for_hidden () +
nma_wifi_dialog_new_for_hidden, nma_wifi_dialog_new_for_hidden ()
-
nma_wifi_dialog_new_for_other, nma_wifi_dialog_new_for_other () +
nma_wifi_dialog_new_for_other, nma_wifi_dialog_new_for_other ()
-
nma_wifi_dialog_set_nag_ignored, nma_wifi_dialog_set_nag_ignored () +
nma_wifi_dialog_set_nag_ignored, nma_wifi_dialog_set_nag_ignored ()
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.26 \ No newline at end of file diff -Nru network-manager-applet-1.8.4/html/api-index-full.html network-manager-applet-1.8.10/html/api-index-full.html --- network-manager-applet-1.8.4/html/api-index-full.html 2017-09-20 13:28:19.000000000 +0000 +++ network-manager-applet-1.8.10/html/api-index-full.html 2017-12-19 12:30:15.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -425,6 +425,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.26 \ No newline at end of file diff -Nru network-manager-applet-1.8.4/html/api-reference.html network-manager-applet-1.8.10/html/api-reference.html --- network-manager-applet-1.8.4/html/api-reference.html 2017-09-20 13:28:19.000000000 +0000 +++ network-manager-applet-1.8.10/html/api-reference.html 2017-12-19 12:30:15.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -44,6 +44,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.26 \ No newline at end of file diff -Nru network-manager-applet-1.8.4/html/index.html network-manager-applet-1.8.10/html/index.html --- network-manager-applet-1.8.4/html/index.html 2017-09-20 13:28:19.000000000 +0000 +++ network-manager-applet-1.8.10/html/index.html 2017-12-19 12:30:15.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for libnma 1.8.4. + for libnma 1.8.10. The latest version of this documentation can be found on-line at https://developer.gnome.org/libnma/.

@@ -74,6 +74,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.26 \ No newline at end of file diff -Nru network-manager-applet-1.8.4/html/libnma-nma-mobile-wizard.html network-manager-applet-1.8.10/html/libnma-nma-mobile-wizard.html --- network-manager-applet-1.8.4/html/libnma-nma-mobile-wizard.html 2017-09-20 13:28:19.000000000 +0000 +++ network-manager-applet-1.8.10/html/libnma-nma-mobile-wizard.html 2017-12-19 12:30:15.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -102,20 +102,20 @@

NMAMobileWizardCallback ()

void
 (*NMAMobileWizardCallback) (NMAMobileWizard *self,
-                            gboolean canceled,
+                            gboolean canceled,
                             NMAMobileWizardAccessMethod *method,
-                            gpointer user_data);
+ gpointer user_data);

nma_mobile_wizard_new ()

NMAMobileWizard *
-nma_mobile_wizard_new (GtkWindow *parent,
-                       GtkWindowGroup *window_group,
-                       NMDeviceModemCapabilities modem_caps,
-                       gboolean will_connect_after,
+nma_mobile_wizard_new (GtkWindow *parent,
+                       GtkWindowGroup *window_group,
+                       NMDeviceModemCapabilities modem_caps,
+                       gboolean will_connect_after,
                        NMAMobileWizardCallback cb,
-                       gpointer user_data);
+ gpointer user_data);

[skip]

Parameters

@@ -154,8 +154,6 @@

Types and Values

NMAMobileWizard

-
typedef struct NMAMobileWizard NMAMobileWizard;
-
@@ -190,7 +188,7 @@   -

NMDeviceModemCapabilities devtype;

+

NMDeviceModemCapabilities devtype;

Required NetworkManager device capabilities

  @@ -216,6 +214,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.26
\ No newline at end of file diff -Nru network-manager-applet-1.8.4/html/libnma-nma-ui-utils.html network-manager-applet-1.8.10/html/libnma-nma-ui-utils.html --- network-manager-applet-1.8.4/html/libnma-nma-ui-utils.html 2017-09-20 13:28:19.000000000 +0000 +++ network-manager-applet-1.8.10/html/libnma-nma-ui-utils.html 2017-12-19 12:30:15.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -49,7 +49,7 @@ -NMSettingSecretFlags +NMSettingSecretFlags nma_utils_menu_to_secret_flags () @@ -74,12 +74,12 @@

nma_utils_setup_password_storage ()

void
-nma_utils_setup_password_storage (GtkWidget *passwd_entry,
-                                  NMSettingSecretFlags initial_flags,
-                                  NMSetting *setting,
+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);
+ gboolean with_not_required, + gboolean ask_mode);

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 @@ -100,7 +100,7 @@

passwd_entry

-

password GtkEntry which the icon is attached to

+

password GtkEntry which the icon is attached to

  @@ -110,7 +110,7 @@

setting

-

NMSetting containing the password, or NULL

+

NMSetting containing the password, or NULL

  @@ -125,13 +125,13 @@

ask_mode

-

TRUE if the entry is shown in ASK mode. That means, +

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" +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, +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.

  @@ -143,8 +143,8 @@

nma_utils_menu_to_secret_flags ()

-
NMSettingSecretFlags
-nma_utils_menu_to_secret_flags (GtkWidget *passwd_entry);
+
NMSettingSecretFlags
+nma_utils_menu_to_secret_flags (GtkWidget *passwd_entry);

Returns secret flags corresponding to the selected password storage menu in the attached icon

@@ -157,7 +157,7 @@

passwd_entry

-

password GtkEntry which the password icon/menu is attached to

+

password GtkEntry which the password icon/menu is attached to

 
@@ -171,9 +171,9 @@

nma_utils_update_password_storage ()

void
-nma_utils_update_password_storage (GtkWidget *passwd_entry,
-                                   NMSettingSecretFlags secret_flags,
-                                   NMSetting *setting,
+nma_utils_update_password_storage (GtkWidget *passwd_entry,
+                                   NMSettingSecretFlags secret_flags,
+                                   NMSetting *setting,
                                    const char *password_flags_name);

Updates secret flags in the password storage popup menu and also in the setting @@ -191,7 +191,7 @@

passwd_entry

-

GtkEntry with the password

+

GtkEntry with the password

  @@ -201,7 +201,7 @@

setting

-

NMSetting containing the password, or NULL

+

NMSetting containing the password, or NULL

  @@ -219,6 +219,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.26
\ No newline at end of file diff -Nru network-manager-applet-1.8.4/html/NMACertChooser.html network-manager-applet-1.8.10/html/NMACertChooser.html --- network-manager-applet-1.8.4/html/NMACertChooser.html 2017-09-20 13:28:19.000000000 +0000 +++ network-manager-applet-1.8.10/html/NMACertChooser.html 2017-12-19 12:30:15.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -60,7 +60,7 @@ -gchar * +gchar * nma_cert_chooser_get_cert () @@ -68,7 +68,7 @@ -gchar * +gchar * nma_cert_chooser_get_cert_uri () @@ -83,7 +83,7 @@ -const gchar * +const gchar * nma_cert_chooser_get_cert_password () @@ -107,7 +107,7 @@ -gchar * +gchar * nma_cert_chooser_get_key () @@ -115,7 +115,7 @@ -gchar * +gchar * nma_cert_chooser_get_key_uri () @@ -130,7 +130,7 @@ -const gchar * +const gchar * nma_cert_chooser_get_key_password () @@ -138,7 +138,7 @@ -GtkWidget * +GtkWidget * nma_cert_chooser_new () @@ -154,7 +154,7 @@ -gboolean +gboolean nma_cert_chooser_validate () @@ -178,7 +178,7 @@ -NMSettingSecretFlags +NMSettingSecretFlags nma_cert_chooser_get_cert_password_flags () @@ -202,7 +202,7 @@ -NMSettingSecretFlags +NMSettingSecretFlags nma_cert_chooser_get_key_password_flags () @@ -221,13 +221,13 @@ -guint +guint flags Write / Construct Only -gchar * +gchar * title Write / Construct Only @@ -245,32 +245,32 @@ -GError* +GError* cert-password-validate -Run Last +Run Last -GError* +GError* cert-validate -Run Last +Run Last void changed -No Recursion +No Recursion -GError* +GError* key-password-validate -Run Last +Run Last -GError* +GError* key-validate -Run Last +Run Last @@ -290,11 +290,11 @@

Object Hierarchy

-
    GObject
-    ╰── GInitiallyUnowned
-        ╰── GtkWidget
-            ╰── GtkContainer
-                ╰── GtkGrid
+
    GObject
+    ╰── GInitiallyUnowned
+        ╰── GtkWidget
+            ╰── GtkContainer
+                ╰── GtkGrid
                     ╰── NMACertChooser
@@ -313,8 +313,8 @@

nma_cert_chooser_set_cert ()

void
 nma_cert_chooser_set_cert (NMACertChooser *cert_chooser,
-                           const gchar *value,
-                           NMSetting8021xCKScheme scheme);
+ const gchar *value, + NMSetting8021xCKScheme scheme);

Sets the certificate location for the chooser button.

Parameters

@@ -350,7 +350,7 @@

nma_cert_chooser_set_cert_uri ()

void
 nma_cert_chooser_set_cert_uri (NMACertChooser *cert_chooser,
-                               const gchar *uri);
+ const gchar *uri);

Sets the certificate URI for the chooser button.

Parameters

@@ -379,9 +379,9 @@

nma_cert_chooser_get_cert ()

-
gchar *
+
gchar *
 nma_cert_chooser_get_cert (NMACertChooser *cert_chooser,
-                           NMSetting8021xCKScheme *scheme);

+                           NMSetting8021xCKScheme *scheme);

Gets the real certificate location from the chooser button along with the scheme.

Parameters

@@ -399,7 +399,7 @@

scheme

-

the scheme of the returned certificate path.

+

the scheme of the returned certificate path.

[out] @@ -414,7 +414,7 @@

nma_cert_chooser_get_cert_uri ()

-
gchar *
+
gchar *
 nma_cert_chooser_get_cert_uri (NMACertChooser *cert_chooser);

 
Gets the real certificate URI from the chooser button along with the scheme.

 

@@ -443,7 +443,7 @@
 
nma_cert_chooser_set_cert_password ()

 
void
 nma_cert_chooser_set_cert_password (NMACertChooser *cert_chooser,
-                                    const gchar *password);

+                                    const gchar *password);

Sets the password or a PIN that might be required to access the certificate.

Parameters

@@ -472,7 +472,7 @@

nma_cert_chooser_get_cert_password ()

-
const gchar *
+
const gchar *
 nma_cert_chooser_get_cert_password (NMACertChooser *cert_chooser);

 
Obtains the password or a PIN that was be required to access the certificate.

 

@@ -501,8 +501,8 @@
 
nma_cert_chooser_set_key ()

 
void
 nma_cert_chooser_set_key (NMACertChooser *cert_chooser,
-                          const gchar *value,
-                          NMSetting8021xCKScheme scheme);

+                          const gchar *value,
+                          NMSetting8021xCKScheme scheme);

Sets the key location for the chooser button.

Parameters

@@ -538,7 +538,7 @@

nma_cert_chooser_set_key_uri ()

void
 nma_cert_chooser_set_key_uri (NMACertChooser *cert_chooser,
-                              const gchar *uri);
+ const gchar *uri);

Sets the key URI for the chooser button.

Parameters

@@ -567,9 +567,9 @@

nma_cert_chooser_get_key ()

-
gchar *
+
gchar *
 nma_cert_chooser_get_key (NMACertChooser *cert_chooser,
-                          NMSetting8021xCKScheme *scheme);

+                          NMSetting8021xCKScheme *scheme);

Gets the real key location from the chooser button along with the scheme.

Parameters

@@ -587,7 +587,7 @@

scheme

-

the scheme of the returned key path.

+

the scheme of the returned key path.

[out] @@ -602,7 +602,7 @@

nma_cert_chooser_get_key_uri ()

-
gchar *
+
gchar *
 nma_cert_chooser_get_key_uri (NMACertChooser *cert_chooser);

 
Gets the real key URI from the chooser button along with the scheme.

 

@@ -631,7 +631,7 @@
 
nma_cert_chooser_set_key_password ()

 
void
 nma_cert_chooser_set_key_password (NMACertChooser *cert_chooser,
-                                   const gchar *password);

+                                   const gchar *password);

Sets the password or a PIN that might be required to access the key.

Parameters

@@ -660,7 +660,7 @@

nma_cert_chooser_get_key_password ()

-
const gchar *
+
const gchar *
 nma_cert_chooser_get_key_password (NMACertChooser *cert_chooser);

 
Obtains the password or a PIN that was be required to access the key.

 

@@ -687,8 +687,8 @@
 

 

 
nma_cert_chooser_new ()

-
GtkWidget *
-nma_cert_chooser_new (const gchar *title,
+
GtkWidget *
+nma_cert_chooser_new (const gchar *title,
                       NMACertChooserFlags flags);

 
Constructs the button that is capable of selecting a certificate
 and a key.

@@ -716,7 +716,7 @@
 

 

 
Returns

-
 the certificate chooser button instance. 

+
the certificate chooser button instance. 

 
[transfer full]

 

 
Since: 1.8.0

@@ -726,7 +726,7 @@
 
nma_cert_chooser_add_to_size_group ()

 
void
 nma_cert_chooser_add_to_size_group (NMACertChooser *cert_chooser,
-                                    GtkSizeGroup *group);

+                                    GtkSizeGroup *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 @@ -758,9 +758,9 @@

nma_cert_chooser_validate ()

-
gboolean
+
gboolean
 nma_cert_chooser_validate (NMACertChooser *cert_chooser,
-                           GError **error);

+                           GError **error);

Validates whether the chosen values make sense. The users can do further validation by subscribing to the "*-changed" signals and returning an error themselves.

@@ -788,7 +788,7 @@

Returns

-

TRUE if validation passes, FALSE otherwise

+

TRUE if validation passes, FALSE otherwise

Since: 1.8.0

@@ -798,11 +798,11 @@ 
void
 nma_cert_chooser_setup_cert_password_storage
                                (NMACertChooser *cert_chooser,
-                                NMSettingSecretFlags initial_flags,
-                                NMSetting *setting,
+                                NMSettingSecretFlags initial_flags,
+                                NMSetting *setting,
                                 const char *password_flags_name,
-                                gboolean with_not_required,
-                                gboolean ask_mode);
+ gboolean with_not_required, + gboolean ask_mode);

This method basically calls nma_utils_setup_password_storage() on the certificate password entry, in case one is present.

@@ -826,7 +826,7 @@

setting

-

NMSetting containing the password, or NULL

+

NMSetting containing the password, or NULL

  @@ -841,7 +841,7 @@

ask_mode

-

TRUE if the entry is shown in ASK mode

+

TRUE if the entry is shown in ASK mode

  @@ -855,8 +855,8 @@ 
void
 nma_cert_chooser_update_cert_password_storage
                                (NMACertChooser *cert_chooser,
-                                NMSettingSecretFlags secret_flags,
-                                NMSetting *setting,
+                                NMSettingSecretFlags secret_flags,
+                                NMSetting *setting,
                                 const char *password_flags_name);

This method basically calls nma_utils_update_password_storage() on the certificate password entry, in case one is present.

@@ -881,7 +881,7 @@

setting

-

NMSetting containing the password, or NULL

+

NMSetting containing the password, or NULL

  @@ -897,7 +897,7 @@

nma_cert_chooser_get_cert_password_flags ()

-
NMSettingSecretFlags
+
NMSettingSecretFlags
 nma_cert_chooser_get_cert_password_flags
                                (NMACertChooser *cert_chooser);

 
Returns secret flags corresponding to the certificate password
@@ -931,11 +931,11 @@
 
void
 nma_cert_chooser_setup_key_password_storage
                                (NMACertChooser *cert_chooser,
-                                NMSettingSecretFlags initial_flags,
-                                NMSetting *setting,
+                                NMSettingSecretFlags initial_flags,
+                                NMSetting *setting,
                                 const char *password_flags_name,
-                                gboolean with_not_required,
-                                gboolean ask_mode);

+                                gboolean with_not_required,
+                                gboolean ask_mode);

This method basically calls nma_utils_setup_password_storage() on the key password entry, in case one is present.

@@ -959,7 +959,7 @@

setting

-

NMSetting containing the password, or NULL

+

NMSetting containing the password, or NULL

  @@ -974,7 +974,7 @@

ask_mode

-

TRUE if the entry is shown in ASK mode

+

TRUE if the entry is shown in ASK mode

  @@ -988,8 +988,8 @@ 
void
 nma_cert_chooser_update_key_password_storage
                                (NMACertChooser *cert_chooser,
-                                NMSettingSecretFlags secret_flags,
-                                NMSetting *setting,
+                                NMSettingSecretFlags secret_flags,
+                                NMSetting *setting,
                                 const char *password_flags_name);

This method basically calls nma_utils_update_password_storage() on the key password entry, in case one is present.

@@ -1014,7 +1014,7 @@

setting

-

NMSetting containing the password, or NULL

+

NMSetting containing the password, or NULL

  @@ -1030,7 +1030,7 @@

nma_cert_chooser_get_key_password_flags ()

-
NMSettingSecretFlags
+
NMSettingSecretFlags
 nma_cert_chooser_get_key_password_flags
                                (NMACertChooser *cert_chooser);

 
Returns secret flags corresponding to the key password
@@ -1113,7 +1113,7 @@
 
Property Details

 

 
The “flags” property

-
  “flags”                    guint

+
  “flags”                    guint

 
Certificate Chooser Flags.

 
Flags: Write / Construct Only

 
Allowed values: <= 7

@@ -1122,7 +1122,7 @@
 

 

 
The “title” property

-
  “title”                    gchar *

+
  “title”                    gchar *

 
Certificate Chooser Title.

 
Flags: Write / Construct Only

 
Default value: NULL

@@ -1132,9 +1132,9 @@
 
Signal Details

 

 
The “cert-password-validate” signal

-
GError*
-user_function (NMACertChooser *arg0,
-               gpointer        user_data)

+
GError*
+user_function (NMACertChooser *nmacertchooser,
+               gpointer        user_data)

 
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()
@@ -1154,15 +1154,15 @@
 
 

 

-
Flags: Run Last

+
Flags: Run Last

 
Since: 1.8.0

 

 

 

 
The “cert-validate” signal

-
GError*
-user_function (NMACertChooser *arg0,
-               gpointer        user_data)

+
GError*
+user_function (NMACertChooser *nmacertchooser,
+               gpointer        user_data)

 
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()
@@ -1182,15 +1182,15 @@
-

Flags: Run Last

+

Flags: Run Last

Since: 1.8.0

The “changed” signal

void
-user_function (NMACertChooser *arg0,
-               gpointer        user_data)
+user_function (NMACertChooser *nmacertchooser, + gpointer user_data)

Emitted when anything changes in the certificate chooser, be it a certificate, a key or associated passwords.

@@ -1208,15 +1208,15 @@
-

Flags: No Recursion

+

Flags: No Recursion

Since: 1.8.0

The “key-password-validate” signal

-
GError*
-user_function (NMACertChooser *arg0,
-               gpointer        user_data)
+
GError*
+user_function (NMACertChooser *nmacertchooser,
+               gpointer        user_data)

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() @@ -1236,15 +1236,15 @@

-

Flags: Run Last

+

Flags: Run Last

Since: 1.8.0

The “key-validate” signal

-
GError*
-user_function (NMACertChooser *arg0,
-               gpointer        user_data)
+
GError*
+user_function (NMACertChooser *nmacertchooser,
+               gpointer        user_data)

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() @@ -1264,12 +1264,12 @@

-

Flags: Run Last

+

Flags: Run Last

Since: 1.8.0

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.26
\ No newline at end of file diff -Nru network-manager-applet-1.8.4/html/NMAMobileProvidersDatabase.html network-manager-applet-1.8.10/html/NMAMobileProvidersDatabase.html --- network-manager-applet-1.8.4/html/NMAMobileProvidersDatabase.html 2017-09-20 13:28:19.000000000 +0000 +++ network-manager-applet-1.8.10/html/NMAMobileProvidersDatabase.html 2017-12-19 12:30:15.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -58,42 +58,42 @@ -const gchar * +const gchar * nma_mobile_access_method_get_name () -const gchar * +const gchar * nma_mobile_access_method_get_username () -const gchar * +const gchar * nma_mobile_access_method_get_password () -const gchar * +const gchar * nma_mobile_access_method_get_gateway () -const gchar ** +const gchar ** nma_mobile_access_method_get_dns () -const gchar * +const gchar * nma_mobile_access_method_get_3gpp_apn () @@ -124,7 +124,7 @@ -const gchar * +const gchar * nma_mobile_provider_get_name () @@ -132,21 +132,21 @@ -GSList * +GSList * nma_mobile_provider_get_methods () -const gchar ** +const gchar ** nma_mobile_provider_get_3gpp_mcc_mnc () -const guint32 * +const guint32 * nma_mobile_provider_get_cdma_sid () @@ -169,14 +169,14 @@ -const gchar * +const gchar * nma_country_info_get_country_code () -const gchar * +const gchar * nma_country_info_get_country_name () @@ -184,7 +184,7 @@ -GSList * +GSList * nma_country_info_get_providers () @@ -216,7 +216,7 @@ -GHashTable * +GHashTable * nma_mobile_providers_database_get_countries () @@ -256,7 +256,7 @@ -gboolean +gboolean nma_mobile_providers_split_3gpp_mcc_mnc () @@ -276,13 +276,13 @@ -gchar * +gchar * country-codes Read / Write / Construct Only -gchar * +gchar * service-providers Read / Write / Construct Only @@ -308,7 +308,7 @@ ├── NMACountryInfo ├── NMAMobileAccessMethod ╰── NMAMobileProvider - GObject + GObject ╰── NMAMobileProvidersDatabase
@@ -331,7 +331,7 @@

nma_mobile_access_method_get_name ()

-
const gchar *
+
const gchar *
 nma_mobile_access_method_get_name (NMAMobileAccessMethod *method);

 

 
Parameters

@@ -350,14 +350,14 @@
 

 

 
Returns

-
 the name of the method. 

+
the name of the method. 

 
[transfer none]

nma_mobile_access_method_get_username ()

-
const gchar *
+
const gchar *
 nma_mobile_access_method_get_username (NMAMobileAccessMethod *method);

 

 
Parameters

@@ -376,14 +376,14 @@
 

 

 
Returns

-
 the username. 

+
the username. 

 
[transfer none]

nma_mobile_access_method_get_password ()

-
const gchar *
+
const gchar *
 nma_mobile_access_method_get_password (NMAMobileAccessMethod *method);

 

 
Parameters

@@ -402,14 +402,14 @@
 

 

 
Returns

-
 the password. 

+
the password. 

 
[transfer none]

nma_mobile_access_method_get_gateway ()

-
const gchar *
+
const gchar *
 nma_mobile_access_method_get_gateway (NMAMobileAccessMethod *method);

 

 
Parameters

@@ -428,14 +428,14 @@
 

 

 
Returns

-
 the gateway. 

+
the gateway. 

 
[transfer none]

nma_mobile_access_method_get_dns ()

-
const gchar **
+
const gchar **
 nma_mobile_access_method_get_dns (NMAMobileAccessMethod *method);

 

 
Parameters

@@ -454,14 +454,14 @@
 

 

 
Returns

-
 the list of DNS. 

+
the list of DNS. 

 
[transfer none][array zero-terminated=1][element-type utf8]

nma_mobile_access_method_get_3gpp_apn ()

-
const gchar *
+
const gchar *
 nma_mobile_access_method_get_3gpp_apn (NMAMobileAccessMethod *method);

 

 
Parameters

@@ -480,7 +480,7 @@
 

 

 
Returns

-
 the 3GPP APN. 

+
the 3GPP APN. 

 
[transfer none]
@@ -524,7 +524,7 @@

nma_mobile_provider_get_name ()

-
const gchar *
+
const gchar *
 nma_mobile_provider_get_name (NMAMobileProvider *provider);

 

 
Parameters

@@ -543,14 +543,14 @@
 

 

 
Returns

-
 the name of the provider. 

+
the name of the provider. 

 
[transfer none]

nma_mobile_provider_get_methods ()

-
GSList *
+
GSList *
 nma_mobile_provider_get_methods (NMAMobileProvider *provider);

 

 
Parameters

@@ -569,7 +569,7 @@
 

 

 
Returns

-
 the
+
the
 list of NMAMobileAccessMethod this provider exposes. 

 
[element-type NMAMobileAccessMethod][transfer none]

 

@@ -577,7 +577,7 @@
 

 

 
nma_mobile_provider_get_3gpp_mcc_mnc ()

-
const gchar **
+
const gchar **
 nma_mobile_provider_get_3gpp_mcc_mnc (NMAMobileProvider *provider);

 

 
Parameters

@@ -596,7 +596,7 @@
 

 

 
Returns

-
 a
+
a
 list of strings with the MCC and MNC codes this provider exposes. 

 
[transfer none][array zero-terminated=1][element-type utf8]

 

@@ -604,7 +604,7 @@
 

 

 
nma_mobile_provider_get_cdma_sid ()

-
const guint32 *
+
const guint32 *
 nma_mobile_provider_get_cdma_sid (NMAMobileProvider *provider);

 

 
Parameters

@@ -623,7 +623,7 @@
 

 

 
Returns

-
 the
+
the
 list of CDMA SIDs this provider exposes. 

 
[transfer none][array zero-terminated=1][element-type guint32]

 

@@ -643,7 +643,7 @@
 

 

 
nma_country_info_get_country_code ()

-
const gchar *
+
const gchar *
 nma_country_info_get_country_code (NMACountryInfo *country_info);

 

 
Parameters

@@ -662,14 +662,14 @@
 

 

 
Returns

-
 the code of the country. 

+
the code of the country. 

 
[transfer none]

 

 

 

 

 
nma_country_info_get_country_name ()

-
const gchar *
+
const gchar *
 nma_country_info_get_country_name (NMACountryInfo *country_info);

 

 
Parameters

@@ -688,14 +688,14 @@
 

 

 
Returns

-
 the name of the country. 

+
the name of the country. 

 
[transfer none]

 

 

 

 

 
nma_country_info_get_providers ()

-
GSList *
+
GSList *
 nma_country_info_get_providers (NMACountryInfo *country_info);

 

 
Parameters

@@ -714,7 +714,7 @@
 

 

 
Returns

-
 the
+
the
 list of NMAMobileProvider this country exposes. 

 
[element-type NMAMobileProvider][transfer none]

 

@@ -723,11 +723,11 @@
 

 
nma_mobile_providers_database_new ()

 
void
-nma_mobile_providers_database_new (const gchar *country_codes,
-                                   const gchar *service_providers,
-                                   GCancellable *cancellable,
-                                   GAsyncReadyCallback callback,
-                                   gpointer user_data);

+nma_mobile_providers_database_new (const gchar *country_codes,
+                                   const gchar *service_providers,
+                                   GCancellable *cancellable,
+                                   GAsyncReadyCallback callback,
+                                   gpointer user_data);

 

 
Parameters

 

@@ -739,22 +739,22 @@
 
-
+
-
+
-
+
-
+
@@ -772,8 +772,8 @@
 
nma_mobile_providers_database_new_finish ()
NMAMobileProvidersDatabase *
 nma_mobile_providers_database_new_finish
-                               (GAsyncResult *res,
-                                GError **error);

+                               (GAsyncResult *res,
+                                GError **error);

 
Parameters

 

 

 
country_codes
 Path to the country codes file. 
Path to the country codes file. 

 [allow-none]
 

 

 
service_providers
 Path to the service providers file. 
Path to the service providers file. 

 [allow-none]
 

 

 
cancellable
 A GCancellable or NULL. 
A GCancellable or NULL. 

 [allow-none]
 

 

 
callback
A GAsyncReadyCallback to call when the request is satisfied.
A GAsyncReadyCallback to call when the request is satisfied.

  
 

 

 
 

@@ -785,12 +785,12 @@
 
-
+
-
+
@@ -798,7 +798,7 @@
 

 
Returns

-
 The constructed object or NULL if error
+
The constructed object or NULL if error
 is set. 

 
[transfer full][type NMAMobileProvidersDatabase]

 

@@ -808,10 +808,10 @@
 
nma_mobile_providers_database_new_sync ()
NMAMobileProvidersDatabase *
 nma_mobile_providers_database_new_sync
-                               (const gchar *country_codes,
-                                const gchar *service_providers,
-                                GCancellable *cancellable,
-                                GError **error);

+                               (const gchar *country_codes,
+                                const gchar *service_providers,
+                                GCancellable *cancellable,
+                                GError **error);

 
Parameters

 

 

 
res
The GAsyncResult obtained from the GAsyncReadyCallback passed to nma_mobile_providers_database_new().
The GAsyncResult obtained from the GAsyncReadyCallback passed to nma_mobile_providers_database_new().

  
 

 

 
error
Return location for error or NULL.
Return location for error or NULL.

  
 

 
 
 
 

@@ -823,22 +823,22 @@
 
-
+
-
+
-
+
-
+
@@ -846,7 +846,7 @@
 

 
Returns

-
 The constructed object or NULL if error
+
The constructed object or NULL if error
 is set. 

 
[transfer full][type NMAMobileProvidersDatabase]

 

@@ -854,7 +854,7 @@
 

 
nma_mobile_providers_database_get_countries ()

-
GHashTable *
+
GHashTable *
 nma_mobile_providers_database_get_countries
                                (NMAMobileProvidersDatabase *self);

 

@@ -874,8 +874,8 @@
 

 

 
Returns

-
 a
-hash table where keys are country names gchar and values are NMACountryInfo. 

+
a
+hash table where keys are country names gchar and values are NMACountryInfo. 

 
[element-type utf8 NMACountryInfo][transfer none]

 

 

@@ -906,7 +906,7 @@
 
NMACountryInfo *
 nma_mobile_providers_database_lookup_country
                                (NMAMobileProvidersDatabase *self,
-                                const gchar *country_code);

+                                const gchar *country_code);

 
Parameters

 

 

 
country_codes
 Path to the country codes file. 
Path to the country codes file. 

 [allow-none]
 

 

 
service_providers
 Path to the service providers file. 
Path to the service providers file. 

 [allow-none]
 

 

 
cancellable
 A GCancellable or NULL. 
A GCancellable or NULL. 

 [allow-none]
 

 

 
error
Return location for error or NULL.
Return location for error or NULL.

  
 

 
 
 
 

@@ -931,7 +931,7 @@
 

 
Returns

-
 a NMACountryInfo or NULL if not found. 

+
a NMACountryInfo or NULL if not found. 

 
[transfer none]

 

@@ -941,7 +941,7 @@
 
NMAMobileProvider *
 nma_mobile_providers_database_lookup_3gpp_mcc_mnc
                                (NMAMobileProvidersDatabase *self,
-                                const gchar *mccmnc);

+                                const gchar *mccmnc);

 
Parameters

 

 
 
 

@@ -966,7 +966,7 @@
 

 
Returns

-
 a NMAMobileProvider or NULL if not found. 

+
a NMAMobileProvider or NULL if not found. 

 
[transfer none]

 

@@ -976,7 +976,7 @@
 
NMAMobileProvider *
 nma_mobile_providers_database_lookup_cdma_sid
                                (NMAMobileProvidersDatabase *self,
-                                guint32 sid);

+                                guint32 sid);

 
Parameters

 

 
 
 

@@ -1001,18 +1001,18 @@
 

 
Returns

-
 a NMAMobileProvider, or NULL if not found. 

+
a NMAMobileProvider, or NULL if not found. 

 
[transfer none]

 

 
nma_mobile_providers_split_3gpp_mcc_mnc ()

-
gboolean
+
gboolean
 nma_mobile_providers_split_3gpp_mcc_mnc
-                               (const gchar *mccmnc,
-                                gchar **mcc,
-                                gchar **mnc);

+                               (const gchar *mccmnc,
+                                gchar **mcc,
+                                gchar **mnc);

 
Splits the input MCCMNC string into separate MCC and MNC strings.

 

 
Parameters

@@ -1030,12 +1030,12 @@
 
 

-
+
-
+
@@ -1043,9 +1043,9 @@
 

 
Returns

-
 TRUE if correctly split and mcc
+
 TRUE if correctly split and mcc
 and mnc
-are set; FALSE otherwise.

+are set; FALSE otherwise.

 

@@ -1092,7 +1092,7 @@
 
Property Details

 
The “country-codes” property

-
  “country-codes”            gchar *

+
  “country-codes”            gchar *

 
Path to the country codes file.

 
Flags: Read / Write / Construct Only

 
Default value: NULL

@@ -1100,7 +1100,7 @@
 

 

 
The “service-providers” property

-
  “service-providers”        gchar *

+
  “service-providers”        gchar *

 
Path to the service providers file.

 
Flags: Read / Write / Construct Only

 
Default value: NULL

@@ -1108,6 +1108,6 @@
 

 

-
Generated by GTK-Doc V1.25

+
Generated by GTK-Doc V1.26
\ No newline at end of file
diff -Nru network-manager-applet-1.8.4/html/NMAVpnPasswordDialog.html network-manager-applet-1.8.10/html/NMAVpnPasswordDialog.html
--- network-manager-applet-1.8.4/html/NMAVpnPasswordDialog.html	2017-09-20 13:28:19.000000000 +0000
+++ network-manager-applet-1.8.10/html/NMAVpnPasswordDialog.html	2017-12-19 12:30:15.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -43,7 +43,7 @@
 

 
 
 
 

 
mcc
 the MCC. 
the MCC. 

 [out][transfer full]
 

 

 
mnc
 the MNC. 
the MNC. 

 [out][transfer full]
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
-GtkWidget *
+GtkWidget *
 
 
 nma_vpn_password_dialog_new ()
@@ -51,7 +51,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nma_vpn_password_dialog_run_and_block ()
@@ -198,13 +198,13 @@
 
 

 
Object Hierarchy

-
    GObject
-    ╰── GInitiallyUnowned
-        ╰── GtkWidget
-            ╰── GtkContainer
-                ╰── GtkBin
-                    ╰── GtkWindow
-                        ╰── GtkDialog
+
    GObject
+    ╰── GInitiallyUnowned
+        ╰── GtkWidget
+            ╰── GtkContainer
+                ╰── GtkBin
+                    ╰── GtkWindow
+                        ╰── GtkDialog
                             ╰── NMAVpnPasswordDialog
 

 

@@ -212,7 +212,7 @@
 
Implemented Interfaces

 

 NMAVpnPasswordDialog implements
- AtkImplementorIface and  GtkBuildable.

+ AtkImplementorIface and  GtkBuildable.

 
 

 
Description

@@ -221,7 +221,7 @@
 
Functions

 

 
nma_vpn_password_dialog_new ()

-
GtkWidget *
+
GtkWidget *
 nma_vpn_password_dialog_new (const char *title,
                              const char *message,
                              const char *password);

@@ -229,7 +229,7 @@
 

 

 
nma_vpn_password_dialog_run_and_block ()

-
gboolean
+
gboolean
 nma_vpn_password_dialog_run_and_block (NMAVpnPasswordDialog *dialog);

 

 

@@ -238,7 +238,7 @@
 
void
 nma_vpn_password_dialog_set_show_password
                                (NMAVpnPasswordDialog *dialog,
-                                gboolean show);

+                                gboolean show);

 

 

 

@@ -268,7 +268,7 @@
 
void
 nma_vpn_password_dialog_set_show_password_secondary
                                (NMAVpnPasswordDialog *dialog,
-                                gboolean show);

+                                gboolean show);
 

 

 

@@ -299,7 +299,7 @@
 
void
 nma_vpn_password_dialog_set_show_password_ternary
                                (NMAVpnPasswordDialog *dialog,
-                                gboolean show);

+                                gboolean show);
 

 

 

@@ -349,18 +349,14 @@
 
Types and Values

 

 
NMAVpnPasswordDialog

-
typedef struct NMAVpnPasswordDialog        NMAVpnPasswordDialog;
-

 

 

 

 
NMAVpnPasswordDialogClass

-
typedef struct NMAVpnPasswordDialogClass   NMAVpnPasswordDialogClass;
-

 

 

 

 

-
Generated by GTK-Doc V1.25

+
Generated by GTK-Doc V1.26
 
 
\ No newline at end of file
diff -Nru network-manager-applet-1.8.4/html/NMAWifiDialog.html network-manager-applet-1.8.10/html/NMAWifiDialog.html
--- network-manager-applet-1.8.4/html/NMAWifiDialog.html	2017-09-20 13:28:19.000000000 +0000
+++ network-manager-applet-1.8.10/html/NMAWifiDialog.html	2017-12-19 12:30:15.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -42,7 +42,7 @@
 

 

 
-GtkWidget *
+GtkWidget *
 
 
 nma_wifi_dialog_new ()
@@ -50,7 +50,7 @@
 

 

 
-GtkWidget *
+GtkWidget *
 
 
 nma_wifi_dialog_new_for_hidden ()
@@ -58,7 +58,7 @@
 

 

 
-GtkWidget *
+GtkWidget *
 
 
 nma_wifi_dialog_new_for_create ()
@@ -66,7 +66,7 @@
 

 

 
-NMConnection *
+NMConnection *
 
 
 nma_wifi_dialog_get_connection ()
@@ -74,7 +74,7 @@
 

 

 
-GtkWidget *
+GtkWidget *
 
 
 nma_wifi_dialog_nag_user ()
@@ -90,7 +90,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nma_wifi_dialog_get_nag_ignored ()
@@ -98,7 +98,7 @@
 

 

 
-GtkWidget *
+GtkWidget *
 
 
 nma_wifi_dialog_new_for_other ()
@@ -109,13 +109,13 @@
 
 

 
Object Hierarchy

-
    GObject
-    ╰── GInitiallyUnowned
-        ╰── GtkWidget
-            ╰── GtkContainer
-                ╰── GtkBin
-                    ╰── GtkWindow
-                        ╰── GtkDialog
+
    GObject
+    ╰── GInitiallyUnowned
+        ╰── GtkWidget
+            ╰── GtkContainer
+                ╰── GtkBin
+                    ╰── GtkWindow
+                        ╰── GtkDialog
                             ╰── NMAWifiDialog
 

 

@@ -126,32 +126,32 @@
 
Functions

 

 
nma_wifi_dialog_new ()

-
GtkWidget *
-nma_wifi_dialog_new (NMClient *client,
-                     NMConnection *connection,
-                     NMDevice *device,
-                     NMAccessPoint *ap,
-                     gboolean secrets_only);

+
GtkWidget *
+nma_wifi_dialog_new (NMClient *client,
+                     NMConnection *connection,
+                     NMDevice *device,
+                     NMAccessPoint *ap,
+                     gboolean secrets_only);

 

 

 

 
nma_wifi_dialog_new_for_hidden ()

-
GtkWidget *
-nma_wifi_dialog_new_for_hidden (NMClient *client);

+
GtkWidget *
+nma_wifi_dialog_new_for_hidden (NMClient *client);

 

 

 

 
nma_wifi_dialog_new_for_create ()

-
GtkWidget *
-nma_wifi_dialog_new_for_create (NMClient *client);

+
GtkWidget *
+nma_wifi_dialog_new_for_create (NMClient *client);

 

 

 

 
nma_wifi_dialog_get_connection ()

-
NMConnection *
+
NMConnection *
 nma_wifi_dialog_get_connection (NMAWifiDialog *self,
-                                NMDevice **device,
-                                NMAccessPoint **ap);

+                                NMDevice **device,
+                                NMAccessPoint **ap);

 

 
Parameters

 

@@ -188,7 +188,7 @@
 

 
nma_wifi_dialog_nag_user ()

-
GtkWidget *
+
GtkWidget *
 nma_wifi_dialog_nag_user (NMAWifiDialog *self);

 
nma_wifi_dialog_nag_user is deprecated and should not be used in newly-written code.

 

@@ -202,21 +202,21 @@
 
nma_wifi_dialog_set_nag_ignored ()

 
void
 nma_wifi_dialog_set_nag_ignored (NMAWifiDialog *self,
-                                 gboolean ignored);

+                                 gboolean ignored);

 
nma_wifi_dialog_set_nag_ignored is deprecated and should not be used in newly-written code.

 

 
nma_wifi_dialog_get_nag_ignored ()

-
gboolean
+
gboolean
 nma_wifi_dialog_get_nag_ignored (NMAWifiDialog *self);

 
nma_wifi_dialog_get_nag_ignored is deprecated and should not be used in newly-written code.

 

 
nma_wifi_dialog_new_for_other ()

-
GtkWidget *
-nma_wifi_dialog_new_for_other (NMClient *client);

+
GtkWidget *
+nma_wifi_dialog_new_for_other (NMClient *client);

 
nma_wifi_dialog_new_for_other is deprecated and should not be used in newly-written code.

 

@@ -225,6 +225,6 @@
 

-
Generated by GTK-Doc V1.25

+
Generated by GTK-Doc V1.26
\ No newline at end of file
diff -Nru network-manager-applet-1.8.4/html/object-tree.html network-manager-applet-1.8.10/html/object-tree.html
--- network-manager-applet-1.8.4/html/object-tree.html	2017-09-20 13:28:19.000000000 +0000
+++ network-manager-applet-1.8.10/html/object-tree.html	2017-12-19 12:30:15.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -23,15 +23,15 @@
 

 Object Hierarchy
-    GObject
-    ├── GInitiallyUnowned
-    │   ╰── GtkWidget
-    │       ╰── GtkContainer
-    │           ├── GtkGrid
+    GObject
+    ├── GInitiallyUnowned
+    │   ╰── GtkWidget
+    │       ╰── GtkContainer
+    │           ├── GtkGrid
     │           │   ╰── NMACertChooser
-    │           ╰── GtkBin
-    │               ╰── GtkWindow
-    │                   ╰── GtkDialog
+    │           ╰── GtkBin
+    │               ╰── GtkWindow
+    │                   ╰── GtkDialog
     │                       ├── NMAVpnPasswordDialog
     │                       ╰── NMAWifiDialog
     ╰── NMAMobileProvidersDatabase
@@ -42,6 +42,6 @@
 

-
Generated by GTK-Doc V1.25

+
Generated by GTK-Doc V1.26
\ No newline at end of file
diff -Nru network-manager-applet-1.8.4/icons/meson.build network-manager-applet-1.8.10/icons/meson.build
--- network-manager-applet-1.8.4/icons/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/icons/meson.build	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1,107 @@
+icons_16 = [
+  'nm-device-wired.png',
+  'nm-no-connection.png',
+  'nm-vpn-standalone-lock.png'
+]
+
+icons_22 = [
+  'nm-adhoc.png',
+  'nm-device-wired.png',
+  'nm-device-wwan.png',
+  'nm-mb-roam.png',
+  'nm-no-connection.png',
+  'nm-secure-lock.png',
+  'nm-signal-00.png',
+  'nm-signal-100.png',
+  'nm-signal-25.png',
+  'nm-signal-50.png',
+  'nm-signal-75.png',
+  'nm-stage01-connecting01.png',
+  'nm-stage01-connecting02.png',
+  'nm-stage01-connecting03.png',
+  'nm-stage01-connecting04.png',
+  'nm-stage01-connecting05.png',
+  'nm-stage01-connecting06.png',
+  'nm-stage01-connecting07.png',
+  'nm-stage01-connecting08.png',
+  'nm-stage01-connecting09.png',
+  'nm-stage01-connecting10.png',
+  'nm-stage01-connecting11.png',
+  'nm-stage02-connecting01.png',
+  'nm-stage02-connecting02.png',
+  'nm-stage02-connecting03.png',
+  'nm-stage02-connecting04.png',
+  'nm-stage02-connecting05.png',
+  'nm-stage02-connecting06.png',
+  'nm-stage02-connecting07.png',
+  'nm-stage02-connecting08.png',
+  'nm-stage02-connecting09.png',
+  'nm-stage02-connecting10.png',
+  'nm-stage02-connecting11.png',
+  'nm-stage03-connecting01.png',
+  'nm-stage03-connecting02.png',
+  'nm-stage03-connecting03.png',
+  'nm-stage03-connecting04.png',
+  'nm-stage03-connecting05.png',
+  'nm-stage03-connecting06.png',
+  'nm-stage03-connecting07.png',
+  'nm-stage03-connecting08.png',
+  'nm-stage03-connecting09.png',
+  'nm-stage03-connecting10.png',
+  'nm-stage03-connecting11.png',
+  'nm-tech-3g.png',
+  'nm-tech-cdma-1x.png',
+  'nm-tech-edge.png',
+  'nm-tech-evdo.png',
+  'nm-tech-gprs.png',
+  'nm-tech-hspa.png',
+  'nm-tech-lte.png',
+  'nm-tech-umts.png',
+  'nm-vpn-active-lock.png',
+  'nm-vpn-connecting01.png',
+  'nm-vpn-connecting02.png',
+  'nm-vpn-connecting03.png',
+  'nm-vpn-connecting04.png',
+  'nm-vpn-connecting05.png',
+  'nm-vpn-connecting06.png',
+  'nm-vpn-connecting07.png',
+  'nm-vpn-connecting08.png',
+  'nm-vpn-connecting09.png',
+  'nm-vpn-connecting10.png',
+  'nm-vpn-connecting11.png',
+  'nm-vpn-connecting12.png',
+  'nm-vpn-connecting13.png',
+  'nm-vpn-connecting14.png',
+  'nm-wwan-tower.png'
+]
+
+icons_32 = [
+  'nm-device-wired.png',
+  'nm-no-connection.png'
+]
+
+icons_48 = ['nm-device-wireless.png']
+
+icons_scalable = [
+  'nm-device-wired.svg',
+  'nm-no-connection.svg'
+]
+
+icons = [
+  # local dir, install dir, files
+  ['16', '16x16', icons_16],
+  ['22', '22x22', icons_22],
+  ['32', '32x32', icons_32],
+  ['48', '48x48', icons_48],
+  ['scalable', 'scalable', icons_scalable]
+]
+
+foreach icon: icons
+  icon_dir = join_paths(nma_datadir, 'icons', 'hicolor', icon[1], 'apps')
+  foreach name: icon[2]
+    install_data(
+      join_paths(icon[0], name),
+      install_dir: icon_dir
+    )
+  endforeach
+endforeach
diff -Nru network-manager-applet-1.8.4/install-sh network-manager-applet-1.8.10/install-sh
--- network-manager-applet-1.8.4/install-sh	2017-02-10 06:47:11.000000000 +0000
+++ network-manager-applet-1.8.10/install-sh	2017-08-15 07:25:07.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2016-01-11.22; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -496,6 +496,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff -Nru network-manager-applet-1.8.4/libnma-sections.txt network-manager-applet-1.8.10/libnma-sections.txt
--- network-manager-applet-1.8.4/libnma-sections.txt	2017-09-20 13:28:19.000000000 +0000
+++ network-manager-applet-1.8.10/libnma-sections.txt	2017-12-19 12:30:15.000000000 +0000
@@ -29,7 +29,6 @@
 NMA_CERT_CHOOSER_CLASS
 NMA_CERT_CHOOSER_GET_CLASS
 NMA_IS_CERT_CHOOSER
-NMA_IS_CERT_CHOOSER_CLASS
 NMA_TYPE_CERT_CHOOSER
 nma_cert_chooser_get_type
 
@@ -75,7 +74,6 @@
 NMAMobileProvidersDatabaseClass
 NMAMobileProvidersDatabasePrivate
 NMA_IS_MOBILE_PROVIDERS_DATABASE
-NMA_IS_MOBILE_PROVIDERS_DATABASE_CLASS
 NMA_MOBILE_PROVIDERS_DATABASE
 NMA_MOBILE_PROVIDERS_DATABASE_CLASS
 NMA_MOBILE_PROVIDERS_DATABASE_GET_CLASS
@@ -130,7 +128,6 @@
 nma_vpn_password_dialog_get_password_ternary
 
 NMA_VPN_IS_PASSWORD_DIALOG
-NMA_VPN_IS_PASSWORD_DIALOG_CLASS
 NMA_VPN_PASSWORD_DIALOG
 NMA_VPN_PASSWORD_DIALOG_CLASS
 NMA_VPN_TYPE_PASSWORD_DIALOG
@@ -152,7 +149,6 @@
 NMAWifiDialog
 NMAWifiDialogClass
 NMA_IS_WIFI_DIALOG
-NMA_IS_WIFI_DIALOG_CLASS
 NMA_TYPE_WIFI_DIALOG
 NMA_WIFI_DIALOG
 NMA_WIFI_DIALOG_CLASS
diff -Nru network-manager-applet-1.8.4/m4/compiler_options.m4 network-manager-applet-1.8.10/m4/compiler_options.m4
--- network-manager-applet-1.8.4/m4/compiler_options.m4	2017-03-26 18:32:43.000000000 +0000
+++ network-manager-applet-1.8.10/m4/compiler_options.m4	2017-12-19 11:44:30.000000000 +0000
@@ -70,11 +70,13 @@
 		      -Wimplicit-fallthrough \
 		      -Wimplicit-function-declaration \
 		      -Winit-self \
+		      -Wlogical-op \
 		      -Wmissing-declarations \
 		      -Wmissing-include-dirs \
 		      -Wmissing-prototypes \
 		      -Wpointer-arith \
 		      -Wshadow \
+		      -Wshift-negative-value \
 		      -Wstrict-prototypes \
 		      -Wundef \
 		      -Wno-duplicate-decl-specifier \
@@ -119,6 +121,12 @@
 		[int f () { int i = yolo; yolo; return i; }]
 	)
 
+	dnl clang 3.9 would like to see "{ { 0 } }" here, but that does not
+	dnl look too wise.
+	NM_COMPILER_WARNING([missing-braces],
+		[union { int a[1]; int b[2]; } c = { 0 }]
+	)
+
 	CFLAGS="$CFLAGS_MORE_WARNINGS $CFLAGS"
 else
 	AC_MSG_RESULT(no)
diff -Nru network-manager-applet-1.8.4/Makefile.am network-manager-applet-1.8.10/Makefile.am
--- network-manager-applet-1.8.4/Makefile.am	2017-08-11 09:40:17.000000000 +0000
+++ network-manager-applet-1.8.10/Makefile.am	2017-12-19 11:44:30.000000000 +0000
@@ -153,6 +153,8 @@
 	icons/scalable/nm-no-connection.svg
 EXTRA_DIST += $(iconscalable_DATA)
 
+EXTRA_DIST += icons/meson.build
+
 ###############################################################################
 
 shared_files = \
@@ -160,7 +162,6 @@
 	shared/nm-utils/nm-shared-utils.h \
 	$(NULL)
 
-
 noinst_LTLIBRARIES += src/utils/libutils-libnm.la
 
 src_utils_libutils_libnm_la_CPPFLAGS = \
@@ -213,6 +214,8 @@
 	$(GTK_LIBS) \
 	$(LIBNM_LIBS)
 
+EXTRA_DIST += src/utils/meson.build
+
 ###############################################################################
 
 src/wireless-security/ws-resources.h: src/wireless-security/ws.gresource.xml
@@ -325,7 +328,8 @@
 	src/wireless-security/ws-wep-key.ui \
 	src/wireless-security/ws-wpa-eap.ui \
 	src/wireless-security/ws-wpa-psk.ui \
-	src/wireless-security/ws.gresource.xml
+	src/wireless-security/ws.gresource.xml \
+	src/wireless-security/meson.build
 
 ###############################################################################
 
@@ -456,6 +460,7 @@
 	src/libnm-gtk/check-exports.sh \
 	src/libnm-gtk/wifi.ui \
 	src/libnm-gtk/nm.gresource.xml \
+	src/libnm-gtk/meson.build \
 	\
 	src/libnm-gtk/tests/iso3166-test.xml \
 	src/libnm-gtk/tests/serviceproviders-test.xml \
@@ -586,7 +591,8 @@
 	src/libnma/wifi.ui \
 	src/libnma/nma-pkcs11-token-login-dialog.ui \
 	src/libnma/nma-pkcs11-cert-chooser-dialog.ui \
-	src/libnma/nma.gresource.xml
+	src/libnma/nma.gresource.xml \
+	src/libnma/meson.build
 
 ###############################################################################
 
@@ -747,7 +753,8 @@
 	src/connection-editor/ce-ppp-auth-methods.ui \
 	src/connection-editor/nm-connection-editor.ui \
 	src/connection-editor/nm-connection-list.ui \
-	src/connection-editor/ce.gresource.xml
+	src/connection-editor/ce.gresource.xml \
+	src/connection-editor/meson.build
 
 ###############################################################################
 
@@ -768,6 +775,7 @@
 	src/applet-resources.c
 
 nm_applet_hc_real = \
+	shared/nm-utils/nm-compat.c \
 	src/main.c \
 	src/applet.c \
 	src/applet.h \
@@ -850,12 +858,15 @@
 	src/8021x.ui \
 	src/gsm-unlock.ui \
 	src/info.ui \
-	src/applet.gresource.xml
+	src/applet.gresource.xml \
+	src/meson.build
 
 ###############################################################################
 
 EXTRA_DIST += \
 	shared/nm-utils/gsystem-local-alloc.h \
+	shared/nm-utils/nm-compat.c \
+	shared/nm-utils/nm-compat.h \
 	shared/nm-utils/nm-glib.h \
 	shared/nm-utils/nm-macros-internal.h \
 	shared/nm-utils/nm-shared-utils.c \
@@ -864,6 +875,7 @@
 	shared/nm-utils/nm-vpn-editor-plugin-call.h \
 	shared/nm-default.h \
 	shared/nm-libnm-compat.h \
+	shared/meson.build \
 	$(NULL)
 
 ###############################################################################
@@ -872,6 +884,8 @@
 	man/nm-applet.1 \
 	man/nm-connection-editor.1
 
+EXTRA_DIST += man/meson.build
+
 ###############################################################################
 
 DOC_MODULE = libnma
@@ -923,7 +937,15 @@
 	intltool-merge.in \
 	intltool-update.in \
 	Makefile.glib \
-	autogen.sh
+	autogen.sh \
+	meson.build \
+	meson_options.txt \
+	meson_post_install.py \
+	config.h.meson \
+	gtkdocentities.ent.in \
+	\
+	po/meson.build
+
 
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = nm-applet.desktop.in
diff -Nru network-manager-applet-1.8.4/Makefile.in network-manager-applet-1.8.10/Makefile.in
--- network-manager-applet-1.8.4/Makefile.in	2017-09-20 13:28:04.000000000 +0000
+++ network-manager-applet-1.8.10/Makefile.in	2017-12-19 12:27:00.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -437,8 +437,9 @@
 @WITH_LIBNM_GTK_TRUE@src_libnm_gtk_tests_test_mobile_providers_DEPENDENCIES =  \
 @WITH_LIBNM_GTK_TRUE@	src/libnm-gtk/libnm-gtk.la \
 @WITH_LIBNM_GTK_TRUE@	$(am__DEPENDENCIES_1)
-am__src_nm_applet_SOURCES_DIST = src/main.c src/applet.c src/applet.h \
-	src/applet-agent.c src/applet-agent.h src/applet-vpn-request.c \
+am__src_nm_applet_SOURCES_DIST = shared/nm-utils/nm-compat.c \
+	src/main.c src/applet.c src/applet.h src/applet-agent.c \
+	src/applet-agent.h src/applet-vpn-request.c \
 	src/applet-vpn-request.h src/ethernet-dialog.h \
 	src/ethernet-dialog.c src/applet-dialogs.h \
 	src/applet-dialogs.c src/applet-device-ethernet.h \
@@ -449,7 +450,8 @@
 	src/applet-device-bt.c src/fallback-icon.h \
 	src/applet-device-broadband.h src/applet-device-broadband.c
 @WITH_WWAN_TRUE@am__objects_16 = src/src_nm_applet-applet-device-broadband.$(OBJEXT)
-am__objects_17 = src/src_nm_applet-main.$(OBJEXT) \
+am__objects_17 = shared/nm-utils/src_nm_applet-nm-compat.$(OBJEXT) \
+	src/src_nm_applet-main.$(OBJEXT) \
 	src/src_nm_applet-applet.$(OBJEXT) \
 	src/src_nm_applet-applet-agent.$(OBJEXT) \
 	src/src_nm_applet-applet-vpn-request.$(OBJEXT) \
@@ -1055,7 +1057,8 @@
 ###############################################################################
 EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) $(icon16_DATA) \
 	$(icon22_DATA) $(icon32_DATA) $(icon48_DATA) \
-	$(iconscalable_DATA) src/wireless-security/eap-method-fast.ui \
+	$(iconscalable_DATA) icons/meson.build src/utils/meson.build \
+	src/wireless-security/eap-method-fast.ui \
 	src/wireless-security/eap-method-leap.ui \
 	src/wireless-security/eap-method-peap.ui \
 	src/wireless-security/eap-method-simple.ui \
@@ -1067,9 +1070,10 @@
 	src/wireless-security/ws-wpa-eap.ui \
 	src/wireless-security/ws-wpa-psk.ui \
 	src/wireless-security/ws.gresource.xml \
+	src/wireless-security/meson.build \
 	src/libnm-gtk/libnm-gtk.pc.in src/libnm-gtk/libnm-gtk.ver \
 	src/libnm-gtk/check-exports.sh src/libnm-gtk/wifi.ui \
-	src/libnm-gtk/nm.gresource.xml \
+	src/libnm-gtk/nm.gresource.xml src/libnm-gtk/meson.build \
 	src/libnm-gtk/tests/iso3166-test.xml \
 	src/libnm-gtk/tests/serviceproviders-test.xml \
 	src/libnm-gtk/examples/mobile-providers.js $(NULL) \
@@ -1077,7 +1081,7 @@
 	src/libnma/libnma.ver src/libnma/wifi.ui \
 	src/libnma/nma-pkcs11-token-login-dialog.ui \
 	src/libnma/nma-pkcs11-cert-chooser-dialog.ui \
-	src/libnma/nma.gresource.xml \
+	src/libnma/nma.gresource.xml src/libnma/meson.build \
 	src/connection-editor/ce-ip4-routes.ui \
 	src/connection-editor/ce-ip6-routes.ui \
 	src/connection-editor/ce-new-connection.ui \
@@ -1105,17 +1109,22 @@
 	src/connection-editor/ce-ppp-auth-methods.ui \
 	src/connection-editor/nm-connection-editor.ui \
 	src/connection-editor/nm-connection-list.ui \
-	src/connection-editor/ce.gresource.xml src/8021x.ui \
+	src/connection-editor/ce.gresource.xml \
+	src/connection-editor/meson.build src/8021x.ui \
 	src/gsm-unlock.ui src/info.ui src/applet.gresource.xml \
-	shared/nm-utils/gsystem-local-alloc.h \
+	src/meson.build shared/nm-utils/gsystem-local-alloc.h \
+	shared/nm-utils/nm-compat.c shared/nm-utils/nm-compat.h \
 	shared/nm-utils/nm-glib.h shared/nm-utils/nm-macros-internal.h \
 	shared/nm-utils/nm-shared-utils.c \
 	shared/nm-utils/nm-shared-utils.h \
 	shared/nm-utils/nm-test-utils.h \
 	shared/nm-utils/nm-vpn-editor-plugin-call.h \
-	shared/nm-default.h shared/nm-libnm-compat.h $(NULL) \
+	shared/nm-default.h shared/nm-libnm-compat.h \
+	shared/meson.build $(NULL) man/meson.build \
 	linker-script-binary.ver CONTRIBUTING intltool-extract.in \
 	intltool-merge.in intltool-update.in Makefile.glib autogen.sh \
+	meson.build meson_options.txt meson_post_install.py \
+	config.h.meson gtkdocentities.ent.in po/meson.build \
 	$(convert_DATA) $(appdata_in_files) $(autostart_in_files) \
 	$(desktop_in_files)
 DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
@@ -1148,34 +1157,34 @@
 @GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
 
 #### setup ####
-GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
-GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_@AM_V@)
+GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_@AM_DEFAULT_V@)
 GTK_DOC_V_SETUP_0 = @echo "  DOC   Preparing build";
 
 #### scan ####
-GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
-GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_@AM_V@)
+GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_@AM_DEFAULT_V@)
 GTK_DOC_V_SCAN_0 = @echo "  DOC   Scanning header files";
-GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
-GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_@AM_V@)
+GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@)
 GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
 
 #### xml ####
-GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
-GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML = $(GTK_DOC_V_XML_@AM_V@)
+GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_@AM_DEFAULT_V@)
 GTK_DOC_V_XML_0 = @echo "  DOC   Building XML";
 
 #### html ####
-GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
-GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_@AM_V@)
+GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_@AM_DEFAULT_V@)
 GTK_DOC_V_HTML_0 = @echo "  DOC   Building HTML";
-GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
-GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_@AM_V@)
+GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_@AM_DEFAULT_V@)
 GTK_DOC_V_XREF_0 = @echo "  DOC   Fixing cross-references";
 
 #### pdf ####
-GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
-GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_@AM_V@)
+GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_@AM_DEFAULT_V@)
 GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AUTOMAKE_OPTIONS = subdir-objects
@@ -1706,8 +1715,9 @@
 nm_applet_c_gen = \
 	src/applet-resources.c
 
-nm_applet_hc_real = src/main.c src/applet.c src/applet.h \
-	src/applet-agent.c src/applet-agent.h src/applet-vpn-request.c \
+nm_applet_hc_real = shared/nm-utils/nm-compat.c src/main.c \
+	src/applet.c src/applet.h src/applet-agent.c \
+	src/applet-agent.h src/applet-vpn-request.c \
 	src/applet-vpn-request.h src/ethernet-dialog.h \
 	src/ethernet-dialog.c src/applet-dialogs.h \
 	src/applet-dialogs.c src/applet-device-ethernet.h \
@@ -2323,6 +2333,9 @@
 src/libnm-gtk/tests/test-mobile-providers$(EXEEXT): $(src_libnm_gtk_tests_test_mobile_providers_OBJECTS) $(src_libnm_gtk_tests_test_mobile_providers_DEPENDENCIES) $(EXTRA_src_libnm_gtk_tests_test_mobile_providers_DEPENDENCIES) src/libnm-gtk/tests/$(am__dirstamp)
 	@rm -f src/libnm-gtk/tests/test-mobile-providers$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(src_libnm_gtk_tests_test_mobile_providers_OBJECTS) $(src_libnm_gtk_tests_test_mobile_providers_LDADD) $(LIBS)
+shared/nm-utils/src_nm_applet-nm-compat.$(OBJEXT):  \
+	shared/nm-utils/$(am__dirstamp) \
+	shared/nm-utils/$(DEPDIR)/$(am__dirstamp)
 src/$(am__dirstamp):
 	@$(MKDIR_P) src
 	@: > src/$(am__dirstamp)
@@ -2395,6 +2408,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/src_nm_applet-nm-compat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/src_utils_libutils_libnm_glib_la-nm-shared-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/src_utils_libutils_libnm_la-nm-shared-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_nm_applet-ap-menu-item.Po@am__quote@
@@ -3446,6 +3460,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_gtk_tests_test_mobile_providers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libnm-gtk/tests/src_libnm_gtk_tests_test_mobile_providers-test-mobile-providers.obj `if test -f 'src/libnm-gtk/tests/test-mobile-providers.c'; then $(CYGPATH_W) 'src/libnm-gtk/tests/test-mobile-providers.c'; else $(CYGPATH_W) '$(srcdir)/src/libnm-gtk/tests/test-mobile-providers.c'; fi`
 
+shared/nm-utils/src_nm_applet-nm-compat.o: shared/nm-utils/nm-compat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_nm_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/src_nm_applet-nm-compat.o -MD -MP -MF shared/nm-utils/$(DEPDIR)/src_nm_applet-nm-compat.Tpo -c -o shared/nm-utils/src_nm_applet-nm-compat.o `test -f 'shared/nm-utils/nm-compat.c' || echo '$(srcdir)/'`shared/nm-utils/nm-compat.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/src_nm_applet-nm-compat.Tpo shared/nm-utils/$(DEPDIR)/src_nm_applet-nm-compat.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-compat.c' object='shared/nm-utils/src_nm_applet-nm-compat.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_nm_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/src_nm_applet-nm-compat.o `test -f 'shared/nm-utils/nm-compat.c' || echo '$(srcdir)/'`shared/nm-utils/nm-compat.c
+
+shared/nm-utils/src_nm_applet-nm-compat.obj: shared/nm-utils/nm-compat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_nm_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/src_nm_applet-nm-compat.obj -MD -MP -MF shared/nm-utils/$(DEPDIR)/src_nm_applet-nm-compat.Tpo -c -o shared/nm-utils/src_nm_applet-nm-compat.obj `if test -f 'shared/nm-utils/nm-compat.c'; then $(CYGPATH_W) 'shared/nm-utils/nm-compat.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/nm-compat.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/src_nm_applet-nm-compat.Tpo shared/nm-utils/$(DEPDIR)/src_nm_applet-nm-compat.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shared/nm-utils/nm-compat.c' object='shared/nm-utils/src_nm_applet-nm-compat.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_nm_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/src_nm_applet-nm-compat.obj `if test -f 'shared/nm-utils/nm-compat.c'; then $(CYGPATH_W) 'shared/nm-utils/nm-compat.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/nm-compat.c'; fi`
+
 src/src_nm_applet-main.o: src/main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_nm_applet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_nm_applet-main.o -MD -MP -MF src/$(DEPDIR)/src_nm_applet-main.Tpo -c -o src/src_nm_applet-main.o `test -f 'src/main.c' || echo '$(srcdir)/'`src/main.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_nm_applet-main.Tpo src/$(DEPDIR)/src_nm_applet-main.Po
@@ -4722,38 +4750,38 @@
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
-	    if test "x$$files" != "x" ; then \
-	        for file in $$files ; do \
-	            destdir=`dirname $(abs_builddir)/$$file`; \
-	            test -d "$$destdir" || mkdir -p "$$destdir"; \
-	            test -f $(abs_srcdir)/$$file && \
-	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
-	        done; \
-	    fi; \
+	  files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
+	  if test "x$$files" != "x" ; then \
+	    for file in $$files ; do \
+	      destdir=`dirname $(abs_builddir)/$$file`; \
+	      test -d "$$destdir" || mkdir -p "$$destdir"; \
+	      test -f $(abs_srcdir)/$$file && \
+	        cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+	    done; \
+	  fi; \
 	fi
 	$(AM_V_at)touch setup-build.stamp
 
 scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_SCAN)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    scanobj_options=""; \
-	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$$?" = "0"; then \
-	        if test "x$(V)" = "x1"; then \
-	            scanobj_options="--verbose"; \
-	        fi; \
+	  scanobj_options=""; \
+	  gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	  if test "$$?" = "0"; then \
+	    if test "x$(V)" = "x1"; then \
+	      scanobj_options="--verbose"; \
 	    fi; \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
-	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
+	  fi; \
+	  CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	  gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
 	else \
-	    for i in $(SCANOBJ_FILES) ; do \
-	        test -f $$i || touch $$i ; \
-	    done \
+	  for i in $(SCANOBJ_FILES) ; do \
+	    test -f $$i || touch $$i ; \
+	  done \
 	fi
 	$(AM_V_at)touch scan-build.stamp
 
@@ -4763,7 +4791,7 @@
 sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
 	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
 	$(AM_V_at)touch sgml-build.stamp
@@ -4798,12 +4826,8 @@
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	-@test "x$(HTML_IMAGES)" = "x" || \
 	for file in $(HTML_IMAGES) ; do \
-	  if test -f $(abs_srcdir)/$$file ; then \
-	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
-	  fi; \
-	  if test -f $(abs_builddir)/$$file ; then \
-	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
-	  fi; \
+	  test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+	  test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	done;
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp
diff -Nru network-manager-applet-1.8.4/man/meson.build network-manager-applet-1.8.10/man/meson.build
--- network-manager-applet-1.8.4/man/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/man/meson.build	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1,17 @@
+mans = [
+  'nm-applet.1',
+  'nm-connection-editor.1'
+]
+
+man1_dir = join_paths(nma_mandir, 'man1')
+
+foreach man: mans
+  configure_file(
+    input: man + '.in',
+    output: man,
+    install: true,
+    install_dir: man1_dir,
+    # FIXME: empty configuration
+    configuration: configuration_data()
+  )
+endforeach
diff -Nru network-manager-applet-1.8.4/meson.build network-manager-applet-1.8.10/meson.build
--- network-manager-applet-1.8.4/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/meson.build	2017-12-19 12:26:03.000000000 +0000
@@ -0,0 +1,477 @@
+project(
+  'network-manager-applet', 'c',
+  version: '1.8.10',
+  license: 'GPL2+',
+  default_options: [
+    'buildtype=debugoptimized',
+    'c_std=gnu99'
+  ],
+  meson_version: '>= 0.43.0'
+)
+
+nma_name = 'nm-applet'
+
+nma_version = meson.project_version()
+version_array = nma_version.split('.')
+nma_major_version = version_array[0].to_int()
+nma_minor_version = version_array[1].to_int()
+nma_micro_version = version_array[2].to_int()
+
+nma_gir_version = '1.0'
+nma_gir_prefix = 'NMA'
+
+nma_gir_ns = 'NMA'
+nma_gtk_gir_ns = 'NMGtk'
+
+nma_prefix = get_option('prefix')
+nma_bindir = join_paths(nma_prefix, get_option('bindir'))
+nma_datadir = join_paths(nma_prefix, get_option('datadir'))
+nma_includedir = join_paths(nma_prefix, get_option('includedir'))
+nma_libdir = join_paths(nma_prefix, get_option('libdir'))
+nma_libexecdir = join_paths(nma_prefix, get_option('libexecdir'))
+nma_localedir = join_paths(nma_prefix, get_option('localedir'))
+nma_mandir = join_paths(nma_prefix, get_option('mandir'))
+nma_sysconfdir = join_paths(nma_prefix, get_option('sysconfdir'))
+
+nma_appdir = join_paths(nma_datadir, 'applications')
+nma_autostartdir = join_paths(nma_sysconfdir, 'xdg', 'autostart')
+nma_icondir = join_paths(nma_datadir, 'icons')
+
+soversion = 0
+current = 0
+revision = 0
+libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
+
+nma_debug = get_option('buildtype').contains('debug')
+
+cc = meson.get_compiler('c')
+
+config_h = configuration_data()
+
+# defines
+config_h.set_quoted('GETTEXT_PACKAGE', nma_name)
+config_h.set_quoted('VERSION', nma_version)
+
+# types
+if not cc.has_type('pid_t', prefix: '#include')
+  config_h.set('pid_t', 'int')
+endif
+
+# compiler flags
+common_flags = []
+common_ldflags = []
+
+enable_ld_gc = get_option('ld_gc')
+if enable_ld_gc
+  test_cflags = [
+    '-fdata-sections',
+    '-ffunction-sections',
+  ]
+
+  test_ldflags = ['-Wl,--gc-sections']
+
+  foreach cflag: test_cflags + test_ldflags
+    assert(cc.has_argument(cflag), 'Unused symbol eviction requested but not supported. Use -Dld_gc=false to build without it.')
+  endforeach
+
+  common_flags += test_cflags
+  common_ldflags += test_ldflags
+endif
+
+if nma_debug
+  test_cflags = [
+    '-Wdeclaration-after-statement',
+    '-Wfloat-equal',
+    '-Wformat=2',
+    '-Wimplicit-fallthrough',
+    '-Winit-self',
+    '-Wmissing-declarations',
+    '-Wmissing-include-dirs',
+    '-Wmissing-prototypes',
+    '-Wno-duplicate-decl-specifier',
+    '-Wno-format-truncation',
+    '-Wno-format-y2k',
+    '-Wno-missing-field-initializers',
+    '-Wno-pragmas',
+    '-Wno-sign-compare',
+    '-Wno-unused-but-set-variable',
+    '-Wno-unused-parameter',
+    '-Wshadow',
+    '-Wstrict-prototypes',
+    '-Wundef'
+  ]
+
+  common_flags += cc.get_supported_arguments(test_cflags)
+endif
+
+add_project_arguments(common_flags, language: 'c')
+add_project_link_arguments(common_ldflags, language: 'c')
+
+ldflag = '-Wl,--version-script'
+have_version_script = host_machine.system().contains('linux') and cc.has_argument(ldflag)
+
+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
+
+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')
+
+m_dep = cc.find_library('m')
+
+# Check for gtk+
+gtk_req_version = '>= 3.4'
+
+gtk_dep = declare_dependency(
+  dependencies: dependency('gtk+-3.0', version: gtk_req_version),
+  compile_args: [
+    '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4',
+    '-DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_4'
+  ]
+)
+
+# Check for gudev
+gudev_dep = dependency('gudev-1.0', version: '>= 147')
+
+# Check for libnotify >= 0.7
+libnotify_dep = dependency('libnotify', version: '>= 0.4.3')
+config_h.set10('HAVE_LIBNOTIFY_07', libnotify_dep.found() and libnotify_dep.version().version_compare('>= 0.7'),
+               description: 'Define if you have libnotify 0.7 or later')
+
+# API documentation
+nm_req_version = '>= 1.7'
+
+deps = [
+  gio_dep,
+  gmodule_export_dep,
+  dependency('libnm', version: nm_req_version)
+]
+
+cflags = [
+  '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38',
+  '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38',
+  '-DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_8',
+  '-DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_8'
+]
+
+libnm_dep = declare_dependency(
+  dependencies: deps,
+  compile_args: cflags
+)
+
+enable_libnm_gtk = get_option('libnm_gtk')
+if enable_libnm_gtk
+  deps = [
+    gio_dep,
+    gmodule_export_dep,
+    dependency('libnm-glib', version: nm_req_version),
+    dependency('libnm-glib-vpn', version: nm_req_version),
+    dependency('libnm-util', version: nm_req_version),
+    dependency('NetworkManager', version: nm_req_version)
+  ]
+
+  cflags = [
+    '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38',
+    '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38',
+    '-DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4',
+    '-DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4'
+  ]
+
+  libnm_glib_dep = declare_dependency(
+    dependencies: deps,
+    compile_args: cflags
+  )
+endif
+
+enable_appindicator = get_option('appindicator')
+if enable_appindicator
+  appindicator_dep = dependency('appindicator3-0.1')
+  dbusmenu_dep = dependency('dbusmenu-gtk3-0.4', version: '>= 16.04.0')
+endif
+config_h.set('WITH_APPINDICATOR', enable_appindicator)
+
+# ModemManager1 with libmm-glib for WWAN support
+enable_wwan = get_option('wwan')
+if enable_wwan
+  mm_glib_dep = dependency('mm-glib', required: false)
+  assert(mm_glib_dep.found(), 'libmm-glib is needed for WWAN support. Use -Dwwan=false to build without it.')
+endif
+config_h.set10('WITH_WWAN', enable_wwan)
+
+# SELinux
+enable_selinux = get_option('selinux')
+if enable_selinux
+  libselinux_dep = dependency('libselinux', required: false)
+  assert(libselinux_dep.found(), 'libselinux is needed for SELinux label support in configuration editor. Use -Dselinux=false to build without it.')
+endif
+config_h.set10('WITH_SELINUX', enable_selinux)
+
+# Jansson for team configuration editing
+enable_team = get_option('team')
+if enable_team
+  jansson_dep = dependency('jansson', version: '>= 2.7', required: false)
+  assert(jansson_dep.found(), 'jansson is needed for team configuration editor. Use -Dteam=false to build without it.')
+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 
+    #include 
+
+    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
+elif more_asserts == 'yes'
+  more_asserts = 100
+else
+  more_asserts = more_asserts.to_int()
+endif
+config_h.set('NM_MORE_ASSERTS', more_asserts)
+
+gnome = import('gnome')
+i18n = import('i18n')
+pkg = import('pkgconfig')
+
+po_dir = join_paths(meson.source_root(), 'po')
+
+intltool_merge = find_program('intltool-merge')
+intltool_cache = join_paths(po_dir, '.intltool-merge-cache')
+intltool_desktop_cmd = [intltool_merge, '-d', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
+intltool_xml_cmd = [intltool_merge, '-x', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
+
+top_inc = include_directories('.')
+
+subdir('po')
+subdir('icons')
+subdir('shared')
+subdir('src')
+subdir('man')
+
+desktop = 'nm-applet.desktop'
+
+# FIXME: The same target can not be copied into two directories.
+#        There is a workaround in meson_post_install.py until proper solution arises:
+#        https://groups.google.com/forum/#!topic/mesonbuild/3iIoYPrN4P0
+custom_target(
+  desktop,
+  input: desktop + '.in',
+  output: desktop,
+  command: intltool_desktop_cmd,
+  install: true,
+  install_dir: nma_appdir
+  #install_dir: [
+  #  nma_appdir,
+  #  nma_autostartdir
+  #]
+)
+
+desktop = 'nm-connection-editor.desktop'
+
+custom_target(
+  desktop,
+  input: desktop + '.in',
+  output: desktop,
+  command: intltool_desktop_cmd,
+  install: true,
+  install_dir: nma_appdir
+)
+
+appdata = 'nm-connection-editor.appdata.xml'
+
+custom_target(
+  appdata,
+  input: appdata + '.in',
+  output: appdata,
+  command: intltool_xml_cmd,
+  install: true,
+  install_dir: join_paths(nma_datadir, 'appdata')
+)
+
+schema_conf = configuration_data()
+schema_conf.set('GETTEXT_PACKAGE', nma_name)
+
+schema = 'org.gnome.nm-applet.gschema.xml'
+
+configure_file(
+  input: schema + '.in',
+  output: schema,
+  install: true,
+  install_dir: join_paths(nma_datadir, 'glib-2.0', 'schemas'),
+  configuration: schema_conf
+)
+
+install_data(
+  'nm-applet.convert',
+  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-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', 'http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager')
+  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(
+  input: config + '.meson',
+  output: config,
+  configuration: config_h
+)
+
+meson.add_install_script(
+  'meson_post_install.py',
+  nma_datadir,
+  nma_sysconfdir
+)
+
+output = '\n  Build legacy library libnm-gtk: ' + enable_libnm_gtk.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()
+message(output)
diff -Nru network-manager-applet-1.8.4/meson_options.txt network-manager-applet-1.8.10/meson_options.txt
--- network-manager-applet-1.8.4/meson_options.txt	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/meson_options.txt	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1,11 @@
+option('libnm_gtk', type: 'boolean', value: true, description: 'build legacy library libnm-gtk which depends on libnm-glib/libnm-util/dbus-glib')
+option('appindicator', type: 'boolean', value: false, description: 'Build with libappindicator support instead of xembed systray support.')
+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('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 -Nru network-manager-applet-1.8.4/meson_post_install.py network-manager-applet-1.8.10/meson_post_install.py
--- network-manager-applet-1.8.4/meson_post_install.py	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/meson_post_install.py	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1,23 @@
+#!/usr/bin/env python3
+
+import os
+import shutil
+import subprocess
+import sys
+
+if not os.environ.get('DESTDIR'):
+  schemadir = os.path.join(sys.argv[1], 'glib-2.0', 'schemas')
+  print('Compile gsettings schemas...')
+  subprocess.call(['glib-compile-schemas', schemadir])
+
+# FIXME: this is due to unable to copy a generated target file:
+#        https://groups.google.com/forum/#!topic/mesonbuild/3iIoYPrN4P0
+dst_dir = os.path.join(sys.argv[2], 'xdg', 'autostart')
+src = os.path.join(sys.argv[1], 'applications', 'nm-applet.desktop')
+if os.environ.get('DESTDIR'):
+  dst_dir = os.environ.get('DESTDIR') + os.path.join(os.getcwd(), dst_dir)
+  src = os.environ.get('DESTDIR') + os.path.join(os.getcwd(), src)
+if not os.path.exists(dst_dir):
+  os.makedirs(dst_dir)
+dst = os.path.join(dst_dir, 'nm-applet.desktop')
+shutil.copyfile(src, dst)
diff -Nru network-manager-applet-1.8.4/missing network-manager-applet-1.8.10/missing
--- network-manager-applet-1.8.4/missing	2017-02-10 06:47:11.000000000 +0000
+++ network-manager-applet-1.8.10/missing	2017-08-15 07:25:07.000000000 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard , 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -210,6 +210,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff -Nru network-manager-applet-1.8.4/NEWS network-manager-applet-1.8.10/NEWS
--- network-manager-applet-1.8.4/NEWS	2017-09-20 13:13:13.000000000 +0000
+++ network-manager-applet-1.8.10/NEWS	2017-12-19 12:24:28.000000000 +0000
@@ -1,4 +1,40 @@
 ======================================================
+network-manager-applet-1.8.10
+Overview of changes since network-manager-applet-1.8.8
+======================================================
+
+This is a new stable release of network-manager-applet.  Notable changes include:
+
+* Don't request secrets for Bluetooth connections. Works around a bug in GNOME
+  Shell secret agent.
+* Fix a bug that caused invalid connections to be non-editable (and thus not
+  fixable).
+
+======================================================
+network-manager-applet-1.8.8
+Overview of changes since network-manager-applet-1.8.6
+======================================================
+
+This is a new stable release of network-manager-applet.  Notable changes include:
+
+* Fix loading of secrets when editing a VPN connection.
+* Fixes to the experimental Meson support.
+* Update to then Japanese, Indonesian, Polish, Croatian and Danish translations.
+
+======================================================
+network-manager-applet-1.8.6
+Overview of changes since network-manager-applet-1.8.4
+======================================================
+
+This is a new stable release of network-manager-applet.  Notable changes include:
+
+* Added an option to build with Meson build system.
+* Wi-Fi client connections now support setting a band and a channel too.
+* Setting IPv6 address generation mode is now supported.
+* Fixed a possible crash after editing Wi-Fi connections.
+* Updated Danish, Dutch and German translations.
+
+======================================================
 network-manager-applet-1.8.4
 Overview of changes since network-manager-applet-1.8.2
 ======================================================
diff -Nru network-manager-applet-1.8.4/po/da.po network-manager-applet-1.8.10/po/da.po
--- network-manager-applet-1.8.4/po/da.po	2017-05-10 10:44:54.000000000 +0000
+++ network-manager-applet-1.8.10/po/da.po	2017-12-19 11:44:30.000000000 +0000
@@ -18,9 +18,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
-"PO-Revision-Date: 2017-03-25 20:16+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2017-11-06 13:28+0000\n"
+"PO-Revision-Date: 2017-10-23 19:36+0200\n"
 "Last-Translator: Alan Mortensen \n"
 "Language-Team: Danish \n"
 "Language: da\n"
@@ -30,7 +31,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
 msgstr "Netværk"
 
@@ -39,7 +40,7 @@
 msgstr "Håndtér dine netværksforbindelser"
 
 #: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: ../src/connection-editor/nm-connection-list.ui.h:1
 msgid "Network Connections"
 msgstr "Netværksforbindelser"
 
@@ -174,63 +175,74 @@
 msgid "The NetworkManager Developers"
 msgstr "Udviklerne af Netværkshåndtering"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-utils/nm-shared-utils.c:477
 #, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr "objektklassen \"%s\" har ingen egenskab ved navn \"%s\""
+msgstr "objektklassen “%s” har ingen egenskab ved navn “%s”"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-utils/nm-shared-utils.c:484
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr "egenskaben \"%s\" for objektklassen \"%s\" er skrivebeskyttet"
+msgstr "egenskaben “%s” for objektklassen “%s” er skrivebeskyttet"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-utils/nm-shared-utils.c:491
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
-"construct-egenskaben \"%s\" for objektet \"%s\" kan ikke angives efter "
+"construct-egenskaben “%s” for objektet “%s” kan ikke angives efter "
 "konstruktion"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-utils/nm-shared-utils.c:499
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
-"\"%s::%s\" er ikke et gyldigt egenskabsnavn; \"%s\" er ikke en GObjekt-"
-"undertype"
+"“%s::%s” er ikke et gyldigt egenskabsnavn; “%s” er ikke en GObjekt-undertype"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-utils/nm-shared-utils.c:508
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
-"kan ikke angive egenskaben \"%s\" af type \"%s\" ud fra værdien af typen \"%s"
-"\""
+"kan ikke angive egenskaben “%s” af type “%s” ud fra værdien af typen “%s”"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-utils/nm-shared-utils.c:519
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
-"værdien \"%s\" af typen \"%s\" er ugyldig eller uden for intervallet for "
-"egenskaben \"%s\" af typen \"%s\""
+"værdien “%s” af typen “%s” er ugyldig eller uden for intervallet for "
+"egenskaben “%s” af typen “%s”"
 
-#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-godkendelse"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1
+#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
+#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
 #: ../src/connection-editor/ce-new-connection.ui.h:1
 #: ../src/connection-editor/ce-page-dcb.ui.h:17
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/connection-editor/connection-helpers.c:308
+#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/page-bluetooth.c:311
+#: ../src/connection-editor/page-mobile.c:543
+#: ../src/connection-editor/page-proxy.c:121
+#: ../src/connection-editor/page-team.c:344
+#: ../src/connection-editor/page-team-port.c:206
+#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
+#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/libnma/nma-vpn-password-dialog.c:209
+#: ../src/libnma/nma-wifi-dialog.c:1066
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Annullér"
 
-#: ../src/8021x.ui.h:3
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "F_orbind"
 
@@ -246,37 +258,37 @@
 msgid "secure."
 msgstr "sikker."
 
-#: ../src/applet.c:381
+#: ../src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Kunne ikke tilføje/aktivere forbindelse"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Forbindelsesfejl"
 
-#: ../src/applet.c:435
+#: ../src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Frakobling af enhed mislykkedes"
 
-#: ../src/applet.c:440
+#: ../src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Frakoblingsfejl"
 
-#: ../src/applet.c:470
+#: ../src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Aktivering af forbindelse mislykkedes"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Vis ikke denne besked igen"
 
-#: ../src/applet.c:883
+#: ../src/applet.c:899
 #, c-format
 msgid ""
 "\n"
@@ -284,10 +296,9 @@
 "interrupted."
 msgstr ""
 "\n"
-"VPN-forbindelsen \"%s\" blev afbrudt, fordi netværksforbindelsen blev "
-"afbrudt."
+"VPN-forbindelsen “%s” blev afbrudt, fordi netværksforbindelsen blev afbrudt."
 
-#: ../src/applet.c:885
+#: ../src/applet.c:901
 #, c-format
 msgid ""
 "\n"
@@ -295,18 +306,18 @@
 "interrupted."
 msgstr ""
 "\n"
-"VPN-forbindelsen \"%s\" fejlede, fordi netværksforbindelsen blev afbrudt."
+"VPN-forbindelsen “%s” fejlede, fordi netværksforbindelsen blev afbrudt."
 
-#: ../src/applet.c:887
+#: ../src/applet.c:903
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service stopped unexpectedly."
 msgstr ""
 "\n"
-"VPN-forbindelsen \"%s\"  fejlede, fordi VPN-tjenesten stoppede uventet."
+"VPN-forbindelsen “%s”  fejlede, fordi VPN-tjenesten stoppede uventet."
 
-#: ../src/applet.c:889
+#: ../src/applet.c:905
 #, c-format
 msgid ""
 "\n"
@@ -314,66 +325,66 @@
 "configuration."
 msgstr ""
 "\n"
-"VPN-forbindelsen \"%s\" fejlede, fordi VPN-tjenesten returnerede ugyldig "
+"VPN-forbindelsen “%s” fejlede, fordi VPN-tjenesten returnerede ugyldig "
 "konfiguration."
 
-#: ../src/applet.c:891
+#: ../src/applet.c:907
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the connection attempt timed out."
 msgstr ""
 "\n"
-"VPN-forbindelsen \"%s\" fejlede, fordi forsøget på at forbinde overskred "
+"VPN-forbindelsen “%s” fejlede, fordi forsøget på at forbinde overskred "
 "tidsgrænsen."
 
-#: ../src/applet.c:893
+#: ../src/applet.c:909
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service did not start in time."
 msgstr ""
 "\n"
-"VPN-forbindelsen \"%s\" fejlede, fordi VPN-tjenesten ikke startede i tide."
+"VPN-forbindelsen “%s” fejlede, fordi VPN-tjenesten ikke startede i tide."
 
-#: ../src/applet.c:895
+#: ../src/applet.c:911
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service failed to start."
 msgstr ""
 "\n"
-"VPN-forbindelsen \"%s\"  fejlede, fordi VPN-tjenestens opstart fejlede."
+"VPN-forbindelsen “%s”  fejlede, fordi VPN-tjenestens opstart fejlede."
 
-#: ../src/applet.c:897
+#: ../src/applet.c:913
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because there were no valid VPN secrets."
 msgstr ""
 "\n"
-"VPN-forbindelsen \"%s\"  fejlede, fordi der ikke fandtes nogen gyldige VPN-"
+"VPN-forbindelsen “%s”  fejlede, fordi der ikke fandtes nogen gyldige VPN-"
 "koder."
 
-#: ../src/applet.c:899
+#: ../src/applet.c:915
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because of invalid VPN secrets."
 msgstr ""
 "\n"
-"VPN-forbindelsen \"%s\" fejlede på grund af ugyldige VPN-koder."
+"VPN-forbindelsen “%s” fejlede på grund af ugyldige VPN-koder."
 
-#: ../src/applet.c:904
+#: ../src/applet.c:920
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed."
 msgstr ""
 "\n"
-"VPN-forbindelsen \"%s\" fejlede."
+"VPN-forbindelsen “%s” fejlede."
 
-#: ../src/applet.c:931
+#: ../src/applet.c:947
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -384,19 +395,19 @@
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: ../src/applet.c:949
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN-forbindelsen er blevet etableret.\n"
 
-#: ../src/applet.c:935
+#: ../src/applet.c:951
 msgid "VPN Login Message"
 msgstr "Loginmeddelelse for VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: ../src/applet.c:959 ../src/applet.c:999
 msgid "VPN Connection Failed"
 msgstr "VPN-forbindelse fejlede"
 
-#: ../src/applet.c:987
+#: ../src/applet.c:1003
 #, c-format
 msgid ""
 "\n"
@@ -405,11 +416,11 @@
 "%s"
 msgstr ""
 "\n"
-"VPN-forbindelsen \"%s\"  fejlede, fordi VPN-tjenestens opstart fejlede.\n"
+"VPN-forbindelsen “%s”  fejlede, fordi VPN-tjenestens opstart fejlede.\n"
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: ../src/applet.c:1006
 #, c-format
 msgid ""
 "\n"
@@ -418,148 +429,148 @@
 "%s"
 msgstr ""
 "\n"
-"VPN-forbindelsen \"%s\" kunne ikke starte.\n"
+"VPN-forbindelsen “%s” kunne ikke starte.\n"
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: ../src/applet.c:1295
 msgid "device not ready (firmware missing)"
 msgstr "enheden er ikke klar (firmware mangler)"
 
-#: ../src/applet.c:1281
+#: ../src/applet.c:1297
 msgid "device not ready"
 msgstr "enhed er ikke klar"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ikke tilsluttet"
 
-#: ../src/applet.c:1307
+#: ../src/applet.c:1323
 msgid "Disconnect"
 msgstr "Afbryd"
 
-#: ../src/applet.c:1321
+#: ../src/applet.c:1337
 msgid "device not managed"
 msgstr "enhed er ikke redigeret"
 
-#: ../src/applet.c:1394
+#: ../src/applet.c:1410
 msgid "No network devices available"
 msgstr "Ingen tilgængelige netværksenheder"
 
-#: ../src/applet.c:1448
+#: ../src/applet.c:1464
 msgid "_VPN Connections"
 msgstr "_VPN-forbindelser"
 
-#: ../src/applet.c:1492
+#: ../src/applet.c:1508
 msgid "_Configure VPN…"
 msgstr "_Konfigurér VPN …"
 
-#: ../src/applet.c:1495
+#: ../src/applet.c:1511
 msgid "_Add a VPN connection…"
 msgstr "_Tilføj en VPN-forbindelse …"
 
-#: ../src/applet.c:1601
+#: ../src/applet.c:1617
 msgid "NetworkManager is not running…"
 msgstr "Netværkshåndtering kører ikke …"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: ../src/applet.c:1622 ../src/applet.c:2687
 msgid "Networking disabled"
 msgstr "Netværk deaktiveret"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: ../src/applet.c:1832
 msgid "Enable _Networking"
 msgstr "Aktivér _netværk"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: ../src/applet.c:1841
 msgid "Enable _Wi-Fi"
 msgstr "Aktivér _wi-fi-netværk"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: ../src/applet.c:1850
 msgid "Enable _Mobile Broadband"
 msgstr "Aktivér _mobilt bredbånd"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: ../src/applet.c:1862
 msgid "Enable N_otifications"
 msgstr "Aktivér _påmindelser"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: ../src/applet.c:1874
 msgid "Connection _Information"
 msgstr "Forbindelses_information"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: ../src/applet.c:1882
 msgid "Edit Connections…"
 msgstr "Håndtér forbindelser …"
 
-#: ../src/applet.c:1880
+#: ../src/applet.c:1896
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/applet.c:2191
+#: ../src/applet.c:2207
 #, c-format
 msgid "You are now connected to “%s”."
-msgstr "Du er nu tilsluttet \"%s\"."
+msgstr "Du er nu tilsluttet “%s”."
 
-#: ../src/applet.c:2231
+#: ../src/applet.c:2247
 msgid "Disconnected"
 msgstr "Afbrudt"
 
-#: ../src/applet.c:2232
+#: ../src/applet.c:2248
 msgid "The network connection has been disconnected."
 msgstr "Netværksforbindelsen er blevet afbrudt."
 
-#: ../src/applet.c:2534
+#: ../src/applet.c:2550
 #, c-format
 msgid "Preparing network connection “%s”…"
-msgstr "Forbereder netværksforbindelsen \"%s\" …"
+msgstr "Forbereder netværksforbindelsen “%s” …"
 
-#: ../src/applet.c:2537
+#: ../src/applet.c:2553
 #, c-format
 msgid "User authentication required for network connection “%s”…"
-msgstr "Der kræves brugergodkendelse til netværksforbindelsen \"%s\" …"
+msgstr "Der kræves brugergodkendelse til netværksforbindelsen “%s” …"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
-msgstr "Anmoder om en netværksadresse for \"%s\" …"
+msgstr "Anmoder om en netværksadresse for “%s” …"
 
-#: ../src/applet.c:2543
+#: ../src/applet.c:2559
 #, c-format
 msgid "Network connection “%s” active"
-msgstr "Netværksforbindelsen \"%s\" er aktiv"
+msgstr "Netværksforbindelsen “%s” er aktiv"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2632
 #, c-format
 msgid "Starting VPN connection “%s”…"
-msgstr "Starter VPN-forbindelsen \"%s\" …"
+msgstr "Starter VPN-forbindelsen “%s” …"
 
-#: ../src/applet.c:2619
+#: ../src/applet.c:2635
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
-msgstr "Der kræves brugergodkendelse til VPN-forbindelsen \"%s\" …"
+msgstr "Der kræves brugergodkendelse til VPN-forbindelsen “%s” …"
 
-#: ../src/applet.c:2622
+#: ../src/applet.c:2638
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
-msgstr "Anmoder om en VPN-adresse for \"%s\" …"
+msgstr "Anmoder om en VPN-adresse for “%s” …"
 
-#: ../src/applet.c:2625
+#: ../src/applet.c:2641
 #, c-format
 msgid "VPN connection active"
 msgstr "VPN-forbindelsen er aktiv"
 
-#: ../src/applet.c:2675
+#: ../src/applet.c:2691
 msgid "No network connection"
 msgstr "Ingen netværksforbindelse"
 
-#: ../src/applet.c:3276
+#: ../src/applet.c:3292
 msgid "NetworkManager Applet"
 msgstr "Panelprogram til Netværkshåndtering"
 
@@ -576,46 +587,46 @@
 msgid "Sending unlock code…"
 msgstr "Sender oplåsningskode …"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilt bredbånd (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/applet-device-broadband.c:739
+#: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobilt bredbånd"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Tilgængelig"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 msgid "New Mobile Broadband connection…"
 msgstr "Ny mobil bredbåndsforbindelse …"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Forbindelse oprettet"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Du er nu forbundet til det mobile bredbåndsnetværk."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "Mobilt bredbåndsnetværk."
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "Du er nu registreret på hjemmenetværket."
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "Du er nu registreret på et roamingnetværk."
 
@@ -623,26 +634,26 @@
 msgid "You are now connected to the mobile broadband network."
 msgstr "Du er nu forbundet til det mobile bredbåndsnetværk."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
-msgstr "Forbereder den mobile bredbåndsforbindelse \"%s\" …"
+msgstr "Forbereder den mobile bredbåndsforbindelse “%s” …"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
-msgstr "Konfigurerer den mobile bredbåndsforbindelse \"%s\" …"
+msgstr "Konfigurerer den mobile bredbåndsforbindelse “%s” …"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
-"Der kræves brugergodkendelse til den mobile bredbåndsforbindelse \"%s\" …"
+"Der kræves brugergodkendelse til den mobile bredbåndsforbindelse “%s” …"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
-msgstr "Den mobile bredbåndsforbindelse \"%s\" er aktiv"
+msgstr "Den mobile bredbåndsforbindelse “%s” er aktiv"
 
 #: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
@@ -673,33 +684,44 @@
 #: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
-msgstr "Forbereder ethernet-netværksforbindelsen \"%s\" …"
+msgstr "Forbereder ethernet-netværksforbindelsen “%s” …"
 
 #: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
-msgstr "Konfigurerer ethernet-netværksforbindelsen \"%s\" …"
+msgstr "Konfigurerer ethernet-netværksforbindelsen “%s” …"
 
 #: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
-msgstr ""
-"Der kræves brugergodkendelse til ethernet-netværksforbindelsen \"%s\" …"
+msgstr "Der kræves brugergodkendelse til ethernet-netværksforbindelsen “%s” …"
 
 #: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
-msgstr "Anmoder om en ethernet-netværksadresse for \"%s\" …"
+msgstr "Anmoder om en ethernet-netværksadresse for “%s” …"
 
 #: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
-msgstr "Ethernet-netværksforbindelsen \"%s\" er aktiv"
+msgstr "Ethernet-netværksforbindelsen “%s” er aktiv"
 
 #: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-godkendelse"
 
+#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/page-bluetooth.c:313
+#: ../src/connection-editor/page-mobile.c:545
+#: ../src/libnma/nma-vpn-password-dialog.c:210
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+msgid "_OK"
+msgstr "_OK"
+
 #: ../src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Forbind til skjult wi-fi-netværk …"
@@ -712,7 +734,7 @@
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Kunne ikke tilføje ny forbindelse"
 
@@ -720,78 +742,78 @@
 msgid "Insufficient privileges."
 msgstr "Utilstrækkelige rettigheder."
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-fi-netværk (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-fi-netværk (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-fi-netværk"
 msgstr[1] "Wi-fi-netværk"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-fi er slået fra"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-fi er slået fra med hardwareknap"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Flere netværk"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Der er tilgængelige wi-fi-netværk"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Brug netværksmenuen til at forbinde til et wi-fi-netværk"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
-msgstr "Du er nu tilsluttet wi-fi-netværket \"%s\"."
+msgstr "Du er nu tilsluttet wi-fi-netværket “%s”."
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
-msgstr "Forbereder wi-fi-netværksforbindelsen \"%s\" …"
+msgstr "Forbereder wi-fi-netværksforbindelsen “%s” …"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
-msgstr "Konfigurerer wi-fi-netværksforbindelsen \"%s\" …"
+msgstr "Konfigurerer wi-fi-netværksforbindelsen “%s” …"
 
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
-msgstr "Der kræves brugergodkendelse til wi-fi-netværket \"%s\" …"
+msgstr "Der kræves brugergodkendelse til wi-fi-netværket “%s” …"
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
-msgstr "Anmoder om wi-fi-netværksadresse for \"%s\" …"
+msgstr "Anmoder om wi-fi-netværksadresse for “%s” …"
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
-msgstr "Wi-fi-netværksforbindelsen \"%s\" er aktiv: %s (%d%%)"
+msgstr "Wi-fi-netværksforbindelsen “%s” er aktiv: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
-msgstr "Wi-fi-netværksforbindelsen \"%s\" er aktiv"
+msgstr "Wi-fi-netværksforbindelsen “%s” er aktiv"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Kunne ikke aktivere forbindelse"
 
@@ -799,196 +821,210 @@
 msgid "Error displaying connection information:"
 msgstr "Fejl ved visning af forbindelsesinformation:"
 
-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
 #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: ../src/applet-dialogs.c:75
 msgid "Dynamic WEP"
 msgstr "Dynamisk WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:231
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: ../src/applet-dialogs.c:152
 msgid "More addresses"
 msgstr "Flere adresser"
 
-#: ../src/applet-dialogs.c:226
+#: ../src/applet-dialogs.c:227
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
+#: ../src/connection-editor/page-wifi-security.c:332
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:261
 #, c-format
 msgid "%s (default)"
 msgstr "%s (standard)"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ukendt"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
 msgid "IP Address:"
 msgstr "IP-adresse:"
 
-#: ../src/applet-dialogs.c:369
+#: ../src/applet-dialogs.c:370
 msgid "Broadcast Address:"
 msgstr "Rundsendingsadresse:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: ../src/applet-dialogs.c:382
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:383
 msgid "Subnet Mask:"
 msgstr "Undernetmaske:"
 
-#: ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:493
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:496
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: ../src/applet-dialogs.c:503
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: ../src/applet-dialogs.c:505
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
 #: ../src/connection-editor/ce-page-team-port.ui.h:23
 #: ../src/connection-editor/ce-page-team.ui.h:48
 #: ../src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/applet-dialogs.c:516
+#: ../src/applet-dialogs.c:517
 msgid "Interface:"
 msgstr "Grænseflade:"
 
-#: ../src/applet-dialogs.c:536
+#: ../src/applet-dialogs.c:537
 msgid "Hardware Address:"
 msgstr "Hardwareadresse:"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:551
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:586
 msgid "Speed:"
 msgstr "Hastighed:"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:601
 msgid "Security:"
 msgstr "Sikkerhed:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
 #: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
 msgid "Default Route:"
 msgstr "Standardrute:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
 #: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
 msgid "Ignored"
 msgstr "Ignoreres"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:816
 msgid "VPN Type:"
 msgstr "VPN-type:"
 
 # gateway?
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:823
 msgid "VPN Gateway:"
 msgstr "VPN-gateway:"
 
-#: ../src/applet-dialogs.c:828
+#: ../src/applet-dialogs.c:829
 msgid "VPN Username:"
 msgstr "VPN-brugernavn:"
 
-#: ../src/applet-dialogs.c:834
+#: ../src/applet-dialogs.c:835
 msgid "VPN Banner:"
 msgstr "VPN-banner:"
 
-#: ../src/applet-dialogs.c:840
+#: ../src/applet-dialogs.c:841
 msgid "Base Connection:"
 msgstr "Basisforbindelse:"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Ukendt"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: ../src/applet-dialogs.c:958
 msgid "No valid active connections found!"
 msgstr "Ingen gyldige aktive forbindelser fundet!"
 
-#: ../src/applet-dialogs.c:985
+#: ../src/applet-dialogs.c:1007
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"Ophavsret © 2004-2014 Red Hat, Inc.\n"
+"Ophavsret © 2004-2017 Red Hat, Inc.\n"
 "Ophavsret © 2005-2008 Novell, Inc.\n"
 "og mange andre bidragydere fra fællesskabet samt oversættere"
 
-#: ../src/applet-dialogs.c:988
+#: ../src/applet-dialogs.c:1010
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Statusfelt-panelprogram til håndtering af dine netværksenheder og -"
 "forbindelser."
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1012
 msgid "NetworkManager Website"
 msgstr "Websted for Netværkshåndtering"
 
-#: ../src/applet-dialogs.c:1001
+#: ../src/applet-dialogs.c:1016
+msgid "translator-credits"
+msgstr ""
+"# David Nielsen , 2004.\n"
+"# Martin Willemoes Hansen , 2004.\n"
+"# Lasse Bang Mikkelsen , 2005, 06.\n"
+"Peter Bach , 2007.\n"
+"Mads Bille Lundby , 2009.\n"
+"Kim Iskov , 2010, 2010.\n"
+"Anders Jenbo , 2011.\n"
+"Joe Hansen , 2011.\n"
+"Ask Hjorth Larsen , 2012-2014.\n"
+"Alan Mortensen , 2017."
+
+#: ../src/applet-dialogs.c:1026
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -996,94 +1032,87 @@
 "Panelprogrammet til Netværkshåndtering kunne ikke finde nogle krævede "
 "ressourcer (.ui-filen blev ikke fundet)."
 
-#: ../src/applet-dialogs.c:1006
+#: ../src/applet-dialogs.c:1031
 msgid "Missing resources"
 msgstr "Manglende ressourcer"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1057
 msgid "Mobile broadband network password"
 msgstr "Adgangskode til mobilt bredbåndsnetværk"
 
-#: ../src/applet-dialogs.c:1040
+#: ../src/applet-dialogs.c:1066
 #, c-format
 msgid "A password is required to connect to “%s”."
-msgstr "Der kræves en adgangskode for at forbinde til \"%s\"."
+msgstr "Der kræves en adgangskode for at forbinde til “%s”."
 
-#: ../src/applet-dialogs.c:1055
+#: ../src/applet-dialogs.c:1081
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1363
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN-oplåsning kræves"
 
-#: ../src/applet-dialogs.c:1338
+#: ../src/applet-dialogs.c:1364
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN-oplåsning kræves"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1366
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
 "used."
 msgstr ""
-"Den mobile bredbåndsenhed \"%s\" kræver en SIM PIN-kode, før den kan bruges."
+"Den mobile bredbåndsenhed “%s” kræver en SIM PIN-kode, før den kan bruges."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1368
 msgid "PIN code:"
 msgstr "PIN-kode:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1372
 msgid "Show PIN code"
 msgstr "Vis PIN-kode"
 
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1374
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK oplåsning kræves"
 
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1375
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK oplåsning kræves"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: ../src/applet-dialogs.c:1377
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
 "used."
 msgstr ""
-"Den mobile bredbåndsenhed \"%s\" kræver en SIM PUK-kode, før den kan bruges."
+"Den mobile bredbåndsenhed “%s” kræver en SIM PUK-kode, før den kan bruges."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1379
 msgid "PUK code:"
 msgstr "PUK-kode:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: ../src/applet-dialogs.c:1382
 msgid "New PIN code:"
 msgstr "Ny PIN-kode:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: ../src/applet-dialogs.c:1384
 msgid "Re-enter new PIN code:"
 msgstr "Gentag ny PIN-kode:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: ../src/applet-dialogs.c:1389
 msgid "Show PIN/PUK codes"
 msgstr "Vis PIN-/PUK-koder"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
-msgstr "_OK"
-
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
 #: ../src/connection-editor/ce-page.h:114
@@ -1091,7 +1120,7 @@
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr ""
-"IP-adresser identificerer din computer på netværket. Klik \"Tilføj\"-knappen "
+"IP-adresser identificerer din computer på netværket. Klik “Tilføj”-knappen "
 "for at tilføje en IP-adresse."
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:4
@@ -1099,21 +1128,21 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
 msgstr "_Tilføj"
 
-#. Delete
 #: ../src/connection-editor/ce-ip4-routes.ui.h:5
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/nm-connection-list.c:711
+#: ../src/connection-editor/connection-helpers.c:772
+#: ../src/connection-editor/nm-connection-list.ui.h:4
 msgid "_Delete"
 msgstr "_Slet"
 
@@ -1160,7 +1189,7 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:21
 msgid "Round-robin"
-msgstr "\"Round-robin\""
+msgstr "“Round-robin”"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:2
 #: ../src/connection-editor/ce-page-team.ui.h:22
@@ -1205,11 +1234,10 @@
 msgid "M_ode:"
 msgstr "Til_stand:"
 
-#. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: ../src/connection-editor/nm-connection-list.ui.h:5
 msgid "_Edit"
 msgstr "_Redigér"
 
@@ -1266,7 +1294,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 #: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
@@ -1275,7 +1303,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-infiniband.ui.h:7
 #: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
@@ -1293,7 +1321,7 @@
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:3
 msgid "_Hairpin mode:"
-msgstr "\"_Hairpin\"-tilstand:"
+msgstr "“_Hairpin”-tilstand:"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:1
 msgid "Bridged _connections:"
@@ -1308,25 +1336,80 @@
 msgstr "_Hilsen-tid:"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "STP forwarding delay, in seconds"
+msgstr "Forsinkelse (i sekunder) for STP-videresendelse"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "STP hello time, in seconds"
+msgstr "Tid (i sekunder) for STP-hallo"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "Enable I_GMP snooping"
 msgstr "Aktivér I_GMP-snooping"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+"Styrer, om IGMP-snooping er aktiveret for denne bro. Bemærk, hvis snooping "
+"automatisk blev deaktiveret pga. hash-kollisioner, kan systemet nægte at "
+"aktivere denne funktion, før kollisionerne er blevet løst."
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:14
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Aktivér _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:15
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr "Styrer, om Spanning Tree Protocol (STP) er aktiveret for denne bro"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:16
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+"STP-prioritet for denne bro. Lavere værdier er “bedre”; broen med den "
+"laveste prioritet vil blive valgt til root-bro."
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:17
 msgid "_Max age:"
 msgstr "_Maks. alder:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:18
+msgid "STP maximum message age, in seconds"
+msgstr "Den maksimale alder (i sekunder) for STP-besked"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:19
 msgid "_Aging time:"
 msgstr "Fo_rældelsestid:"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:20
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr "Forældelsestid (i sekunder) for ethernet-MAC-adresse"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:21
+msgid "Group _forward mask:"
+msgstr "Maske til gruppe_videresendelse:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:22
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+"En maske på 16 bit hver svarende til en gruppeadresse i området 01:80:"
+"C2:00:00:00 til 01:80:C2:00:00:0F som skal videresendes. Masken kan ikke "
+"have bittene 0, 1 eller 2 angivet, fordi de bruges til STP, MAC pause frames "
+"og LACP."
+
 #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatisk"
@@ -1585,10 +1668,22 @@
 msgstr "Br_ugernavn:"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "Username used to authenticate with the PPPoE service."
+msgstr "Brugernavn anvendt til godkendelse med PPPoE-tjenesten."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+"Indled kun sessioner med adgangskoncentratorer, som leverer den angivne "
+"tjeneste. Lad den være tom for de fleste udbydere."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
 msgid "_Service:"
 msgstr "_Tjeneste:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:5
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 #: ../src/wireless-security/ws-leap.ui.h:3
@@ -1596,7 +1691,11 @@
 msgid "Sho_w password"
 msgstr "_Vis adgangskode"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-dsl.ui.h:6
+msgid "Password used to authenticate with the PPPoE service."
+msgstr "Adgangskode anvendt til godkendelse med PPPoE-tjenesten."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:7
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
 #: ../src/libnma/nma-vpn-password-dialog.c:97
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
@@ -1607,13 +1706,29 @@
 msgid "_Password:"
 msgstr "A_dgangskode:"
 
+#: ../src/connection-editor/ce-page-dsl.ui.h:8
+msgid "PPP _interface:"
+msgstr "PPP-_grænseflade:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:9
+msgid "P_arent interface:"
+msgstr "_Ophavsgrænseflade:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:10
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr "Et vilkårligt navn som tildeles den nyligt oprettede PPP-grænseflade."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:11
+msgid "The interface on which the PPP connection will be established."
+msgstr "Grænsefladen som PPP-forbindelsen vil blive etableret på."
+
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "Automatisk"
@@ -1659,7 +1774,7 @@
 msgstr "Fuld"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "Ignorér"
 
@@ -1667,7 +1782,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "Manuelt"
 
@@ -1676,7 +1791,7 @@
 msgstr "_Port:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
 msgid "_Device:"
 msgstr "_Enhed:"
@@ -1744,9 +1859,9 @@
 "will be forced without checking the device compatibility. If unsure, leave "
 "here “Ignore” or pick “Automatic”."
 msgstr ""
-"Linkforhandling for enhed. Hvis \"Manuelt\" er valgt, vil værdierne for "
-"\"Hastighed\" og \"Duplex\" blive påtvunget uden at tjekke enhedens "
-"kompatibilitet. Hvis du er usikker, så vælg \"Ignorér\" eller \"Automatisk\"."
+"Linkforhandling for enhed. Hvis “Manuelt” er valgt, vil værdierne for "
+"“Hastighed” og “Duplex” blive påtvunget uden at tjekke enhedens "
+"kompatibilitet. Hvis du er usikker, så vælg “Ignorér” eller “Automatisk”."
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:32
 msgid "_Speed:"
@@ -1758,8 +1873,8 @@
 "“Automatic” options are not selected. Before specifying a speed value be "
 "sure your device supports it."
 msgstr ""
-"Hastighedsværdi for statisk link-forhandling; kun krævet når \"Ignorér\" og "
-"\"Automatisk\" ikke er valgt. Vær sikker på, at din enhed understøtter "
+"Hastighedsværdi for statisk link-forhandling; kun krævet når “Ignorér” og "
+"“Automatisk” ikke er valgt. Vær sikker på, at din enhed understøtter "
 "hastigheden, før du angiver den."
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:34
@@ -1772,8 +1887,8 @@
 "“Automatic” options are not selected. Before specifying a duplex mode be "
 "sure your device supports it."
 msgstr ""
-"Duplexværdi for statisk link-forhandling; kun krævet når \"Ignorér\" og "
-"\"Automatisk\" ikke er valgt. Vær sikker på, at din enhed understøtter "
+"Duplexværdi for statisk link-forhandling; kun krævet når “Ignorér” og "
+"“Automatisk” ikke er valgt. Vær sikker på, at din enhed understøtter "
 "duplexværdien, før du angiver den."
 
 #: ../src/connection-editor/ce-page-general.ui.h:1
@@ -1811,7 +1926,7 @@
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add static IP address to be configured in addition to the automatic ones."
 msgstr ""
-"IP-adresser identificerer din computer på netværket. Klik \"Tilføj\"-knappen "
+"IP-adresser identificerer din computer på netværket. Klik “Tilføj”-knappen "
 "for at lade statisk IP-adresse blive konfigureret sammen med de automatiske."
 
 #: ../src/connection-editor/ce-page.h:116
@@ -1822,9 +1937,9 @@
 "automatically."
 msgstr ""
 "IP-adressen identificerer din computer på netværket og bestemmer "
-"adresseintervallet, der fordeles til andre computere. Klik \"Tilføj\"-"
-"knappen for at tilføje en IP-adresse. Hvis der ikke er angivet en adresse, "
-"vil intervallet blive bestemt automatisk."
+"adresseintervallet, der fordeles til andre computere. Klik “Tilføj”-knappen "
+"for at tilføje en IP-adresse. Hvis der ikke er angivet en adresse, vil "
+"intervallet blive bestemt automatisk."
 
 #: ../src/connection-editor/ce-page.h:121
 msgid "Additional static addresses"
@@ -1838,20 +1953,20 @@
 msgid "Address (optional)"
 msgstr "Adresser (valgfrit)"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "_Transporttilstand:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
 msgid "Connected"
 msgstr "Tilsluttet"
 
+#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+msgid "_Transport mode:"
+msgstr "_Transporttilstand:"
+
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
 msgid "IPIP"
 msgstr "IPIP"
@@ -1889,36 +2004,39 @@
 msgstr "VTI6"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-msgid "Device name"
-msgstr "Enhedsnavn"
+#: ../src/connection-editor/ce-page-macsec.ui.h:6
+msgid "Device name:"
+msgstr "Enhedsnavn:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-msgid "Parent device"
-msgstr "Ophavsenhed"
+#: ../src/connection-editor/ce-page-macsec.ui.h:8
+msgid "Parent device:"
+msgstr "Ophavsenhed:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-msgid "Mode"
-msgstr "Tilstand"
+#: ../src/connection-editor/ce-page-macsec.ui.h:16
+msgid "Mode:"
+msgstr "Tilstand:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP"
-msgstr "Lokal IP"
+msgid "Local IP:"
+msgstr "Lokal IP:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP"
-msgstr "Fjern IP"
+msgid "Remote IP:"
+msgstr "Fjern-IP:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key"
-msgstr "Inputnøgle"
+msgid "Input key:"
+msgstr "Inputnøgle:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key"
-msgstr "Outputnøgle"
+msgid "Output key:"
+msgstr "Outputnøgle:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-msgid "MTU"
-msgstr "MTU"
+msgid "MTU:"
+msgstr "MTU:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1933,12 +2051,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "Delt til andre computere"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "_Metode:"
 
@@ -1953,7 +2071,7 @@
 "identifikation, så skriv det her."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1967,16 +2085,16 @@
 
 # Er dette Søgedomæner eller Søg domæner?
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "Søg_edomæner:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "_DNS-servere:"
 
@@ -2001,11 +2119,12 @@
 "tilslutte, hvis IPv4-konfigurationen fejler, men IPv6-konfigurationen lykkes."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "_Ruter …"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-macsec.ui.h:3
 #: ../src/connection-editor/page-ip4.c:198
 msgid "Disabled"
 msgstr "Afbrudt"
@@ -2018,8 +2137,17 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "Slået til (foretræk midlertidig adresse)"
 
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Stabil"
+
 # scope?
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -2027,17 +2155,21 @@
 msgstr ""
 "IP-adresser for domænenavneservere, som bruges til at slå værtsnavne op. "
 "Brug komma til at adskille flere domænenavneserveres adresser. Link-lokale "
-"adresser vil automatisk få \"scope\" til den forbindende grænseflade."
+"adresser vil automatisk få “scope” til den forbindende grænseflade."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6-_privatlivsudvidelser:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Kræv IPv_6-adressering for at denne forbindelse kan oprettes"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2045,6 +2177,101 @@
 "Når der forbindes til IPv4-kompatible netværk, tillades forbindelsen at "
 "tilslutte, hvis IPv6-konfigurationen fejler, men IPv4-konfigurationen lykkes."
 
+#: ../src/connection-editor/ce-page-macsec.ui.h:1
+msgid "PSK"
+msgstr "PSK"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:2
+#: ../src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:4
+msgid "Check"
+msgstr "Kontrollér"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:5
+msgid "Strict"
+msgstr "Strengt"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:7
+msgid "The name of the MACsec device."
+msgstr "MACsec-enhedens navn."
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:9
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+"Ophavsgrænsefladens navn eller ophavsforbindelsens UUID, som denne MACSEC-"
+"grænseflade skal oprettes fra."
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:10
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+"Ophavsgrænsefladens navn eller ophavsforbindelsens UUID, som denne MACsec-"
+"grænseflade skal oprettes fra"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:11
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr "Navnet på den foruddelte Connectivity-association Key"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:12
+msgid "The pre-shared Connectivity Association Key"
+msgstr "Den foruddelte Connectivity Association Key"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:13
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+"Angiver hvordan CAK (Connectivity Association Key) til MKA (MACsec Key "
+"Agreement) indhentes. For EAP-tilstanden udfyldes parametrene i "
+"sikkerhedssiden for 802.1X"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:14
+msgid "CKN:"
+msgstr "CKN:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:15
+msgid "CAK:"
+msgstr "CAK:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:17
+msgid "Keys:"
+msgstr "Nøgler:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:18
+msgid "Parameters:"
+msgstr "Parametre:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:19
+msgid "Validation:"
+msgstr "Validering:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:20
+msgid "SCI port:"
+msgstr "SCI-port:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:21
+msgid "Specifies the validation mode for incoming frames"
+msgstr "Angiver valideringstilstanden for indgående frames"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:22
+msgid "Encrypt"
+msgstr "Kryptér"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:23
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr "Om den overførte trafik skal krypteres"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:24
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr "SCI's (Secure Channel Identifier) portdel"
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:26
 msgid "Basic"
@@ -2131,38 +2358,38 @@
 msgstr "Send PPP-_ekkopakker"
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:1
-msgid "Method:"
-msgstr "Metode:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-team.ui.h:25
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: ../src/connection-editor/ce-page-proxy.ui.h:3
 msgid "For browser only"
 msgstr "Kun til browser"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: ../src/connection-editor/ce-page-proxy.ui.h:4
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr "Brug denne proxykonfiguration til kun browserklienter/-skemaer."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: ../src/connection-editor/ce-page-proxy.ui.h:5
 msgid "PAC URL:"
 msgstr "PAC-URL:"
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:6
+msgid "PAC script:"
+msgstr "PAC-skript:"
+
 #: ../src/connection-editor/ce-page-proxy.ui.h:7
 msgid "URL from where the PAC script is to be obtained."
 msgstr "URL hvorfra PAC-skriptet kan hentes."
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
-msgstr "PAC-skript:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
 msgid "Import script from a file…"
 msgstr "Importér skript fra en fil …"
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:9
+msgid "Method:"
+msgstr "Metode:"
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:19
 msgid "Ad_vanced…"
@@ -2209,24 +2436,17 @@
 msgid "ID of queue which this port should be mapped to."
 msgstr "Kø-id som denne port skal afbildes til."
 
+# activebackup og runner er det bedst ikke at oversætte:https://www.rootusers.com/how-to-configure-network-teaming-in-linux/
+# Har valgt at beholde det i to ord som på engelsk og udelade -
 #: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
-msgstr "_Portprioritet:"
+msgid "Active-Backup runner options"
+msgstr "Indstillinger for activebackup runner"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
-msgstr "Port kl_æbende"
+msgid "_Port priority:"
+msgstr "_Portprioritet:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:82
-msgid ""
-"Validate received ARP packets on active ports. If this is not checked, all "
-"incoming ARP packets will be considered as a good reply."
-msgstr ""
-"Validér modtagne ARP-pakker på aktive porte. Hvis denne ikke er markeret, "
-"vil alle indgående ARP-pakker blive betragtet som et godt svar."
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:44
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
@@ -2235,25 +2455,36 @@
 "Værdi er et positivt tal i millisekunder. Angiver et interval mellem serier "
 "af notify-peer-pakker."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
 msgid "Port priority. The higher number means higher priority."
 msgstr "Portprioritet. Et højere tal betyder højere prioritet."
 
-# activebackup og runner er det bedst ikke at oversætte:https://www.rootusers.com/how-to-configure-network-teaming-in-linux/
-# Har valgt at beholde det i to ord som på engelsk og udelade -
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port _sticky"
+msgstr "Port kl_æbende"
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:15
-msgid "Active-Backup runner options"
-msgstr "Indstillinger for activebackup runner"
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
+msgstr ""
+"Validér modtagne ARP-pakker på aktive porte. Hvis denne ikke er markeret, "
+"vil alle indgående ARP-pakker blive betragtet som et godt svar."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:16
+msgid "LACP runner options"
+msgstr "Indstillinger for LACP-runner"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
 msgid "_LACP port priority:"
 msgstr "_LACP-portprioritet:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
 msgid "LACP port _key:"
 msgstr "LACP-portn_øgle:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
 #: ../src/connection-editor/ce-page-team.ui.h:43
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
@@ -2262,7 +2493,7 @@
 "Antal serier af anmodninger om at deltage i multicastgruppe igen efter "
 "porten er blevet aktiveret eller deaktiveret."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
@@ -2270,7 +2501,7 @@
 "Portprioritet i henhold til LACP-standarden. Lavere tal betyder højere "
 "prioritet."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
 #: ../src/connection-editor/ce-page-team.ui.h:45
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
@@ -2279,7 +2510,7 @@
 "Værdi er et positivt tal i millisekunder. Angiver et interval mellem serier "
 "af multicastgruppeanmodninger om at deltage igen."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
@@ -2287,10 +2518,6 @@
 "Portnøgle i henhold til LACP-standarden. Det er kun muligt at samle porte "
 "med den samme nøgle."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
-msgid "LACP runner options"
-msgstr "Indstillinger for LACP-runner"
-
 #: ../src/connection-editor/ce-page-team-port.ui.h:24
 #: ../src/connection-editor/ce-page-team.ui.h:70
 msgid "_Link watcher:"
@@ -2490,14 +2717,14 @@
 msgstr "LACP"
 
 #: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/connection-helpers.c:105
 #: ../src/connection-editor/page-ethernet.c:351
 #: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/connection-helpers.c:120
 #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
 #: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
@@ -2585,7 +2812,7 @@
 "If not, it acts as “speak when spoken to”."
 msgstr ""
 "Hvis markeret sendes LACPDU-frames langs de konfigurerede links periodisk. "
-"Ellers opfører den sig som \"tal når tiltalt\"."
+"Ellers opfører den sig som “tal når tiltalt”."
 
 #: ../src/connection-editor/ce-page-team.ui.h:55
 msgid "Send a LACPDU frame _every second"
@@ -2708,7 +2935,7 @@
 #. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
 #: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
-msgstr "\"vlan\" + nummer"
+msgstr "“vlan” + nummer"
 
 #: ../src/connection-editor/ce-page-wifi-security.ui.h:1
 msgid "S_ecurity:"
@@ -2766,6 +2993,7 @@
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
+#: ../src/connection-editor/ce-polkit.c:63
 #: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Ingen polkit-godkendelse til at udføre handlingen"
@@ -2823,58 +3051,63 @@
 "godkendelsesmetoder. Hvis forbindelsen slår fejl, så prøv at deaktivere "
 "understøttelse af nogle af metoderne."
 
-#: ../src/connection-editor/connection-helpers.c:105
+#: ../src/connection-editor/connection-helpers.c:106
 #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
+#: ../src/connection-editor/connection-helpers.c:114
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
-
 #: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-dsl.c:201
+msgid "DSL/PPPoE"
+msgstr "DSL/PPPoE"
+
+#: ../src/connection-editor/connection-helpers.c:116
 #: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:117
 #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Binding"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Gruppe"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-bridge.c:212
+#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/page-bridge.c:233
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Bro"
 
-#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/connection-helpers.c:121
 #: ../src/connection-editor/page-ip-tunnel.c:176
 msgid "IP tunnel"
 msgstr "IP-tunnel"
 
 #: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
+#: ../src/connection-editor/page-macsec.c:190
+msgid "MACsec"
+msgstr "MACsec"
+
+#: ../src/connection-editor/connection-helpers.c:124
+#: ../src/connection-editor/connection-helpers.c:398
 #: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:205
+#: ../src/connection-editor/connection-helpers.c:207
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2884,11 +3117,11 @@
 "\n"
 "Fejl: Ingen VPN-tjenestetype."
 
-#: ../src/connection-editor/connection-helpers.c:217
+#: ../src/connection-editor/connection-helpers.c:219
 msgid "Cannot import VPN connection"
 msgstr "Kan ikke importere VPN-forbindelse"
 
-#: ../src/connection-editor/connection-helpers.c:219
+#: ../src/connection-editor/connection-helpers.c:221
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2896,51 +3129,58 @@
 "\n"
 "Error: %s."
 msgstr ""
-"Filen \"%s\" kunne ikke læses eller indeholder ikke genkendt VPN-"
+"Filen “%s” kunne ikke læses eller indeholder ikke genkendt VPN-"
 "forbindelsesinformation\n"
 "\n"
 "Fejl: %s."
 
-#: ../src/connection-editor/connection-helpers.c:220
+#: ../src/connection-editor/connection-helpers.c:222
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: ../src/connection-editor/connection-helpers.c:303
+#: ../src/connection-editor/connection-helpers.c:305
 #: ../src/connection-editor/page-proxy.c:118
 #: ../src/connection-editor/page-team.c:341
 #: ../src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Vælg fil til import"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: ../src/connection-editor/connection-helpers.c:309
+#: ../src/connection-editor/page-proxy.c:122
+#: ../src/connection-editor/page-team.c:345
+#: ../src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr "_Åbn"
+
+#: ../src/connection-editor/connection-helpers.c:340
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: ../src/connection-editor/connection-helpers.c:367
 msgid "Virtual"
 msgstr "Virtuel"
 
-#: ../src/connection-editor/connection-helpers.c:514
 #: ../src/connection-editor/connection-helpers.c:516
+#: ../src/connection-editor/connection-helpers.c:518
 msgid "Import a saved VPN configuration…"
 msgstr "Importér en gemt VPN-konfiguration …"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: ../src/connection-editor/connection-helpers.c:548
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Forbindelsesredigeringen kunne ikke initialiseres på grund af en ukendt fejl."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: ../src/connection-editor/connection-helpers.c:557
 msgid "Could not create new connection"
 msgstr "Kunne ikke oprette ny forbindelse"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: ../src/connection-editor/connection-helpers.c:720
 msgid "Connection delete failed"
 msgstr "Sletning af forbindelse fejlede"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: ../src/connection-editor/connection-helpers.c:768
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Er du sikker på, du ønsker at slette forbindelsen %s?"
@@ -2948,7 +3188,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "Adresse"
 
@@ -2960,7 +3200,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "Gateway"
 
@@ -2970,38 +3210,38 @@
 msgstr "Metersystem"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "Præfiks"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: ../src/connection-editor/nm-connection-editor.c:109
 #, c-format
 msgid "Editing %s"
 msgstr "Redigerer %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: ../src/connection-editor/nm-connection-editor.c:113
 msgid "Editing un-named connection"
 msgstr "Redigerer unavngiven forbindelse"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: ../src/connection-editor/nm-connection-editor.c:133
 msgid "Missing connection name"
 msgstr "Manglende forbindelsesnavn"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: ../src/connection-editor/nm-connection-editor.c:353
 msgid "Editor initializing…"
 msgstr "Redigeringen initialiserer …"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: ../src/connection-editor/nm-connection-editor.c:360
+#: ../src/connection-editor/nm-connection-list.c:443
 msgid "Connection cannot be modified"
 msgstr "Forbindelsen kan ikke ændres"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: ../src/connection-editor/nm-connection-editor.c:375
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Ugyldig indstilling %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: ../src/connection-editor/nm-connection-editor.c:451
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3009,32 +3249,33 @@
 "Forbindelsesredigering kunne ikke finde nogle krævede ressourcer (.ui-filen "
 "blev ikke fundet)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Gem"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/nm-connection-editor.c:579
 msgid "Save any changes made to this connection."
 msgstr "Gem ændringer til denne forbindelse."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: ../src/connection-editor/nm-connection-editor.c:580
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Godkend for at gemme denne forbindelse for alle brugere af denne maskine."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not create connection"
 msgstr "Kunne ikke oprette forbindelse"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not edit connection"
 msgstr "Kunne ikke redigere forbindelse"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: ../src/connection-editor/nm-connection-editor.c:598
 msgid "Unknown error creating connection editor dialog."
 msgstr "Ukendt fejl ved oprettelse af dialogvindue til forbindelsesredigering."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: ../src/connection-editor/nm-connection-editor.c:739
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -3042,24 +3283,20 @@
 "Advarsel: Forbindelsen indeholder nogle egenskaber, som ikke understøttes af "
 "redigeringsfunktionen. De vil blive ryddet, når der gemmes."
 
-#: ../src/connection-editor/nm-connection-editor.c:758
+#: ../src/connection-editor/nm-connection-editor.c:759
 msgid "Error initializing editor"
 msgstr "Kunne ikke initialisere redigeringen"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: ../src/connection-editor/nm-connection-editor.c:1157
 msgid "Connection add failed"
 msgstr "Tilføjelse af forbindelse fejlede"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr "_Luk"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Fix"
 msgstr "Ret"
 
 # Skal "true" oversættes? Senere oversættes "false" ikke.
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3067,23 +3304,23 @@
 "Sikkerhedsmærkater kan gøre, at nogle filer ikke kan bruges med "
 "certifikatgodkendelse."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "For_bindelsesnavn:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "_Export…"
 msgstr "_Eksportér …"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
 msgid "File Relabel"
 msgstr "Ommærk fil"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "_Relabel"
 msgstr "O_mmærk"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
@@ -3091,116 +3328,132 @@
 "De følgende filer er ikke mærkede til brug med certifikatgodkendelse. Vil du "
 "tilpasse mærkaterne?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
 msgid "Relabel"
 msgstr "Ommærk"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: ../src/connection-editor/nm-connection-list.c:151
 msgid "never"
 msgstr "aldrig"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:173
 msgid "now"
 msgstr "nu"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: ../src/connection-editor/nm-connection-list.c:180
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minutter siden"
 msgstr[1] "%d minutter siden"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: ../src/connection-editor/nm-connection-list.c:184
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d timer siden"
 msgstr[1] "%d timer siden"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:196
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dage siden"
 msgstr[1] "%d dage siden"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: ../src/connection-editor/nm-connection-list.c:202
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d måneder siden"
 msgstr[1] "%d måneder siden"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: ../src/connection-editor/nm-connection-list.c:206
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d år siden"
 msgstr[1] "%d år siden"
 
-#: ../src/connection-editor/nm-connection-list.c:635
+#: ../src/connection-editor/nm-connection-list.c:445
+msgid "Connection cannot be deleted"
+msgstr "Forbindelsen kan ikke slettes"
+
+#: ../src/connection-editor/nm-connection-list.c:448
+msgid "Select a connection to edit"
+msgstr "Vælg en forbindelse, der skal redigeres"
+
+#: ../src/connection-editor/nm-connection-list.c:450
+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.h:2
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: ../src/connection-editor/nm-connection-list.c:798
 msgid "Last Used"
 msgstr "Sidst brugt"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: ../src/connection-editor/nm-connection-list.c:836
 msgid "Edit the selected connection"
 msgstr "Redigér den valgte forbindelse"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: ../src/connection-editor/nm-connection-list.c:837
 msgid "Authenticate to edit the selected connection"
 msgstr "Bekræft identitet for at redigere den valgte forbindelse"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: ../src/connection-editor/nm-connection-list.c:842
 msgid "Delete the selected connection"
 msgstr "Slet den valgte forbindelse"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: ../src/connection-editor/nm-connection-list.c:843
 msgid "Authenticate to delete the selected connection"
 msgstr "Bekræft identitet for at slette den valgte forbindelse"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:1048
+#: ../src/connection-editor/nm-connection-list.c:1051
 msgid "Error creating connection"
 msgstr "Fejl ved oprettelse af forbindelse"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:1049
 msgid "No VPN plugins are installed."
 msgstr "Der er ikke installeret nogen VPN-udvidelsesmoduler."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:1052
 #, c-format
 msgid "Don’t know how to create “%s” connections"
-msgstr "Ved ikke, hvordan man opretter \"%s\"-forbindelser"
+msgstr "Ved ikke, hvordan man opretter “%s”-forbindelser"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: ../src/connection-editor/nm-connection-list.c:1085
 msgid "Error editing connection"
 msgstr "Fejl ved redigering af forbindelsen"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: ../src/connection-editor/nm-connection-list.c:1086
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
-msgstr "Fandt ikke en forbindelse med UUID \"%s\""
+msgstr "Fandt ikke en forbindelse med UUID “%s”"
+
+#: ../src/connection-editor/nm-connection-list.ui.h:2
+msgid "Add a new connection"
+msgstr "Tilføj en ny forbindelse"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: ../src/connection-editor/page-8021x-security.c:116
 msgid "802.1X Security"
 msgstr "802.1X sikkerhed"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: ../src/connection-editor/page-8021x-security.c:118
 msgid "Could not load 802.1X Security user interface."
 msgstr "Kunne ikke indlæse brugergrænseflade til 802.1X-sikkerhed."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: ../src/connection-editor/page-8021x-security.c:132
 msgid "Use 802.1_X security for this connection"
 msgstr "Brug 802.1_X-sikkerhed til denne forbindelse"
 
@@ -3251,11 +3504,11 @@
 msgid "Bond connection %d"
 msgstr "Bindingsforbindelse %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:236
 msgid "Could not load bridge user interface."
 msgstr "Kunne ikke indlæse bro-brugergrænseflade."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: ../src/connection-editor/page-bridge.c:352
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Broforbindelse %d"
@@ -3279,11 +3532,15 @@
 msgid "Could not load DCB user interface."
 msgstr "Kunne ikke indlæse DCB-brugergrænseflade."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: ../src/connection-editor/page-dsl.c:203
 msgid "Could not load DSL user interface."
 msgstr "Kunne ikke indlæse DSL-brugergrænseflade."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: ../src/connection-editor/page-dsl.c:298
+msgid "missing parent interface"
+msgstr "manglende ophavsgrænseflade"
+
+#: ../src/connection-editor/page-dsl.c:343
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-forbindelse %d"
@@ -3296,7 +3553,7 @@
 msgstr ""
 "Denne indstilling låser forbindelsen til netværksenheden angivet enten med "
 "sit grænsefladenavn, sin permanente MAC-adresse eller begge. Eksempler: "
-"\"em1\", \"3C:97:0E:42:1A:19\", \"em1 (3C:97:0E:42:1A:19)\""
+"“em1”, “3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”"
 
 #: ../src/connection-editor/page-ethernet.c:262
 msgid "ignored"
@@ -3356,8 +3613,8 @@
 msgstr ""
 "Denne indstilling låser forbindelsen til netværksenheden angivet enten med "
 "sit grænsefladenavn, sin permanente MAC-adresse eller begge. Eksempler: "
-"\"ib0\", \"80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65\", "
-"\"ib0 (80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)\""
+"“ib0”, “80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”, “ib0 "
+"(80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 
 #: ../src/connection-editor/page-infiniband.c:151
 msgid "Could not load InfiniBand user interface."
@@ -3382,27 +3639,27 @@
 msgstr "IP-tunnelforbindelse %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "Automatisk (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "Kun automatiske (VPN) adresser"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "Automatisk, kun adresser"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "Automatisk (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Kun automatiske (PPPoE) adresser"
 
@@ -3415,17 +3672,17 @@
 msgstr "Kun automatiske (DHCP) adresser"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "Kun link-lokal"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "Yderligere _DNS-servere:"
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "Yderligere søg_edomæner:"
 
@@ -3445,59 +3702,68 @@
 #: ../src/connection-editor/page-ip4.c:1321
 #, c-format
 msgid "IPv4 address “%s” invalid"
-msgstr "IPv4-adressen \"%s\" er ugyldig"
+msgstr "IPv4-adressen “%s” er ugyldig"
 
 #: ../src/connection-editor/page-ip4.c:1329
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
-msgstr "IPv4-adressenetmasken \"%s\" er ugyldig"
+msgstr "IPv4-adressenetmasken “%s” er ugyldig"
 
 #: ../src/connection-editor/page-ip4.c:1338
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
-msgstr "IPv4-gatewayen \"%s\" er ugyldig"
+msgstr "IPv4-gatewayen “%s” er ugyldig"
 
 #: ../src/connection-editor/page-ip4.c:1381
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
-msgstr "IPv4-DNS-serveren \"%s\" er ugyldig"
+msgstr "IPv4-DNS-serveren “%s” er ugyldig"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "Automatisk, kun DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Redigerer IPv6-ruter for %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "IPv6-indstillinger"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr "Kunne ikke indlæse IPv6-brugergrænseflade."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, c-format
 msgid "IPv6 address “%s” invalid"
-msgstr "IPv6-adressen \"%s\" er ugyldig"
+msgstr "IPv6-adressen “%s” er ugyldig"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
-msgstr "IPv6-præfikset \"%s\" er ugyldigt"
+msgstr "IPv6-præfikset “%s” er ugyldigt"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
-msgstr "IPv6-gatewayen \"%s\" er ugyldig"
+msgstr "IPv6-gatewayen “%s” er ugyldig"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
-msgstr "IPv6-DNS-serveren \"%s\" er ugyldig"
+msgstr "IPv6-DNS-serveren “%s” er ugyldig"
+
+#: ../src/connection-editor/page-macsec.c:192
+msgid "Could not load MACsec user interface."
+msgstr "Kunne ikke indlæse brugergrænseflade til MACsec."
+
+#: ../src/connection-editor/page-macsec.c:331
+#, c-format
+msgid "MACSEC connection %d"
+msgstr "MACSEC-forbindelse %d"
 
 #: ../src/connection-editor/page-master.c:247
 #: ../src/connection-editor/page-master.c:258
@@ -3507,7 +3773,7 @@
 #: ../src/connection-editor/page-master.c:248
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
-msgstr "Slaverne \"%s\" og \"%s\" svarer begge til enheden \"%s\""
+msgstr "Slaverne “%s” og “%s” svarer begge til enheden “%s”"
 
 #: ../src/connection-editor/page-master.c:259
 #, c-format
@@ -3515,8 +3781,8 @@
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
-"Slaverne \"%s\" og \"%s\" svarer til forskellige virtuelle porte (\"%s\" og "
-"\"%s\") for samme fysiske enhed."
+"Slaverne “%s” og “%s” svarer til forskellige virtuelle porte (“%s” og “%s”) "
+"for samme fysiske enhed."
 
 #: ../src/connection-editor/page-master.c:385
 #, c-format
@@ -3555,38 +3821,34 @@
 msgstr "Min udbyder bruger C_DMA-teknologi (f.eks. 1xRTT, EVDO)"
 
 #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: ../src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
 #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: ../src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
 #: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: ../src/wireless-security/eap-method-ttls.c:287
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: ../src/wireless-security/eap-method-fast.c:282
+#: ../src/wireless-security/eap-method-peap.c:299
+#: ../src/wireless-security/eap-method-ttls.c:317
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: ../src/wireless-security/eap-method-ttls.c:302
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3621,11 +3883,11 @@
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Fejl: filen indeholder ikke en gyldig JSON-opsætning"
 
-#: ../src/connection-editor/page-team.c:1156
+#: ../src/connection-editor/page-team.c:1034
 msgid "Could not load team user interface."
 msgstr "Kunne ikke indlæse gruppebrugergrænseflade."
 
-#: ../src/connection-editor/page-team.c:1253
+#: ../src/connection-editor/page-team.c:1131
 #, c-format
 msgid "Team connection %d"
 msgstr "Gruppeforbindelse %d"
@@ -3633,11 +3895,11 @@
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: ../src/connection-editor/page-team-port.c:655
 msgid "Team Port"
 msgstr "Gruppeport"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: ../src/connection-editor/page-team-port.c:657
 msgid "Could not load team port user interface."
 msgstr "Kunne ikke indlæse brugergrænseflade til gruppeport."
 
@@ -3647,7 +3909,7 @@
 #: ../src/connection-editor/page-vlan.c:415
 #, c-format
 msgid "%s (via “%s”)"
-msgstr "%s (via \"%s\")"
+msgstr "%s (via “%s”)"
 
 #: ../src/connection-editor/page-vlan.c:427
 #, c-format
@@ -3674,13 +3936,13 @@
 #: ../src/connection-editor/page-vpn.c:113
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
-msgstr "Kunne ikke finde VPN-udvidelsesmodulet til \"%s\"."
+msgstr "Kunne ikke finde VPN-udvidelsesmodulet til “%s”."
 
 #: ../src/connection-editor/page-vpn.c:122
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr ""
-"Kunne ikke indlæse udvidelsesmodulet til redigering af VPN til \"%s\" (%s)."
+"Kunne ikke indlæse udvidelsesmodulet til redigering af VPN til “%s” (%s)."
 
 #: ../src/connection-editor/page-vpn.c:123
 msgid "unknown failure"
@@ -3721,7 +3983,7 @@
 msgstr ""
 "Denne indstilling låser forbindelsen til netværksenheden angivet enten med "
 "sit grænsefladenavn, sin permanente MAC-adresse eller begge. Eksempler: "
-"\"wlan0\", \"3C:97:0E:42:1A:19\", \"wlan0 (3C:97:0E:42:1A:19)\""
+"“wlan0”, “3C:97:0E:42:1A:19”, “wlan0 (3C:97:0E:42:1A:19)”"
 
 #: ../src/connection-editor/page-wifi.c:197
 #, c-format
@@ -3745,50 +4007,50 @@
 msgid "Wi-Fi connection %d"
 msgstr "Wi-fi-forbindelse %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
+#: ../src/connection-editor/page-wifi-security.c:358
 #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-nøgle (Hex eller ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
+#: ../src/connection-editor/page-wifi-security.c:368
 #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit adgangsfrase"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: ../src/connection-editor/page-wifi-security.c:394
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamisk WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
+#: ../src/connection-editor/page-wifi-security.c:407
 #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA og WPA2 personlig"
 
-#: ../src/connection-editor/page-wifi-security.c:418
+#: ../src/connection-editor/page-wifi-security.c:420
 #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: ../src/connection-editor/page-wifi-security.c:463
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Kunne ikke indlæse brugergrænsefladen for wi-fi-sikkerhed; mangler wi-fi-"
 "indstilling."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: ../src/connection-editor/page-wifi-security.c:474
 msgid "Wi-Fi Security"
 msgstr "Wi-fi-sikkerhed"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: ../src/connection-editor/page-wifi-security.c:476
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Kunne ikke indlæse brugergrænsefladen for wi-fi-sikkerhed."
 
-#: ../src/connection-editor/page-wifi-security.c:558
+#: ../src/connection-editor/page-wifi-security.c:560
 #, c-format
 msgid "missing SSID"
 msgstr "manglende SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:564
+#: ../src/connection-editor/page-wifi-security.c:566
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Sikkerhed ikke kompatibel med ad hoc-tilstand"
@@ -3796,7 +4058,7 @@
 #: ../src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
-msgstr "En fil ved navn \"%s\" findes allerede."
+msgstr "En fil ved navn “%s” findes allerede."
 
 #: ../src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
@@ -3818,7 +4080,7 @@
 "\n"
 "Error: %s."
 msgstr ""
-"VPN-forbindelsen \"%s\" kunne ikke eksporteres til %s.\n"
+"VPN-forbindelsen “%s” kunne ikke eksporteres til %s.\n"
 "\n"
 "Fejl: %s."
 
@@ -3838,34 +4100,38 @@
 msgid "Connection Information"
 msgstr "Forbindelsesinformation"
 
+#: ../src/info.ui.h:2
+msgid "_Close"
+msgstr "_Luk"
+
 #: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Aktive netværksforbindelser"
 
 #: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
 msgid "No certificate set"
 msgstr "Intet certifikat angivet"
 
 #: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
 msgid "No key set"
 msgstr "Ingen nøgle angivet"
 
 #: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
 #, 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:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
 #, c-format
 msgid "%s private _key:"
 msgstr "%s privat nøg_le:"
 
 #: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
 #, c-format
 msgid "%s key _password:"
 msgstr "Adgangskode til %s nøgle:"
@@ -3876,7 +4142,7 @@
 msgstr "Vælg %s-certifikat"
 
 #: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
 msgid "%s _certificate:"
 msgstr "%s-_certifikat:"
@@ -3919,7 +4185,7 @@
 "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."
+"vælg “Netværksforbindelser” fra menuen System → Indstillinger."
 
 #: ../src/libnma/nma-mobile-wizard.c:261
 #: ../src/libnm-gtk/nm-mobile-wizard.c:262
@@ -4082,45 +4348,45 @@
 msgid "New Mobile Broadband Connection"
 msgstr "Ny mobil bredbåndsforbindelse"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: ../src/libnma/nma-cert-chooser-button.c:165
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: ../src/libnma/nma-cert-chooser-button.c:173
 #, c-format
 msgid "Key in %s"
 msgstr "Nøgle i %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: ../src/libnma/nma-cert-chooser-button.c:174
 #, c-format
 msgid "Certificate in %s"
 msgstr "Certifikat i %s:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
+#: ../src/libnma/nma-cert-chooser-button.c:193
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Ukendt)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: ../src/libnma/nma-cert-chooser-button.c:215
+#: ../src/libnma/nma-cert-chooser-button.c:245
 msgid "Select"
 msgstr "Vælg"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: ../src/libnma/nma-cert-chooser-button.c:216
+#: ../src/libnma/nma-cert-chooser-button.c:246
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: ../src/libnma/nma-cert-chooser-button.c:472
 msgid "Select from file…"
 msgstr "Vælg fra fil …"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Vælg et %s-certifikat"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s certificate _password:"
 msgstr "Adgangs_kode for %s-certifikat:"
@@ -4180,8 +4446,8 @@
 msgid "_Tertiary Password:"
 msgstr "_Tertiær adgangskode:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: ../src/libnma/nma-vpn-password-dialog.c:238
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "_Vis adgangskoder"
 
@@ -4210,47 +4476,47 @@
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisk WEP (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "O_pret"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Der kræves adgangskoder eller krypteringsnøgler for at få adgang til wi-fi-"
-"netværket \"%s\"."
+"netværket “%s”."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Godkendelse til wi-fi-netværket påkrævet"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Der kræves godkendelse til wi-fi-netværket"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Opret nyt wi-fi-netværk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Nyt wi-fi-netværk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
 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:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Forbind til skjult wi-fi-netværk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Skjult wi-fi-netværk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4404,25 +4670,25 @@
 msgid "Roaming network"
 msgstr "Roaming netværk"
 
-#: ../src/mobile-helpers.c:331
+#: ../src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
-msgstr "PIN-kode til SIM-kortet \"%s\" på \"%s\""
+msgstr "PIN-kode til SIM-kortet “%s” på “%s”"
 
-#: ../src/mobile-helpers.c:464
+#: ../src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN-kode kræves"
 
-#: ../src/mobile-helpers.c:472
+#: ../src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Der skal bruges en PIN-kode til den mobile bredbåndsenhed"
 
-#: ../src/mobile-helpers.c:622
+#: ../src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
-msgstr "Den mobile bredbåndsforbindelse \"%s\" er aktiv: (%d%%%s%s)"
+msgstr "Den mobile bredbåndsforbindelse “%s” er aktiv: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: ../src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "roaming"
 
@@ -4432,11 +4698,11 @@
 msgid "%s connection"
 msgstr "Forbindelse til %s"
 
-#: ../src/utils/utils.c:563
+#: ../src/utils/utils.c:565
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "PEM-certifikater (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: ../src/utils/utils.c:577
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER-, PEM- eller PKCS#12-private nøgler (*.der, *.pem, *.p12, *.key)"
 
@@ -4444,38 +4710,33 @@
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "udefineret fejl i 802.1X-sikkerhed (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr "ingen fil valgt"
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr "filen “%s” findes ikke"
+#: ../src/wireless-security/eap-method.c:365
+msgid "no CA certificate selected"
+msgstr "intet CA-certifikat valgt"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
-msgstr "uspecificeret fejl under validering af eap-metodefilen"
+#: ../src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
+msgstr "valgte CA-certifikatfil findes ikke"
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: ../src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "manglende EAP-FAST-PAC-fil"
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: ../src/wireless-security/eap-method-fast.c:267
+#: ../src/wireless-security/eap-method-peap.c:329
+#: ../src/wireless-security/eap-method-ttls.c:379
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:405
 msgid "Choose a PAC file"
 msgstr "Vælg en PAC-fil"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:412
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: ../src/wireless-security/eap-method-fast.c:416
 msgid "All files"
 msgstr "Alle filer"
 
@@ -4493,7 +4754,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:4
 #: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "Anony_mous identity:"
 msgstr "Anony_m identitet:"
 
@@ -4503,7 +4764,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:6
 #: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
 msgid "_Inner authentication:"
 msgstr "_Indre godkendelse:"
 
@@ -4519,26 +4780,12 @@
 msgid "missing EAP-LEAP password"
 msgstr "manglende EAP-LEAP-adgangskode"
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr "ugyldigt EAP-PEAP-CA-certifikat: %s"
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr "ugyldigt EAP-PEAP-CA-certifikat: intet certifikat angivet"
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: ../src/wireless-security/eap-method-peap.c:314
+#: ../src/wireless-security/eap-method-ttls.c:364
 #: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-msgid "Choose a Certificate Authority certificate"
-msgstr "Vælg et certifikat fra certifikatautoritet"
-
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "Version 0"
@@ -4548,20 +4795,27 @@
 msgstr "Version 1"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "_CA-certifikat:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
 #: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
 msgid "No CA certificate is _required"
 msgstr "CA-certifikat ikke _påkrævet"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:6
 msgid "PEAP _version:"
 msgstr "PEAP-_version:"
 
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "Suffix of the server certificate name."
+msgstr "Endelse på servercertifikatets navn."
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Domain:"
+msgstr "_Domæne:"
+
 #: ../src/wireless-security/eap-method-simple.c:75
 msgid "missing EAP username"
 msgstr "manglende EAP-brugernavn"
@@ -4574,44 +4828,27 @@
 msgid "missing EAP-TLS identity"
 msgstr "manglende EAP-TLS-identitet"
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: ../src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "intet brugercertifikat valgt"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: ../src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "valgte brugercertifikatfil findes ikke"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "ingen nøgle valgt"
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: ../src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "valgte nøglefil findes ikke"
 
-#: ../src/wireless-security/eap-method-tls.c:314
-msgid "no CA certificate selected"
-msgstr "intet CA-certifikat valgt"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr "valgte CA-certifikatfil findes ikke"
-
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "I_dentitet:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr "ugyldigt EAP-TTLS-CA-certifikat: %s"
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr "ugyldigt EAP-TTLS-CA-certifikat: intet certifikat angivet"
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (ingen EAP)"
 
@@ -4688,17 +4925,17 @@
 msgstr "ugyldig wep-nøgle: adgangsfrasen skal være kortere end 64 tegn"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Standard)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Open System"
 msgstr "Åbent system"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Shared Key"
 msgstr "Delt nøgle"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "1 (Default)"
+msgstr "1 (Standard)"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key:"
 msgstr "_Nøgle:"
@@ -4728,19 +4965,55 @@
 msgid "_Type:"
 msgstr "_Type:"
 
+#~ msgid "Mode"
+#~ msgstr "Tilstand"
+
+#~ msgid "MTU"
+#~ msgstr "MTU"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "no file selected"
+#~ msgstr "ingen fil valgt"
+
+#~ msgid "file “%s” does not exist"
+#~ msgstr "filen “%s” findes ikke"
+
+#~ msgid "unspecified error validating eap-method file"
+#~ msgstr "uspecificeret fejl under validering af eap-metodefilen"
+
+#~ msgid "invalid EAP-PEAP CA certificate: %s"
+#~ msgstr "ugyldigt EAP-PEAP-CA-certifikat: %s"
+
+#~ msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+#~ msgstr "ugyldigt EAP-PEAP-CA-certifikat: intet certifikat angivet"
+
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Vælg et certifikat fra certifikatautoritet"
+
+#~ msgid "C_A certificate:"
+#~ msgstr "_CA-certifikat:"
+
+#~ msgid "invalid EAP-TTLS CA certificate: %s"
+#~ msgstr "ugyldigt EAP-TTLS-CA-certifikat: %s"
+
+#~ msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+#~ msgstr "ugyldigt EAP-TTLS-CA-certifikat: intet certifikat angivet"
+
 #~ msgid ""
 #~ "\n"
 #~ "The VPN connection “%s” disconnected because the VPN service stopped."
 #~ msgstr ""
 #~ "\n"
-#~ "VPN-forbindelsen \"%s\" blev afbrudt, fordi VPN-tjenesten stoppede."
+#~ "VPN-forbindelsen “%s” blev afbrudt, fordi VPN-tjenesten stoppede."
 
 #~ msgid ""
 #~ "\n"
 #~ "The VPN connection “%s” disconnected."
 #~ msgstr ""
 #~ "\n"
-#~ "VPN-forbindelsen \"%s\" blev afbrudt."
+#~ "VPN-forbindelsen “%s” blev afbrudt."
 
 #~ msgid "invalid EAP-TLS CA certificate: %s"
 #~ msgstr "ugyldigt EAP-TLS-CA-certifikat: %s"
@@ -4787,13 +5060,13 @@
 #~ msgstr "_Afbryd VPN"
 
 #~ msgid "New Mobile Broadband connection..."
-#~ msgstr "Ny mobil bredbåndsforbindelse..."
+#~ msgstr "Ny mobil bredbåndsforbindelse …"
 
 #~ msgid "_Connect to Hidden Wi-Fi Network..."
-#~ msgstr "_Forbind til skjult trådløst netværk..."
+#~ msgstr "_Forbind til skjult trådløst netværk …"
 
 #~ msgid "Create _New Wi-Fi Network..."
-#~ msgstr "Opret _nyt trådløst netværk..."
+#~ msgstr "Opret _nyt trådløst netværk …"
 
 #~ msgid " "
 #~ msgstr " "
@@ -4832,7 +5105,7 @@
 #~ msgstr "FirewallD kører ikke."
 
 #~ msgid "New..."
-#~ msgstr "Ny..."
+#~ msgstr "Ny …"
 
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Aktiver WiMA_X mobilt bredbånd"
@@ -4844,37 +5117,37 @@
 #~ msgstr "Du er nu tilsluttet det bundne netværk."
 
 #~ msgid "Preparing bond connection '%s'..."
-#~ msgstr "Forbereder bindingsforbindelsen \"%s\"..."
+#~ msgstr "Forbereder bindingsforbindelsen “%s” …"
 
 #~ msgid "Configuring bond connection '%s'..."
-#~ msgstr "Konfigurerer bindingsforbindelsen \"%s\"..."
+#~ msgstr "Konfigurerer bindingsforbindelsen “%s” …"
 
 #~ msgid "User authentication required for bond connection '%s'..."
-#~ msgstr "Der kræves brugergodkendelse til bindingsforbindelsen \"%s\"..."
+#~ msgstr "Der kræves brugergodkendelse til bindingsforbindelsen “%s” …"
 
 #~ msgid "Requesting address for '%s'..."
-#~ msgstr "Anmoder om adresse for \"%s\"..."
+#~ msgstr "Anmoder om adresse for “%s” …"
 
 #~ msgid "Bond connection '%s' active"
-#~ msgstr "Bindingsforbindelsen \"%s\" er aktiv"
+#~ msgstr "Bindingsforbindelsen “%s” er aktiv"
 
 #~ msgid "You are now connected to the bridged network."
 #~ msgstr "Du er nu tilsluttet bronetværket."
 
 #~ msgid "Preparing bridge connection '%s'..."
-#~ msgstr "Forbereder broforbindelsen \"%s\"..."
+#~ msgstr "Forbereder broforbindelsen “%s” …"
 
 #~ msgid "Configuring bridge connection '%s'..."
-#~ msgstr "Konfigurerer broforbindelsen \"%s\"..."
+#~ msgstr "Konfigurerer broforbindelsen “%s” …"
 
 #~ msgid "User authentication required for bridge connection '%s'..."
-#~ msgstr "Der kræves brugergodkendelse til broforbindelsen \"%s\"..."
+#~ msgstr "Der kræves brugergodkendelse til broforbindelsen “%s” …"
 
 #~ msgid "Bridge connection '%s' active"
-#~ msgstr "Broforbindelsen \"%s\" er aktiv"
+#~ msgstr "Broforbindelsen “%s” er aktiv"
 
 #~ msgid "New Mobile Broadband (CDMA) connection..."
-#~ msgstr "Ny mobil bredbåndsforbindelse (CDMA)..."
+#~ msgstr "Ny mobil bredbåndsforbindelse (CDMA) …"
 
 #~ msgid "You are now connected to the CDMA network."
 #~ msgstr "Du er nu tilsluttet CDMA-netværket."
@@ -4883,7 +5156,7 @@
 #~ msgstr "CDMA-netværk."
 
 #~ msgid "New Mobile Broadband (GSM) connection..."
-#~ msgstr "Ny mobil bredbåndsforbindelse (GSM)..."
+#~ msgstr "Ny mobil bredbåndsforbindelse (GSM) …"
 
 #~ msgid "You are now connected to the GSM network."
 #~ msgstr "Du er nu tilsluttet GSM-netværket."
@@ -4910,46 +5183,46 @@
 #~ msgstr "Du er nu tilsluttet InfiniBand-netværket."
 
 #~ msgid "Preparing InfiniBand connection '%s'..."
-#~ msgstr "Forbereder InfiniBand-forbindelsen \"%s\"..."
+#~ msgstr "Forbereder InfiniBand-forbindelsen “%s” …"
 
 #~ msgid "Configuring InfiniBand connection '%s'..."
-#~ msgstr "Konfigurerer InfiniBand-forbindelsen \"%s\"..."
+#~ msgstr "Konfigurerer InfiniBand-forbindelsen “%s” …"
 
 #~ msgid "User authentication required for InfiniBand connection '%s'..."
-#~ msgstr "Der kræves brugergodkendelse til InfiniBand-forbindelsen \"%s\"..."
+#~ msgstr "Der kræves brugergodkendelse til InfiniBand-forbindelsen “%s” …"
 
 #~ msgid "InfiniBand connection '%s' active"
-#~ msgstr "InfiniBand-forbindelsen \"%s\" er aktiv"
+#~ msgstr "InfiniBand-forbindelsen “%s” er aktiv"
 
 #~ msgid "You are now connected to the teamed network."
 #~ msgstr "Du er nu tilsluttet gruppenetværket."
 
 #~ msgid "Preparing team connection '%s'..."
-#~ msgstr "Forbereder gruppeforbindelsen \"%s\"..."
+#~ msgstr "Forbereder gruppeforbindelsen “%s” …"
 
 #~ msgid "Configuring team connection '%s'..."
-#~ msgstr "Konfigurerer gruppeforbindelsen \"%s\"..."
+#~ msgstr "Konfigurerer gruppeforbindelsen “%s” …"
 
 #~ msgid "User authentication required for team connection '%s'..."
-#~ msgstr "Der kræves brugergodkendelse til gruppeforbindelsen \"%s\"..."
+#~ msgstr "Der kræves brugergodkendelse til gruppeforbindelsen “%s” …"
 
 #~ msgid "Team connection '%s' active"
-#~ msgstr "Gruppeforbindelsen \"%s\" er aktiv"
+#~ msgstr "Gruppeforbindelsen “%s” er aktiv"
 
 #~ msgid "You are now connected to the VLAN."
 #~ msgstr "Du er nu tilsluttet VLAN'et."
 
 #~ msgid "Preparing VLAN connection '%s'..."
-#~ msgstr "Forbereder VLAN-forbindelsen \"%s\"..."
+#~ msgstr "Forbereder VLAN-forbindelsen “%s” …"
 
 #~ msgid "Configuring VLAN connection '%s'..."
-#~ msgstr "Konfigurerer VLAN-forbindelsen \"%s\"..."
+#~ msgstr "Konfigurerer VLAN-forbindelsen “%s” …"
 
 #~ msgid "User authentication required for VLAN connection '%s'..."
-#~ msgstr "Der kræves brugergodkendelse til VLAN-forbindelsen \"%s\"..."
+#~ msgstr "Der kræves brugergodkendelse til VLAN-forbindelsen “%s” …"
 
 #~ msgid "VLAN connection '%s' active"
-#~ msgstr "VLAN-forbindelsen \"%s\" er aktiv"
+#~ msgstr "VLAN-forbindelsen “%s” er aktiv"
 
 #~ msgid "WiMAX Mobile Broadband (%s)"
 #~ msgstr "WiMAX mobilt bredbånd (%s)"
@@ -5011,7 +5284,7 @@
 #~ msgstr "Brug kun 4G (LTE)"
 
 #~ msgid "I_mport team configuration from a file..."
-#~ msgstr "I_mportér gruppeopsætning fra en fil..."
+#~ msgstr "I_mportér gruppeopsætning fra en fil …"
 
 #~ msgid "Infrastructure"
 #~ msgstr "Infrastruktur"
@@ -5023,13 +5296,7 @@
 #~ msgstr "Fejl da forbindelsen blev gemt"
 
 #~ msgid "The property '%s' / '%s' is invalid: %d"
-#~ msgstr "Egenskaben \"%s\" / \"%s\" er ugyldig: %d"
-
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Kunne ikke indlæse brugergrænseflade til WiMAX."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX-forbindelse %d"
+#~ msgstr "Egenskaben “%s” / “%s” er ugyldig: %d"
 
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
@@ -5082,7 +5349,7 @@
 #~ msgstr "tidsudløb for søgning efter telefondetaljer."
 
 #~ msgid "Detecting phone configuration..."
-#~ msgstr "Opdagelse af telefon-konfiguration..."
+#~ msgstr "Opdagelse af telefon-konfiguration …"
 
 #~ msgid ""
 #~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
@@ -5110,13 +5377,13 @@
 #~ msgstr "Ternær DNS:"
 
 #~ msgid "_Save..."
-#~ msgstr "_Gem..."
+#~ msgstr "_Gem …"
 
 #~ msgid "_Edit..."
-#~ msgstr "_Redigér..."
+#~ msgstr "_Redigér …"
 
 #~ msgid "_Delete..."
-#~ msgstr "_Slet..."
+#~ msgstr "_Slet …"
 
 #~ msgid "ModemManager is not running"
 #~ msgstr "ModemManager kører ikke"
@@ -5166,16 +5433,16 @@
 #~ msgstr "trådløst er deaktiveret af hardwareknap"
 
 #~ msgid "Preparing wireless network connection '%s'..."
-#~ msgstr "Forbereder trådløs netværksforbindelse \"%s\"…"
+#~ msgstr "Forbereder trådløs netværksforbindelse “%s” …"
 
 #~ msgid "Configuring wireless network connection '%s'..."
-#~ msgstr "Konfigurerer trådløs netværksforbindelse \"%s\"…"
+#~ msgstr "Konfigurerer trådløs netværksforbindelse “%s” …"
 
 #~ msgid "Requesting a wireless network address for '%s'..."
-#~ msgstr "Anmoder om en trådløs netværksadresse for \"%s\"…"
+#~ msgstr "Anmoder om en trådløs netværksadresse for “%s” …"
 
 #~ msgid "Wireless network connection '%s' active"
-#~ msgstr "Trådløs netværksforbindelse \"%s\" er aktiv"
+#~ msgstr "Trådløs netværksforbindelse “%s” er aktiv"
 
 #~ msgid "Could not load Wired Security security user interface."
 #~ msgstr "Kunne ikke indlæse brugerflade for kablet sikkerhed."
@@ -5186,9 +5453,6 @@
 #~ msgid "Wireless connection %d"
 #~ msgstr "Trådløs forbindelse %d"
 
-#~ msgid "_Import"
-#~ msgstr "_Importér"
-
 #~ msgid "An unknown error occurred."
 #~ msgstr "Der opstod en ukendt fejl."
 
@@ -5204,7 +5468,7 @@
 #~ "denne knap."
 
 #~ msgid "Don't know how to edit '%s' connections"
-#~ msgstr "Ved ikke, hvordan man redigerer \"%s\"-forbindelser"
+#~ msgstr "Ved ikke, hvordan man redigerer “%s”-forbindelser"
 
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr ""
diff -Nru network-manager-applet-1.8.4/po/de.po network-manager-applet-1.8.10/po/de.po
--- network-manager-applet-1.8.4/po/de.po	2017-05-10 10:44:54.000000000 +0000
+++ network-manager-applet-1.8.10/po/de.po	2017-12-19 11:44:30.000000000 +0000
@@ -17,23 +17,23 @@
 # Hedda Peters , 2012.
 # Christian Kirbach , 2009-2013, 2013.
 # Bernd Homuth , 2015.
-#
+# lrintel , 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-applet master\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
-"PO-Revision-Date: 2017-03-28 22:08+0200\n"
-"Last-Translator: Mario Blättermann \n"
+"POT-Creation-Date: 2017-12-12 11:18+0100\n"
+"PO-Revision-Date: 2017-11-07 06:45+0000\n"
+"Last-Translator: Copied by Zanata \n"
 "Language-Team: Deutsch \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.12\n"
+"X-Generator: Zanata 4.3.2\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
 msgstr "Netzwerk"
 
@@ -42,7 +42,7 @@
 msgstr "Verwaltung der Netzwerkverbindungen"
 
 #: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: ../src/connection-editor/nm-connection-list.ui.h:1
 msgid "Network Connections"
 msgstr "Netzwerkverbindungen"
 
@@ -173,17 +173,17 @@
 msgid "The NetworkManager Developers"
 msgstr "Die NetworkManager-Entwickler"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "Objektklasse »%s« hat keine Eigenschaft namens »%s«"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr " Eigenschaft »%s« von Objektklasse »%s« ist nicht schreibbar"
+msgstr "Eigenschaft »%s« von Objektklasse »%s« ist nicht schreibbar"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -191,20 +191,20 @@
 "Konstruktor-Eigenschaft »%s« für Objekt »%s« kann nicht nach der "
 "Konstruktion gesetzt werden"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "»%s::%s« ist ein ungültiger Eigenschaftsname. »%s« ist kein GObject-Untertyp"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "Eigenschaft »%s« des Typs »%s« von Wert des Typs »%s« kann nicht gesetzt "
 "werden"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -213,22 +213,35 @@
 "Wert »%s« des Typs »%s« ist ungültig oder nicht im Wertebereich für "
 "Eigenschaft »%s« des Typs »%s«"
 
-#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-Legitimierung"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1
+#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
+#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
 #: ../src/connection-editor/ce-new-connection.ui.h:1
 #: ../src/connection-editor/ce-page-dcb.ui.h:17
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/connection-editor/connection-helpers.c:308
+#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/page-bluetooth.c:311
+#: ../src/connection-editor/page-mobile.c:543
+#: ../src/connection-editor/page-proxy.c:121
+#: ../src/connection-editor/page-team.c:344
+#: ../src/connection-editor/page-team-port.c:206
+#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
+#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/libnma/nma-vpn-password-dialog.c:209
+#: ../src/libnma/nma-wifi-dialog.c:1066
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
-#: ../src/8021x.ui.h:3
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Verbinden"
 
@@ -244,39 +257,37 @@
 msgid "secure."
 msgstr "sicher."
 
-#: ../src/applet.c:381
+#: ../src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Hinzufügen/Aktivierung der Verbindung schlug fehl"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../src/applet.c:435
+#: ../src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Trennen des Gerätes schlug fehl"
 
-#: ../src/applet.c:440
+#: ../src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Trennen schlug fehl"
 
-#
-#: ../src/applet.c:470
+#: ../src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Aktivierung der Verbindung fehlgeschlagen"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Diesen Hinweis nicht mehr anzeigen"
 
-#: ../src/applet.c:883
+#: ../src/applet.c:899
 #, c-format
 msgid ""
 "\n"
@@ -287,7 +298,7 @@
 "Die VPN-Verbindung »%s« wurde getrennt, weil die Netzwerkverbindung getrennt "
 "wurde."
 
-#: ../src/applet.c:885
+#: ../src/applet.c:901
 #, c-format
 msgid ""
 "\n"
@@ -298,7 +309,7 @@
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil die "
 "Netzwerkverbindung getrennt wurde."
 
-#: ../src/applet.c:887
+#: ../src/applet.c:903
 #, c-format
 msgid ""
 "\n"
@@ -308,7 +319,7 @@
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil der VPN-Dienst "
 "unerwartet beendet wurde."
 
-#: ../src/applet.c:889
+#: ../src/applet.c:905
 #, c-format
 msgid ""
 "\n"
@@ -319,7 +330,7 @@
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil der VPN-Server "
 "keine geeignete Netzwerkkonfiguration lieferte."
 
-#: ../src/applet.c:891
+#: ../src/applet.c:907
 #, c-format
 msgid ""
 "\n"
@@ -329,7 +340,7 @@
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil die "
 "Netzwerkverbindung eine Zeitüberschreitung verursacht hat."
 
-#: ../src/applet.c:893
+#: ../src/applet.c:909
 #, c-format
 msgid ""
 "\n"
@@ -339,7 +350,7 @@
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil der VPN-Dienst "
 "nicht in der vorgesehenen Zeit gestartet wurde."
 
-#: ../src/applet.c:895
+#: ../src/applet.c:911
 #, c-format
 msgid ""
 "\n"
@@ -349,7 +360,7 @@
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil der Start des "
 "VPN-Dienstes fehlgeschlagen ist."
 
-#: ../src/applet.c:897
+#: ../src/applet.c:913
 #, c-format
 msgid ""
 "\n"
@@ -359,7 +370,7 @@
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil keine gültigen "
 "VPN-Geheimnisse vorliegen."
 
-#: ../src/applet.c:899
+#: ../src/applet.c:915
 #, c-format
 msgid ""
 "\n"
@@ -369,7 +380,7 @@
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil VPN-"
 "Geheimnisse ungültig sind."
 
-#: ../src/applet.c:904
+#: ../src/applet.c:920
 #, c-format
 msgid ""
 "\n"
@@ -378,7 +389,7 @@
 "\n"
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden."
 
-#: ../src/applet.c:931
+#: ../src/applet.c:947
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -389,20 +400,19 @@
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: ../src/applet.c:949
 msgid "VPN connection has been successfully established.\n"
 msgstr "Die VPN-Verbindung wurde erfolgreich eingerichtet.\n"
 
-#: ../src/applet.c:935
+#: ../src/applet.c:951
 msgid "VPN Login Message"
 msgstr "VPN-Anmeldemitteilung"
 
-#
-#: ../src/applet.c:943 ../src/applet.c:983
+#: ../src/applet.c:959 ../src/applet.c:999
 msgid "VPN Connection Failed"
 msgstr "VPN-Verbindung fehlgeschlagen"
 
-#: ../src/applet.c:987
+#: ../src/applet.c:1003
 #, c-format
 msgid ""
 "\n"
@@ -416,7 +426,7 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: ../src/applet.c:1006
 #, c-format
 msgid ""
 "\n"
@@ -429,144 +439,144 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: ../src/applet.c:1295
 msgid "device not ready (firmware missing)"
 msgstr "Gerät ist nicht betriebsbereit (Firmware fehlt)"
 
-#: ../src/applet.c:1281
+#: ../src/applet.c:1297
 msgid "device not ready"
 msgstr "Gerät ist nicht betriebsbereit"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "nicht verbunden"
 
-#: ../src/applet.c:1307
+#: ../src/applet.c:1323
 msgid "Disconnect"
 msgstr "Verbindung trennen"
 
-#: ../src/applet.c:1321
+#: ../src/applet.c:1337
 msgid "device not managed"
 msgstr "Gerät wird nicht verwaltet"
 
-#: ../src/applet.c:1394
+#: ../src/applet.c:1410
 msgid "No network devices available"
 msgstr "Es sind keine Netzwerkgeräte verfügbar"
 
-#: ../src/applet.c:1448
+#: ../src/applet.c:1464
 msgid "_VPN Connections"
 msgstr "_VPN-Verbindungen"
 
-#: ../src/applet.c:1492
+#: ../src/applet.c:1508
 msgid "_Configure VPN…"
 msgstr "VPN _konfigurieren …"
 
-#: ../src/applet.c:1495
+#: ../src/applet.c:1511
 msgid "_Add a VPN connection…"
 msgstr "Eine VPN-Verbindung _hinzufügen …"
 
-#: ../src/applet.c:1601
+#: ../src/applet.c:1617
 msgid "NetworkManager is not running…"
 msgstr "Der Netzwerk-Manager läuft zur Zeit nicht …"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: ../src/applet.c:1622 ../src/applet.c:2687
 msgid "Networking disabled"
 msgstr "Netzwerk deaktiviert"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: ../src/applet.c:1832
 msgid "Enable _Networking"
 msgstr "_Netzwerk aktivieren"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: ../src/applet.c:1841
 msgid "Enable _Wi-Fi"
 msgstr "_Funknetzwerk aktivieren"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: ../src/applet.c:1850
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobiles Breitband aktivieren"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: ../src/applet.c:1862
 msgid "Enable N_otifications"
 msgstr "_Benachrichtigungen aktivieren"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: ../src/applet.c:1874
 msgid "Connection _Information"
 msgstr "Verbindungs_informationen"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: ../src/applet.c:1882
 msgid "Edit Connections…"
 msgstr "Verbindungen bearbeiten …"
 
-#: ../src/applet.c:1880
+#: ../src/applet.c:1896
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/applet.c:2191
+#: ../src/applet.c:2207
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Sie sind nun mit »%s« verbunden."
 
-#: ../src/applet.c:2231
+#: ../src/applet.c:2247
 msgid "Disconnected"
 msgstr "Verbindung getrennt"
 
-#: ../src/applet.c:2232
+#: ../src/applet.c:2248
 msgid "The network connection has been disconnected."
 msgstr "Die Netzwerkverbindung wurde getrennt."
 
-#: ../src/applet.c:2534
+#: ../src/applet.c:2550
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Netzwerkverbindung »%s« wird vorbereitet …"
 
-#: ../src/applet.c:2537
+#: ../src/applet.c:2553
 #, c-format
 msgid "User authentication required for network connection “%s”…"
-msgstr "Benutzerlegitimierung ist erforderlich für Netzwerkverbindung »%s«"
+msgstr "Benutzerlegitimierung ist erforderlich für Netzwerkverbindung »%s« …"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Netzwerkadresse für »%s« wird angefordert …"
 
-#: ../src/applet.c:2543
+#: ../src/applet.c:2559
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Netzwerkverbindung »%s« ist aktiv"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2632
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN-Verbindung »%s« wird gestartet …"
 
-#: ../src/applet.c:2619
+#: ../src/applet.c:2635
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Benutzerlegitimierung ist erforderlich für VPN-Verbindung »%s« …"
 
-#: ../src/applet.c:2622
+#: ../src/applet.c:2638
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Anfordern einer Netzwerkadresse von VPN-Verbindung »%s« …"
 
-#: ../src/applet.c:2625
+#: ../src/applet.c:2641
 #, c-format
 msgid "VPN connection active"
 msgstr "VPN-Verbindung ist aktiv"
 
-#: ../src/applet.c:2675
+#: ../src/applet.c:2691
 msgid "No network connection"
 msgstr "Keine Netzwerkverbindung"
 
-#: ../src/applet.c:3276
+#: ../src/applet.c:3292
 msgid "NetworkManager Applet"
 msgstr "Netzwerk-Manager-Applet"
 
@@ -583,46 +593,46 @@
 msgid "Sending unlock code…"
 msgstr "Code zum Entsperren wird gesendet …"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobiles Breitband (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/applet-device-broadband.c:739
+#: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobiles Breitband"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Verfügbar"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 msgid "New Mobile Broadband connection…"
 msgstr "Neue mobile Breitbandverbindung …"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Verbindung hergestellt"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Sie sind nun mit dem mobilen Breitbandnetzwerk verbunden."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "Mobiles Breitbandnetzwerk."
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "Sie sind nun im Heimnetzwerk angemeldet."
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "Sie sind nun in einem Roaming-Netzwerk angemeldet."
 
@@ -630,23 +640,23 @@
 msgid "You are now connected to the mobile broadband network."
 msgstr "Sie sind nun mit dem mobilen Breitbandnetzwerk verbunden."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Mobile Breitbandverbindung »%s« wird vorbereitet …"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Mobile Breitbandverbindung »%s« wird konfiguriert …"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Benutzerlegitimierung ist erforderlich für mobile Breitbandverbindung »%s« …"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobile Breitbandverbindung »%s« ist aktiv"
@@ -707,6 +717,18 @@
 msgid "DSL authentication"
 msgstr "DSL-Legitimierung"
 
+#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/page-bluetooth.c:313
+#: ../src/connection-editor/page-mobile.c:545
+#: ../src/libnma/nma-vpn-password-dialog.c:210
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+msgid "_OK"
+msgstr "_OK"
+
 #: ../src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Mit einem _verborgenen Funknetzwerk verbinden …"
@@ -719,7 +741,7 @@
 msgid "(none)"
 msgstr "(keine)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Hinzufügen einer neuen Verbindung schlug fehl"
 
@@ -727,79 +749,79 @@
 msgid "Insufficient privileges."
 msgstr "Unzureichende Berechtigungen."
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Funknetzwerke (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Funknetzwerk (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Funknetzwerk"
 msgstr[1] "Funknetzwerke"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Funknetzwerk ist deaktiviert"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Funknetzwerk wurde durch Schalter deaktiviert"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Weitere Netzwerke"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Funknetzwerke sind verfügbar"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr ""
 "Verwenden Sie das Netzwerkmenü, um sich mit einem Funknetzwerk zu verbinden"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Sie sind nun mit dem Funknetzwerk »%s« verbunden."
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Funknetzwerkverbindung »%s« wird vorbereitet …"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Funknetzwerkverbindung »%s« wird konfiguriert …"
 
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Benutzerlegitimierung ist erforderlich für Funknetzwerk »%s« …"
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Funknetzwerkadresse für »%s« wird angefordert …"
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Funknetzwerkverbindung mit »%s« ist aktiv: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Funknetzwerkverbindung »%s« ist aktiv"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Aktivierung der Verbindung schlug fehl"
 
@@ -807,195 +829,201 @@
 msgid "Error displaying connection information:"
 msgstr "Die Verbindungsinformationen konnten nicht angezeigt werden:"
 
-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
 #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: ../src/applet-dialogs.c:75
 msgid "Dynamic WEP"
 msgstr "Dynamisches WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:231
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: ../src/applet-dialogs.c:152
 msgid "More addresses"
 msgstr "Weitere Adressen"
 
-#: ../src/applet-dialogs.c:226
+#: ../src/applet-dialogs.c:227
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
+#: ../src/connection-editor/page-wifi-security.c:332
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:261
 #, c-format
 msgid "%s (default)"
 msgstr "%s (Vorgabe)"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
 msgid "IP Address:"
 msgstr "IP-Adresse:"
 
-#: ../src/applet-dialogs.c:369
+#: ../src/applet-dialogs.c:370
 msgid "Broadcast Address:"
 msgstr "Broadcast-Adresse:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: ../src/applet-dialogs.c:382
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:383
 msgid "Subnet Mask:"
 msgstr "Subnetz-Maske:"
 
-#: ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:493
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:496
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: ../src/applet-dialogs.c:503
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: ../src/applet-dialogs.c:505
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
 #: ../src/connection-editor/ce-page-team-port.ui.h:23
 #: ../src/connection-editor/ce-page-team.ui.h:48
 #: ../src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Allgemein"
 
-#: ../src/applet-dialogs.c:516
+#: ../src/applet-dialogs.c:517
 msgid "Interface:"
 msgstr "Schnittstelle:"
 
-#: ../src/applet-dialogs.c:536
+#: ../src/applet-dialogs.c:537
 msgid "Hardware Address:"
 msgstr "Hardware-Adresse:"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:551
 msgid "Driver:"
 msgstr "Treiber:"
 
-#: ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:586
 msgid "Speed:"
 msgstr "Geschwindigkeit:"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:601
 msgid "Security:"
 msgstr "Sicherheit:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
 #: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
 msgid "Default Route:"
 msgstr "Vorgaberoute:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
 #: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:816
 msgid "VPN Type:"
 msgstr "VPN-Typ:"
 
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:823
 msgid "VPN Gateway:"
 msgstr "VPN-Gateway:"
 
-#: ../src/applet-dialogs.c:828
+#: ../src/applet-dialogs.c:829
 msgid "VPN Username:"
 msgstr "VPN-Benutzername:"
 
-#: ../src/applet-dialogs.c:834
+#: ../src/applet-dialogs.c:835
 msgid "VPN Banner:"
 msgstr "VPN-Banner:"
 
-#: ../src/applet-dialogs.c:840
+#: ../src/applet-dialogs.c:841
 msgid "Base Connection:"
 msgstr "Zugordnete Verbindung:"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: ../src/applet-dialogs.c:958
 msgid "No valid active connections found!"
 msgstr "Keine aktiven Netzwerkverbindungen gefunden!"
 
-#: ../src/applet-dialogs.c:985
+#: ../src/applet-dialogs.c:1007
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "und viele andere Mitwirkende und Übersetzer"
 
-#: ../src/applet-dialogs.c:988
+#: ../src/applet-dialogs.c:1010
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Ein Applet für das Benachrichtigungsfeld, mit dem Sie Ihre Netzwerkgeräte "
 "und Netzwerkverbindungen verwalten können."
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1012
 msgid "NetworkManager Website"
 msgstr "Netzwerk-Manager-Website"
 
-#: ../src/applet-dialogs.c:1001
+#: ../src/applet-dialogs.c:1016
+msgid "translator-credits"
+msgstr ""
+"Mario Blättermann , 2009, 2016, 2017\n"
+"Christian Kirbach , 2014, 2016, 2017"
+
+#: ../src/applet-dialogs.c:1026
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1003,33 +1031,33 @@
 "Das Netzwerk-Manager-Applet konnte benötigte Ressourcen nicht finden (Die ."
 "ui-Datei wurde nicht gefunden)."
 
-#: ../src/applet-dialogs.c:1006
+#: ../src/applet-dialogs.c:1031
 msgid "Missing resources"
 msgstr "Fehlende Ressourcen"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1057
 msgid "Mobile broadband network password"
 msgstr "Passwort der mobilen Breitbandverbindung"
 
-#: ../src/applet-dialogs.c:1040
+#: ../src/applet-dialogs.c:1066
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Es wird ein Passwort benötigt, um sich mit »%s« zu verbinden."
 
-#: ../src/applet-dialogs.c:1055
+#: ../src/applet-dialogs.c:1081
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1363
 msgid "SIM PIN unlock required"
 msgstr "Entsperren der SIM-Karte mittels PIN-Code erforderlich"
 
-#: ../src/applet-dialogs.c:1338
+#: ../src/applet-dialogs.c:1364
 msgid "SIM PIN Unlock Required"
 msgstr "Entsperren der SIM-Karte mittels PIN-Code erforderlich"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1366
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1038,25 +1066,25 @@
 "Das mobile Breitband-Gerät »%s« erfordert vor Verwendung eine SIM-PIN-Nummer."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1368
 msgid "PIN code:"
 msgstr "PIN-Code:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1372
 msgid "Show PIN code"
 msgstr "PIN-Code anzeigen"
 
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1374
 msgid "SIM PUK unlock required"
 msgstr "Entsperren der SIM-Karte mittels PUK-Code erforderlich"
 
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1375
 msgid "SIM PUK Unlock Required"
 msgstr "Entsperren der SIM-Karte mittels PUK-Code erforderlich"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: ../src/applet-dialogs.c:1377
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1065,31 +1093,38 @@
 "Das mobile Breitband-Gerät »%s« erfordert vor Verwendung einen SIM-PUK-Code."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1379
 msgid "PUK code:"
 msgstr "PUK-Code:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: ../src/applet-dialogs.c:1382
 msgid "New PIN code:"
 msgstr "Neuer PIN-Code:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: ../src/applet-dialogs.c:1384
 msgid "Re-enter new PIN code:"
 msgstr "Geben Sie den neuen PIN-Code erneut ein:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: ../src/applet-dialogs.c:1389
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK-Codes anzeigen"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
-msgstr "_OK"
+#: ../src/applet-vpn-request.c:201
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Verbindung kann nicht gelöscht werden"
+
+#: ../src/applet-vpn-request.c:251
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Aktivierung der Verbindung schlug fehl"
+
+#: ../src/applet-vpn-request.c:259
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
@@ -1106,21 +1141,21 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
 msgstr "_Hinzufügen"
 
-#. Delete
 #: ../src/connection-editor/ce-ip4-routes.ui.h:5
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/nm-connection-list.c:711
+#: ../src/connection-editor/connection-helpers.c:772
+#: ../src/connection-editor/nm-connection-list.ui.h:4
 msgid "_Delete"
 msgstr "_Löschen"
 
@@ -1211,11 +1246,10 @@
 msgid "M_ode:"
 msgstr "M_odus:"
 
-#. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: ../src/connection-editor/nm-connection-list.ui.h:5
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
@@ -1247,7 +1281,7 @@
 "checking the link status."
 msgstr ""
 "Eine IP-Adresse oder eine durch Kommata getrennte Liste von IP-Adressen, "
-"nach denen gesucht wird, wenn der Verbindungsstatus geprüft wird"
+"nach denen gesucht wird, wenn der Verbindungsstatus geprüft wird."
 
 #: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
@@ -1271,7 +1305,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 #: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
@@ -1280,7 +1314,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-infiniband.ui.h:7
 #: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
@@ -1318,26 +1352,75 @@
 msgstr "_Hello-Zeitintervall:"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "STP forwarding delay, in seconds"
+msgstr "STP-Weiterleitungsverzögerung in Sekunden"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "s"
 msgstr "s"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "STP hello time, in seconds"
+msgstr "STP-Hello-Zeit in Sekunden"
+
 # http://netzikon.net/lexikon/i/igmp-snooping.html
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "Enable I_GMP snooping"
 msgstr "I_GMP-Schnüffeln aktivieren"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:14
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_STP aktivieren (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:15
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+"Legt fest, ob das Spanning Tree Protocol (STP) für diese Bridge aktiviert "
+"sein soll"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#, fuzzy
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr "STP-Priorität für diese Bridge. Niedrigere Werte sind »besser«; "
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:17
 msgid "_Max age:"
 msgstr "_Höchstzulässiges Alter:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:18
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:19
 msgid "_Aging time:"
 msgstr "_Alterungszeit:"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:20
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr "Die Lebensdauer der Ethernet MAC-Adresse in Sekunden"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:21
+msgid "Group _forward mask:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:22
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
 #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "Automatisch"
@@ -1599,10 +1682,20 @@
 msgstr "Ben_utzername:"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "Username used to authenticate with the PPPoE service."
+msgstr "Zur Legitimierung am PPPoE-Dienst verwendeter Benutzername."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
 msgid "_Service:"
 msgstr "_Dienst:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:5
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 #: ../src/wireless-security/ws-leap.ui.h:3
@@ -1610,7 +1703,11 @@
 msgid "Sho_w password"
 msgstr "Passwort _anzeigen"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-dsl.ui.h:6
+msgid "Password used to authenticate with the PPPoE service."
+msgstr "Zur Legitimierung am PPPoE-Dienst verwendetes Passwort."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:7
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
 #: ../src/libnma/nma-vpn-password-dialog.c:97
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
@@ -1621,13 +1718,31 @@
 msgid "_Password:"
 msgstr "_Passwort:"
 
+#: ../src/connection-editor/ce-page-dsl.ui.h:8
+msgid "PPP _interface:"
+msgstr "PPP-Schn_ittstelle:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:9
+msgid "P_arent interface:"
+msgstr "Ü_bergeordnete Schnittstelle:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:10
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+"Ein willkürlich gewählter Name, der der neu erstellten PPP-Schnittstelle "
+"zugeordnet wird."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:11
+msgid "The interface on which the PPP connection will be established."
+msgstr "Die Schnittstelle, über die die PPP-Verbindung aufgebaut wird."
+
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "Automatisch"
@@ -1673,7 +1788,7 @@
 msgstr "Voll"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "Ignorieren"
 
@@ -1681,7 +1796,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "Manuell"
 
@@ -1690,7 +1805,7 @@
 msgstr "_Port:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
 msgid "_Device:"
 msgstr "_Gerät:"
@@ -1757,6 +1872,9 @@
 "will be forced without checking the device compatibility. If unsure, leave "
 "here “Ignore” or pick “Automatic”."
 msgstr ""
+"Geräte-Verbindungsaushandlung. Wenn »Manual« gewählt wird, werden »Speed«- "
+"und »Duplex«-Werte erzwungen, ohne die Gerätekompatibilität zu prüfen. Im "
+"Zweifelsfall die Einstellung auf »Ignore« belassen oder »Automatic« wählen."
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:32
 msgid "_Speed:"
@@ -1768,6 +1886,10 @@
 "“Automatic” options are not selected. Before specifying a speed value be "
 "sure your device supports it."
 msgstr ""
+"Geschwindigkeitswert für statische Verbindungsaushandlungen. Nur notwendig, "
+"wenn die »Ignore«- und »Automatic«-Optionen nicht gewählt wurden. Vor dem "
+"Setzen eines Geschwindigkeitswerts sollte geprüft werden, dass das Gerät "
+"diese Einstellung unterstützt."
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:34
 msgid "Duple_x:"
@@ -1779,6 +1901,10 @@
 "“Automatic” options are not selected. Before specifying a duplex mode be "
 "sure your device supports it."
 msgstr ""
+"Duplex-Wert für statische Verbindungsaushandlungen. Nur notwendig, wenn die "
+"»Ignore«- und »Automatic«-Optionen nicht gewählt wurden. Vor dem Setzen "
+"eines Duplex-Modus sollte geprüft werden, dass das Gerät diese Einstellung "
+"unterstützt."
 
 #: ../src/connection-editor/ce-page-general.ui.h:1
 msgid "Automatically connect to _VPN when using this connection"
@@ -1843,20 +1969,20 @@
 msgid "Address (optional)"
 msgstr "Adresse (optional)"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "Über_tragungsmodus:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
 msgid "Datagram"
 msgstr "Datagramm"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
 msgid "Connected"
 msgstr "Verbunden"
 
+#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+msgid "_Transport mode:"
+msgstr "Über_tragungsmodus:"
+
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
 msgid "IPIP"
 msgstr "IPIP"
@@ -1894,36 +2020,39 @@
 msgstr "VTI6"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-msgid "Device name"
-msgstr "Gerätename"
+#: ../src/connection-editor/ce-page-macsec.ui.h:6
+msgid "Device name:"
+msgstr "Gerätename:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-msgid "Parent device"
-msgstr "Übergeordnetes Gerät"
+#: ../src/connection-editor/ce-page-macsec.ui.h:8
+msgid "Parent device:"
+msgstr "Übergeordnetes Gerät:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-msgid "Mode"
-msgstr "Modus"
+#: ../src/connection-editor/ce-page-macsec.ui.h:16
+msgid "Mode:"
+msgstr "Modus:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP"
-msgstr "Lokale IP"
+msgid "Local IP:"
+msgstr "Lokale IP:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP"
-msgstr "Entfernte IP"
+msgid "Remote IP:"
+msgstr "Entfernte IP:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key"
-msgstr "Eingabeschlüssel"
+msgid "Input key:"
+msgstr "Eingabeschlüssel:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key"
-msgstr "Ausgabeschlüssel"
+msgid "Output key:"
+msgstr "Ausgabeschlüssel:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-msgid "MTU"
-msgstr "MTU"
+msgid "MTU:"
+msgstr "Größtmögliches Datenpaket:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1938,12 +2067,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "Gemeinsam mit anderen Rechnern"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "_Methode:"
 
@@ -1958,7 +2087,7 @@
 "ein, wenn Sie ihn verwenden möchten."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1971,16 +2100,16 @@
 msgstr "D_HCP Client-Kennung:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "_Suchdomänen:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "_DNS-Server:"
 
@@ -2006,11 +2135,12 @@
 "Konfiguration dagegen erfolgreich ist."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "_Routen …"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-macsec.ui.h:3
 #: ../src/connection-editor/page-ip4.c:198
 msgid "Disabled"
 msgstr "Deaktiviert"
@@ -2023,7 +2153,15 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "Aktivieren (temporäre Adresse bevorzugen)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Stable privacy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -2034,15 +2172,19 @@
 "Adressen. Link-lokal-Adressen werden automatisch zur entsprechenden "
 "Schnittstelle weitergeleitet."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
-msgstr "IPv6 Erweiterungen zum Schutz der _Privatsphäre"
+msgstr "IPv6 Erweiterungen zum Schutz der _Privatsphäre:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "IPv_6-Adressierung zur Fertigstellung dieser Verbindung erforderlich"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2051,6 +2193,96 @@
 "einer Verbindung, falls die IPv6-Konfiguration fehlschlägt, die IPv4-"
 "Konfiguration dagegen erfolgreich ist."
 
+#: ../src/connection-editor/ce-page-macsec.ui.h:1
+msgid "PSK"
+msgstr "PSK"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:2
+#: ../src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+# prüfen oder Ankreuzen? -ck
+# Ich denke Überprüfen. -mb
+#: ../src/connection-editor/ce-page-macsec.ui.h:4
+msgid "Check"
+msgstr "Überprüfen"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:5
+msgid "Strict"
+msgstr "Streng"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:7
+msgid "The name of the MACsec device."
+msgstr "Der Name des MACsec-Geräts."
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:9
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:10
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:11
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:12
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:13
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:14
+msgid "CKN:"
+msgstr "CKN:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:15
+msgid "CAK:"
+msgstr "CAK:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:17
+msgid "Keys:"
+msgstr "Schlüssel:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:18
+msgid "Parameters:"
+msgstr "Parameter:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:19
+msgid "Validation:"
+msgstr "Überprüfung:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:20
+msgid "SCI port:"
+msgstr "SCI-Port:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:21
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:22
+msgid "Encrypt"
+msgstr "Verschlüsseln"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:23
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr "Legt fest, ob der übertragene Datenverkehr verschlüsselt sein muss"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:24
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr "Die Port-Komponente des SCI (Secure Channel Identifier)"
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:26
 msgid "Basic"
@@ -2137,38 +2369,38 @@
 msgstr "PPP-_Echopakete senden"
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:1
-msgid "Method:"
-msgstr "Methode:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-team.ui.h:25
 msgid "None"
 msgstr "Keine"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: ../src/connection-editor/ce-page-proxy.ui.h:3
 msgid "For browser only"
 msgstr "Nur Browser"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: ../src/connection-editor/ce-page-proxy.ui.h:4
 msgid "Use this proxy configuration for only browser clients/schemes."
-msgstr ""
+msgstr "Verwenden Sie diese Proxy-Einstellung nur für Browser."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: ../src/connection-editor/ce-page-proxy.ui.h:5
 msgid "PAC URL:"
 msgstr "PAC-Adresse:"
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:6
+msgid "PAC script:"
+msgstr "PAC-Skript:"
+
 #: ../src/connection-editor/ce-page-proxy.ui.h:7
 msgid "URL from where the PAC script is to be obtained."
 msgstr "Adresse, von der das PAC-Skript bezogen wird."
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
-msgstr "PAC-Skript:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
 msgid "Import script from a file…"
 msgstr "Skript aus Datei importieren …"
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:9
+msgid "Method:"
+msgstr "Methode:"
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:19
 msgid "Ad_vanced…"
@@ -2215,23 +2447,14 @@
 "Kennung der Warteschlange, auf welche dieser Port abgebildet werden soll."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
-msgstr "Port-_Priorität:"
+msgid "Active-Backup runner options"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
-msgstr ""
+msgid "_Port priority:"
+msgstr "Port-_Priorität:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:82
-msgid ""
-"Validate received ARP packets on active ports. If this is not checked, all "
-"incoming ARP packets will be considered as a good reply."
-msgstr ""
-"Auf aktiven Ports erhaltene ARP-Pakete prüfen. Falls nicht angewählt, werden "
-"alle eingehenden ARP-Pakete als valide Antwort eingestuft."
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:44
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
@@ -2240,31 +2463,44 @@
 "Der Wert ist eine positive Zahl in Millisekunden, die einen Intervall "
 "zwischen Bursts von Notify-Peer-Paketen angibt."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
 msgid "Port priority. The higher number means higher priority."
 msgstr ""
 "Port-Priorität, wobei eine größere Zahl für eine höhere Priorität steht."
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port _sticky"
+msgstr "_Klebriger Port"
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:15
-msgid "Active-Backup runner options"
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
 msgstr ""
+"Auf aktiven Ports erhaltene ARP-Pakete prüfen. Falls nicht angewählt, werden "
+"alle eingehenden ARP-Pakete als valide Antwort eingestuft."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:16
+msgid "LACP runner options"
+msgstr "Optionen für LACP-Runner"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
 msgid "_LACP port priority:"
 msgstr "_LACP-Port-Priorität:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
 msgid "LACP port _key:"
 msgstr "LACP-Port-_Schlüssel:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
 #: ../src/connection-editor/ce-page-team.ui.h:43
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
@@ -2272,7 +2508,7 @@
 "Port-Priorität entsprechend dem LACP-Standard, wobei eine kleinere Zahl eine "
 "höhere Priorität bedeutet."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
 #: ../src/connection-editor/ce-page-team.ui.h:45
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
@@ -2281,7 +2517,7 @@
 "Wert ist eine positive Zahl in Millisekunden. Legt ein Intervall fest "
 "zwischen Bursts von Multicast group-rejoin-Anfragen."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
@@ -2289,10 +2525,6 @@
 "Portschlüssel nach dem LACP-Standard. Es ist nur möglich Ports mit dem "
 "gleichen Schlüssel zu aggregieren."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
-msgid "LACP runner options"
-msgstr ""
-
 #: ../src/connection-editor/ce-page-team-port.ui.h:24
 #: ../src/connection-editor/ce-page-team.ui.h:70
 msgid "_Link watcher:"
@@ -2398,12 +2630,16 @@
 msgid ""
 "The delay between the link coming up and the runner being notified about it."
 msgstr ""
+"Die Verzögerung zwischen der Aktivierung des Links und der Benachrichtigung "
+"des Runners."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:41
 #: ../src/connection-editor/ce-page-team.ui.h:88
 msgid ""
 "The delay between the link going down and the runner being notified about it."
 msgstr ""
+"Die Verzögerung zwischen der Deaktivierung des Links und der "
+"Benachrichtigung des Runners."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:42
 #: ../src/connection-editor/ce-page-team.ui.h:89
@@ -2415,6 +2651,8 @@
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr ""
+"Die Verzögerung zwischen der Initialisierung der Linküberwachung und der "
+"ersten gesendeten Anfrage."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:44
 #: ../src/connection-editor/ce-page-team.ui.h:91
@@ -2486,14 +2724,14 @@
 msgstr "LACP"
 
 #: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/connection-helpers.c:105
 #: ../src/connection-editor/page-ethernet.c:351
 #: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/connection-helpers.c:120
 #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
 #: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
@@ -2553,7 +2791,7 @@
 
 #: ../src/connection-editor/ce-page-team.ui.h:49
 msgid "_Runner:"
-msgstr ""
+msgstr "_Runner:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:50
 msgid "_Hardware address policy:"
@@ -2561,7 +2799,7 @@
 
 #: ../src/connection-editor/ce-page-team.ui.h:51
 msgid "Name of runner to be used."
-msgstr ""
+msgstr "Name des zu verwendenden Runners."
 
 #: ../src/connection-editor/ce-page-team.ui.h:52
 msgid ""
@@ -2594,6 +2832,9 @@
 "LACPDU packets. If checked, packets will be sent once per second. Otherwise "
 "they will be sent every 30 seconds."
 msgstr ""
+"Die Option gibt an, mit welcher Taktung der Linkpartner gebeten wird, LACPDU-"
+"Pakete zu senden. Falls aktiviert, wird ein Paket pro Sekunde gesendet, "
+"ansonsten eines alle 30 Sekunden."
 
 #: ../src/connection-editor/ce-page-team.ui.h:57
 msgid "_System priority:"
@@ -2616,6 +2857,9 @@
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
 msgstr ""
+"Gibt die minimale Anzahl der Ports an, die aktiv sein müssen, bevor der "
+"Carrier in der Hauptschnittstelle aktiviert wird. Der Wert kann zwischen 1 "
+"und 255 liegen."
 
 #: ../src/connection-editor/ce-page-team.ui.h:62
 msgid "This selects the policy of how the aggregators will be selected."
@@ -2627,7 +2871,7 @@
 "computation."
 msgstr ""
 "Liste der Fragmenttypen (Zeichenketten), die für die Berechnung der Tx-"
-"Prüfsumme der Pakete verwendet werden soll"
+"Prüfsumme der Pakete verwendet werden soll."
 
 #: ../src/connection-editor/ce-page-team.ui.h:64
 msgid "_Fields for transmission hash"
@@ -2654,7 +2898,7 @@
 
 #: ../src/connection-editor/ce-page-team.ui.h:69
 msgid "Runner"
-msgstr ""
+msgstr "Runner"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
@@ -2758,6 +3002,7 @@
 msgid "SS_ID:"
 msgstr "_SSID:"
 
+#: ../src/connection-editor/ce-polkit.c:63
 #: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Für diese Aktion besteht keine polkit-Zulassung"
@@ -2815,58 +3060,63 @@
 "Legitimierungsmethoden. Falls eine Verbindung fehlschlägt, versuchen Sie, "
 "die Unterstützung für einige Methoden zu deaktivieren."
 
-#: ../src/connection-editor/connection-helpers.c:105
+#: ../src/connection-editor/connection-helpers.c:106
 #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Funknetzwerk"
 
-#: ../src/connection-editor/connection-helpers.c:113
+#: ../src/connection-editor/connection-helpers.c:114
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
-
 #: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-dsl.c:201
+msgid "DSL/PPPoE"
+msgstr "DSL/PPPoE"
+
+#: ../src/connection-editor/connection-helpers.c:116
 #: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:117
 #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Gebündelt"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Team"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-bridge.c:212
+#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/page-bridge.c:233
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Brücke"
 
-#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/connection-helpers.c:121
 #: ../src/connection-editor/page-ip-tunnel.c:176
 msgid "IP tunnel"
 msgstr "IP-Tunnel"
 
 #: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
+#: ../src/connection-editor/page-macsec.c:190
+msgid "MACsec"
+msgstr "MACsec"
+
+#: ../src/connection-editor/connection-helpers.c:124
+#: ../src/connection-editor/connection-helpers.c:398
 #: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:205
+#: ../src/connection-editor/connection-helpers.c:207
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2876,11 +3126,11 @@
 "\n"
 "Fehler: Kein VPN-Diensttyp."
 
-#: ../src/connection-editor/connection-helpers.c:217
+#: ../src/connection-editor/connection-helpers.c:219
 msgid "Cannot import VPN connection"
 msgstr "Die VPN-Verbindung konnte nicht importiert werden"
 
-#: ../src/connection-editor/connection-helpers.c:219
+#: ../src/connection-editor/connection-helpers.c:221
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2893,31 +3143,38 @@
 "\n"
 "Fehler: %s."
 
-#: ../src/connection-editor/connection-helpers.c:220
+#: ../src/connection-editor/connection-helpers.c:222
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../src/connection-editor/connection-helpers.c:303
+#: ../src/connection-editor/connection-helpers.c:305
 #: ../src/connection-editor/page-proxy.c:118
 #: ../src/connection-editor/page-team.c:341
 #: ../src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Datei zum Import auswählen"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: ../src/connection-editor/connection-helpers.c:309
+#: ../src/connection-editor/page-proxy.c:122
+#: ../src/connection-editor/page-team.c:345
+#: ../src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr "_Öffnen"
+
+#: ../src/connection-editor/connection-helpers.c:340
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: ../src/connection-editor/connection-helpers.c:367
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: ../src/connection-editor/connection-helpers.c:514
 #: ../src/connection-editor/connection-helpers.c:516
+#: ../src/connection-editor/connection-helpers.c:518
 msgid "Import a saved VPN configuration…"
 msgstr "Gespeicherte VPN-Konfiguration importieren …"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: ../src/connection-editor/connection-helpers.c:548
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2925,16 +3182,15 @@
 "Der Verbindungseditor kann wegen eines unbekannten Fehlers nicht "
 "initialisiert werden."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: ../src/connection-editor/connection-helpers.c:557
 msgid "Could not create new connection"
 msgstr "Neue Verbindung konnte nicht erstellt werden"
 
-#
-#: ../src/connection-editor/connection-helpers.c:718
+#: ../src/connection-editor/connection-helpers.c:720
 msgid "Connection delete failed"
 msgstr "Löschen der Verbindung fehlgeschlagen"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: ../src/connection-editor/connection-helpers.c:768
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Sind Sie sicher, dass Sie die Verbindung %s löschen möchten?"
@@ -2942,7 +3198,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "Adresse"
 
@@ -2954,7 +3210,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "Gateway"
 
@@ -2964,39 +3220,38 @@
 msgstr "Metrik"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "Präfix"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: ../src/connection-editor/nm-connection-editor.c:109
 #, c-format
 msgid "Editing %s"
 msgstr "%s bearbeiten"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: ../src/connection-editor/nm-connection-editor.c:113
 msgid "Editing un-named connection"
 msgstr "Unbenannte Verbindung bearbeiten"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: ../src/connection-editor/nm-connection-editor.c:133
 msgid "Missing connection name"
-msgstr "Fehlender Verbindungsname:"
+msgstr "Fehlender Verbindungsname"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: ../src/connection-editor/nm-connection-editor.c:353
 msgid "Editor initializing…"
 msgstr "Editor wird initialisiert …"
 
-#
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: ../src/connection-editor/nm-connection-editor.c:360
+#: ../src/connection-editor/nm-connection-list.c:443
 msgid "Connection cannot be modified"
 msgstr "Verbindung kann nicht bearbeitet werden"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: ../src/connection-editor/nm-connection-editor.c:375
 #, c-format
 msgid "Invalid setting %s: %s"
-msgstr "ungültige Einstellung %s: %s"
+msgstr "Ungültige Einstellung %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: ../src/connection-editor/nm-connection-editor.c:451
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3004,35 +3259,36 @@
 "Der Verbindungseditor konnte benötigte Ressourcen nicht finden (Die .ui-"
 "Datei wurde nicht gefunden)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/nm-connection-editor.c:579
 msgid "Save any changes made to this connection."
 msgstr "Alle Änderungen an dieser Verbindung speichern."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: ../src/connection-editor/nm-connection-editor.c:580
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Legitimieren, um diese Verbindung für alle Benutzer dieses Rechners zu "
 "speichern."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not create connection"
 msgstr "Verbindung konnte nicht erstellt werden"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not edit connection"
 msgstr "Verbindung konnte nicht bearbeitet werden"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: ../src/connection-editor/nm-connection-editor.c:598
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 "Unbekannter Fehler beim Erstellen des Dialoges zur Bearbeitung der "
 "Verbindung."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: ../src/connection-editor/nm-connection-editor.c:739
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -3040,161 +3296,172 @@
 "Warnung: Die Verbindung hat Eigenschaften, die vom Bereitsteller nicht "
 "unterstützt werden. Sie werden beim Speichern gelöscht."
 
-#: ../src/connection-editor/nm-connection-editor.c:758
+#: ../src/connection-editor/nm-connection-editor.c:759
 msgid "Error initializing editor"
 msgstr "Fehler beim Initialisieren des Editors"
 
-#
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: ../src/connection-editor/nm-connection-editor.c:1157
 msgid "Connection add failed"
 msgstr "Hinzufügen der Verbindung fehlgeschlagen"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr "S_chließen"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "Verbindungs_name:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "_Export…"
 msgstr "E_xportieren …"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
 msgid "Filename"
 msgstr "Dateiname"
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: ../src/connection-editor/nm-connection-list.c:151
 msgid "never"
 msgstr "nie"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:173
 msgid "now"
 msgstr "jetzt"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: ../src/connection-editor/nm-connection-list.c:180
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "vor %d Minute"
 msgstr[1] "vor %d Minuten"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: ../src/connection-editor/nm-connection-list.c:184
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "vor %d Stunde"
 msgstr[1] "vor %d Stunden"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:196
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "vor %d Tag"
 msgstr[1] "vor %d Tagen"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: ../src/connection-editor/nm-connection-list.c:202
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "vor %d Monat"
 msgstr[1] "vor %d Monaten"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: ../src/connection-editor/nm-connection-list.c:206
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "vor %d Jahr"
 msgstr[1] "vor %d Jahren"
 
-#: ../src/connection-editor/nm-connection-list.c:635
+#: ../src/connection-editor/nm-connection-list.c:445
+msgid "Connection cannot be deleted"
+msgstr "Verbindung kann nicht gelöscht werden"
+
+#: ../src/connection-editor/nm-connection-list.c:448
+msgid "Select a connection to edit"
+msgstr "Wählen Sie eine Verbindung zum Bearbeiten"
+
+#: ../src/connection-editor/nm-connection-list.c:450
+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.h:2
 msgid "Name"
 msgstr "Name"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: ../src/connection-editor/nm-connection-list.c:798
 msgid "Last Used"
 msgstr "Zuletzt verwendet"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: ../src/connection-editor/nm-connection-list.c:836
 msgid "Edit the selected connection"
 msgstr "Die ausgewählte Verbindung bearbeiten"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: ../src/connection-editor/nm-connection-list.c:837
 msgid "Authenticate to edit the selected connection"
 msgstr "Legitimieren, um die ausgewählte Verbindung zu bearbeiten"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: ../src/connection-editor/nm-connection-list.c:842
 msgid "Delete the selected connection"
 msgstr "Die ausgewählte Verbindung löschen"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: ../src/connection-editor/nm-connection-list.c:843
 msgid "Authenticate to delete the selected connection"
 msgstr "Legitimieren, um die ausgewählte Verbindung zu löschen"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:1048
+#: ../src/connection-editor/nm-connection-list.c:1051
 msgid "Error creating connection"
 msgstr "Fehler beim Erstellen der Verbindung"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:1049
 msgid "No VPN plugins are installed."
 msgstr "Es sind keine VPN-Plugins installiert."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:1052
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Es ist unbekannt, wie »%s«-Verbindungen erstellt werden können"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: ../src/connection-editor/nm-connection-list.c:1085
 msgid "Error editing connection"
 msgstr "Fehler beim Bearbeiten der Verbindung"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: ../src/connection-editor/nm-connection-list.c:1086
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Eine Verbindung mit der UUID »%s« konnte nicht gefunden werden"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: ../src/connection-editor/nm-connection-list.ui.h:2
+msgid "Add a new connection"
+msgstr "Eine neue Verbindung hinzufügen"
+
+#: ../src/connection-editor/page-8021x-security.c:116
 msgid "802.1X Security"
 msgstr "802.1X-Sicherheit"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: ../src/connection-editor/page-8021x-security.c:118
 msgid "Could not load 802.1X Security user interface."
 msgstr "Sichere 802.1X-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: ../src/connection-editor/page-8021x-security.c:132
 msgid "Use 802.1_X security for this connection"
 msgstr "802.1_X-Sicherheit für diese Verbindung verwenden"
 
@@ -3245,11 +3512,11 @@
 msgid "Bond connection %d"
 msgstr "Bündel-Verbindung %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:236
 msgid "Could not load bridge user interface."
 msgstr "Bündel-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: ../src/connection-editor/page-bridge.c:352
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Brückenverbindung %d"
@@ -3273,11 +3540,15 @@
 msgid "Could not load DCB user interface."
 msgstr "DCB-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: ../src/connection-editor/page-dsl.c:203
 msgid "Could not load DSL user interface."
 msgstr "DSL-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: ../src/connection-editor/page-dsl.c:298
+msgid "missing parent interface"
+msgstr "Übergeordnete Schnittstelle fehlt"
+
+#: ../src/connection-editor/page-dsl.c:343
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-Verbindung %d"
@@ -3377,27 +3648,27 @@
 msgstr "IP-Tunnel-Verbindung %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "Automatisch (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatisch (VPN), nur Adressen"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "Automatisch, nur Adressen"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "Automatisch (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatisch (PPPoE), nur Adressen"
 
@@ -3410,17 +3681,17 @@
 msgstr "Automatisch (DHCP), nur Adressen"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "Nur per Link-Local"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "Zusätzliche _DNS-Server:"
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "Zusätzliche Suchdomän_en:"
 
@@ -3457,43 +3728,52 @@
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4-DNS-Server »%s« ist ungültig"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "Automatisch, nur DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "IPv6-Routen für »%s« bearbeiten"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "IPv6-Einstellungen"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6-Adresse »%s« ist ungültig"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6-Präfix »%s« ist ungültig"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6-Gateway »%s« ist ungültig"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6-DNS-Server »%s« ist ungültig"
 
+#: ../src/connection-editor/page-macsec.c:192
+msgid "Could not load MACsec user interface."
+msgstr "MACsec-Benutzerschnittstelle konnte nicht geladen werden."
+
+#: ../src/connection-editor/page-macsec.c:331
+#, c-format
+msgid "MACSEC connection %d"
+msgstr "MACSEC-Verbindung %d"
+
 #: ../src/connection-editor/page-master.c:247
 #: ../src/connection-editor/page-master.c:258
 msgid "Duplicate slaves"
@@ -3555,38 +3835,34 @@
 "Mein Dienstanbieter verwendet C_DMA-basierte Technologien (z.B. 1xRTT, EVDO)"
 
 #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: ../src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
 #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: ../src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
 #: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: ../src/wireless-security/eap-method-ttls.c:287
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: ../src/wireless-security/eap-method-fast.c:282
+#: ../src/wireless-security/eap-method-peap.c:299
+#: ../src/wireless-security/eap-method-ttls.c:317
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: ../src/wireless-security/eap-method-ttls.c:302
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3621,11 +3897,11 @@
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Fehler: Datei enthält keine gültige JSON-Konfiguration"
 
-#: ../src/connection-editor/page-team.c:1156
+#: ../src/connection-editor/page-team.c:1034
 msgid "Could not load team user interface."
 msgstr "Benutzerschnittstelle für Netzwerk-Team konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-team.c:1253
+#: ../src/connection-editor/page-team.c:1131
 #, c-format
 msgid "Team connection %d"
 msgstr "Netzwerk-Team %d"
@@ -3633,11 +3909,11 @@
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: ../src/connection-editor/page-team-port.c:655
 msgid "Team Port"
 msgstr "Netzwerk-Team Anschluss"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: ../src/connection-editor/page-team-port.c:657
 msgid "Could not load team port user interface."
 msgstr ""
 "Benutzerschnittstelle für Netzwerk-Team-Anschluss konnte nicht geladen "
@@ -3683,7 +3959,6 @@
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Editor-VPN-Plugin für »%s« konnte nicht gefunden werden (%s)."
 
-#
 #: ../src/connection-editor/page-vpn.c:123
 msgid "unknown failure"
 msgstr "Fehlgeschlagen, Grund unbekannt"
@@ -3693,7 +3968,6 @@
 msgid "VPN connection %d"
 msgstr "VPN-Verbindung %d"
 
-#
 #: ../src/connection-editor/page-vpn.c:211
 msgid "Choose a VPN Connection Type"
 msgstr "VPN-Verbindungstyp wählen"
@@ -3751,51 +4025,51 @@
 msgid "Wi-Fi connection %d"
 msgstr "Funknetzwerkverbindung %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
+#: ../src/connection-editor/page-wifi-security.c:358
 #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-Schlüssel (Hexadezimal oder ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
+#: ../src/connection-editor/page-wifi-security.c:368
 #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Kennwort"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: ../src/connection-editor/page-wifi-security.c:394
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamisches WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
+#: ../src/connection-editor/page-wifi-security.c:407
 #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
+#: ../src/connection-editor/page-wifi-security.c:420
 #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: ../src/connection-editor/page-wifi-security.c:463
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Sichere Benutzerschnittstelle für Funknetzwerke konnte nicht geladen werden, "
 "weil Funknetzwerkeinstellungen fehlen."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: ../src/connection-editor/page-wifi-security.c:474
 msgid "Wi-Fi Security"
 msgstr "Sicherheit des Funknetzwerks"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: ../src/connection-editor/page-wifi-security.c:476
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 "Sichere Benutzerschnittstelle für Funknetzwerke konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-wifi-security.c:558
+#: ../src/connection-editor/page-wifi-security.c:560
 #, c-format
 msgid "missing SSID"
 msgstr "fehlende SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:564
+#: ../src/connection-editor/page-wifi-security.c:566
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Sicherheit ist mit Ad-Hoc-Modus nicht kompatibel"
@@ -3846,34 +4120,38 @@
 msgid "Connection Information"
 msgstr "Verbindungsinformationen"
 
+#: ../src/info.ui.h:2
+msgid "_Close"
+msgstr "S_chließen"
+
 #: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Aktive Netzwerkverbindungen"
 
 #: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
 msgid "No certificate set"
 msgstr "Kein Zertifikat festgelegt"
 
 #: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
 msgid "No key set"
 msgstr "Kein Schlüssel gesetzt"
 
 #: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Wählen Sie einen Schlüssel für das %s-Zertifikat"
 
 #: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
 #, c-format
 msgid "%s private _key:"
 msgstr "Geheimer %s-_Schlüssel:"
 
 #: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
 #, c-format
 msgid "%s key _password:"
 msgstr "_Passwort des %s-Schlüssels:"
@@ -3884,7 +4162,7 @@
 msgstr "Wählen Sie das %s-Zertifikat"
 
 #: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
 msgid "%s _certificate:"
 msgstr "%s-_Zertifikat:"
@@ -4093,45 +4371,45 @@
 msgid "New Mobile Broadband Connection"
 msgstr "Neue mobile Breitbandverbindung"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: ../src/libnma/nma-cert-chooser-button.c:165
 msgid "(None)"
 msgstr "(keine)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: ../src/libnma/nma-cert-chooser-button.c:173
 #, c-format
 msgid "Key in %s"
 msgstr "Schlüssel in %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: ../src/libnma/nma-cert-chooser-button.c:174
 #, c-format
 msgid "Certificate in %s"
 msgstr "Zertifikat in %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
+#: ../src/libnma/nma-cert-chooser-button.c:193
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
-msgstr "[Unbekannt]"
+msgstr "(Unbekannt)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: ../src/libnma/nma-cert-chooser-button.c:215
+#: ../src/libnma/nma-cert-chooser-button.c:245
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: ../src/libnma/nma-cert-chooser-button.c:216
+#: ../src/libnma/nma-cert-chooser-button.c:246
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: ../src/libnma/nma-cert-chooser-button.c:472
 msgid "Select from file…"
 msgstr "Aus _Datei auswählen …"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Wählen Sie ein %s-Zertifikat"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s certificate _password:"
 msgstr "Passwort des %s-Zertifikats:"
@@ -4191,8 +4469,8 @@
 msgid "_Tertiary Password:"
 msgstr "_Tertiäres Passwort:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: ../src/libnma/nma-vpn-password-dialog.c:238
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "Passwörter _zeigen"
 
@@ -4221,11 +4499,11 @@
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisches WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "E_rzeugen"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4233,36 +4511,36 @@
 "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:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Legitimierung für Funknetzwerk wird benötigt"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Legitimierung für Funknetzwerk wird benötigt"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Neues Funknetzwerk erstellen"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Neues Funknetzwerk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 "Bitte geben Sie den Namen des Funknetzwerks ein, das Sie erstellen möchten."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Mit einem verborgenen Funknetzwerk verbinden"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Verborgenes Funknetzwerk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4416,25 +4694,25 @@
 msgid "Roaming network"
 msgstr "Roaming-Netzwerk"
 
-#: ../src/mobile-helpers.c:331
+#: ../src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN-Code für SIM-Karte »%s« auf »%s«"
 
-#: ../src/mobile-helpers.c:464
+#: ../src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN-Code erforderlich"
 
-#: ../src/mobile-helpers.c:472
+#: ../src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Für das mobile Breitbandgerät ist ein PIN-Code erforderlich"
 
-#: ../src/mobile-helpers.c:622
+#: ../src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobile Breitbandverbindung »%s« ist aktiv: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: ../src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "Roaming"
 
@@ -4444,11 +4722,11 @@
 msgid "%s connection"
 msgstr "Verbindung mit %s"
 
-#: ../src/utils/utils.c:563
+#: ../src/utils/utils.c:565
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "PEM-Zertifikate (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: ../src/utils/utils.c:577
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER-, PEM-, oder PKCS#12-Privatschlüssel (*.der, *.pem, *.p12, *.key)"
 
@@ -4456,38 +4734,33 @@
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "Nicht definierter Fehler in der 802.1X-Sicherheit (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr "keine Datei ausgewählt"
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr "Die Datei »%s« ist nicht vorhanden"
+#: ../src/wireless-security/eap-method.c:365
+msgid "no CA certificate selected"
+msgstr "Kein CA-Zertifikat gewählt"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
-msgstr "Nicht spezifizierter Fehler beim Überprüfen der eap-method-Datei"
+#: ../src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
+msgstr "Die gewählte Datei mit dem CA-Zertifikat ist nicht vorhanden"
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: ../src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC-Datei fehlt"
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: ../src/wireless-security/eap-method-fast.c:267
+#: ../src/wireless-security/eap-method-peap.c:329
+#: ../src/wireless-security/eap-method-ttls.c:379
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:405
 msgid "Choose a PAC file"
 msgstr "PAC-Datei wählen"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:412
 msgid "PAC files (*.pac)"
 msgstr "PAC-Dateien (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: ../src/wireless-security/eap-method-fast.c:416
 msgid "All files"
 msgstr "Alle Dateien"
 
@@ -4505,7 +4778,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:4
 #: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "Anony_mous identity:"
 msgstr "Anony_me Identität:"
 
@@ -4515,7 +4788,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:6
 #: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
 msgid "_Inner authentication:"
 msgstr "I_nnere Legitimierung:"
 
@@ -4531,26 +4804,12 @@
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP-Passwort fehlt"
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr "Ungültiges EAP-PEAP-CA-Zertifikat: %s"
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr "Ungültiges EAP-PEAP-CA-Zertifikat: Kein Zertifikat angegeben"
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: ../src/wireless-security/eap-method-peap.c:314
+#: ../src/wireless-security/eap-method-ttls.c:364
 #: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-msgid "Choose a Certificate Authority certificate"
-msgstr "CA-Zertifikat auswählen"
-
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "Version 0"
@@ -4560,20 +4819,27 @@
 msgstr "Version 1"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A-Zertifikat:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
 #: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
 msgid "No CA certificate is _required"
 msgstr "CA-Zertifikat igno_rieren"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:6
 msgid "PEAP _version:"
 msgstr "_PEAP-Version:"
 
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "Suffix of the server certificate name."
+msgstr "Suffix des Namens des Serverzertifikats."
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Domain:"
+msgstr "_Domäne:"
+
 #: ../src/wireless-security/eap-method-simple.c:75
 msgid "missing EAP username"
 msgstr "EAP-Benutzername fehlt"
@@ -4586,44 +4852,27 @@
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS-Identität fehlt"
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: ../src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "Kein Benutzerzertifikat gewählt"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: ../src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "Die gewählte Datei mit dem Benutzerzertifikat ist nicht vorhanden"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "kein Schlüssel ausgewählt"
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: ../src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "Die gewählte Schlüsseldatei ist nicht vorhanden"
 
-#: ../src/wireless-security/eap-method-tls.c:314
-msgid "no CA certificate selected"
-msgstr "Kein CA-Zertifikat gewählt"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-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-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "I_dentität:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr "Ungültiges EAP-TTLS-CA-Zertifikat: %s"
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr "Ungültiges EAP-TTLS-CA-Zertifikat: Kein Zertifikat angegeben"
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (kein EAP)"
 
@@ -4702,17 +4951,17 @@
 msgstr "Ungültiger WEP-Schlüssel: Kennwort muss kürzer als 64 Zeichen sein"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Vorgabe)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Open System"
 msgstr "Offenes System"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Shared Key"
 msgstr "Gemeinsamer Schlüssel"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "1 (Default)"
+msgstr "1 (Vorgabe)"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key:"
 msgstr "_Schlüssel:"
@@ -4743,53 +4992,3 @@
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "_Typ:"
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection “%s” disconnected because the VPN service stopped."
-#~ msgstr ""
-#~ "\n"
-#~ "Die VPN-Verbindung »%s« wurde getrennt, weil der VPN-Dienst sich beendet "
-#~ "hat."
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection “%s” disconnected."
-#~ msgstr ""
-#~ "\n"
-#~ "Die VPN-Verbindung »%s« wurde getrennt."
-
-#~ msgid "invalid EAP-TLS CA certificate: %s"
-#~ msgstr "Ungültiges EAP-TLS CA-Zertifikat: %s"
-
-#~ msgid "invalid EAP-TLS CA certificate: no certificate specified"
-#~ msgstr "Ungültiges EAP-TLS-CA-Zertifikat: Kein Zertifikat angegeben"
-
-#~ msgid "invalid EAP-TLS password: missing"
-#~ msgstr "Ungültiges EAP-TLS-Passwort: fehlt"
-
-#~ msgid "invalid EAP-TLS private-key: %s"
-#~ msgstr "Ungültiger privater Schlüssel für EAP-TLS: %s"
-
-#~ msgid "invalid EAP-TLS user-certificate: %s"
-#~ msgstr "Ungültiges Benutzerzertifikat für EAP-TLS: %s"
-
-#~ msgid "Unencrypted private keys are insecure"
-#~ msgstr "Nicht verschlüsselte geheime Schlüssel sind unsicher"
-
-#~ msgid ""
-#~ "The selected private key does not appear to be protected by a password. "
-#~ "This could allow your security credentials to be compromised. Please "
-#~ "select a password-protected private key.\n"
-#~ "\n"
-#~ "(You can password-protect your private key with openssl)"
-#~ msgstr ""
-#~ "Der ausgewählte geheime Schlüssel scheint nicht durch ein Passwort "
-#~ "geschützt zu sein. Dadurch könnte die Sicherheit Ihrer Anmeldedaten "
-#~ "gefährdet werden. Bitte wählen Sie einen passwortgeschützten privaten "
-#~ "Schlüssel.\n"
-#~ "\n"
-#~ "Sie können Ihren Schlüssel mittels OpenSSL durch ein Passwort schützen."
-
-#~ msgid "Choose your private key"
-#~ msgstr "Ihren geheimen Schlüssel auswählen"
diff -Nru network-manager-applet-1.8.4/po/es.po network-manager-applet-1.8.10/po/es.po
--- network-manager-applet-1.8.4/po/es.po	2017-08-11 09:40:17.000000000 +0000
+++ network-manager-applet-1.8.10/po/es.po	2017-12-19 11:44:30.000000000 +0000
@@ -9,24 +9,23 @@
 # Gladys Guerrero  , 2010.
 # Jorge González , 2007, 2008, 2009, 2010, 2011.
 # Daniel Mustieles , 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017.
-#
+# lrintel , 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: networkmanager-applet.master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2017-07-28 11:47+0000\n"
-"PO-Revision-Date: 2017-08-01 13:02+0200\n"
-"Last-Translator: Daniel Mustieles \n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-12-12 11:18+0100\n"
+"PO-Revision-Date: 2017-11-07 06:45+0000\n"
+"Last-Translator: Copied by Zanata \n"
 "Language-Team: es \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Zanata 4.3.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3186
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
 msgstr "Red"
 
@@ -165,17 +164,17 @@
 msgid "The NetworkManager Developers"
 msgstr "Los desarrolladores de NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "el objeto de clase «%s» no tiene ninguna propiedad llamada «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "la propiedad «%s» del objeto de la clase «%s» no se puede escribir"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -183,20 +182,20 @@
 "no se puede establecer la propiedad «%s» del constructor para el objeto «%s» "
 "después de la construcción"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "«%s::%s» no es un nombre de propiedad válido; «%s» no es un subtipo de "
 "GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "no se puede establecer la propiedad «%s» de tipo «%s» al valor de tipo «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -205,7 +204,6 @@
 "el valor «%s» de tipo «%s» no es válido o está fuera de rango para la "
 "propiedad «%s» de tipo «%s»"
 
-#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticación 802.1x"
@@ -250,37 +248,37 @@
 msgid "secure."
 msgstr "segura."
 
-#: ../src/applet.c:387
+#: ../src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Falló al añadir/activar la conexión"
 
-#: ../src/applet.c:389 ../src/applet.c:443 ../src/applet.c:478
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../src/applet.c:392 ../src/applet.c:481 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Falló la conexión"
 
-#: ../src/applet.c:441
+#: ../src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Falló al desconectar el dispositivo"
 
-#: ../src/applet.c:446
+#: ../src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Falló al desconectar"
 
-#: ../src/applet.c:476
+#: ../src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Falló al activar la conexión"
 
-#: ../src/applet.c:804 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "No mostrar este mensaje de nuevo"
 
-#: ../src/applet.c:894
+#: ../src/applet.c:899
 #, c-format
 msgid ""
 "\n"
@@ -290,7 +288,7 @@
 "\n"
 "La conexión VPN «%s» se desconectó porque se interrumpió la conexión de red."
 
-#: ../src/applet.c:896
+#: ../src/applet.c:901
 #, c-format
 msgid ""
 "\n"
@@ -300,7 +298,7 @@
 "\n"
 "La conexión VPN «%s» ha fallado porque se interrumpió la conexión de red."
 
-#: ../src/applet.c:898
+#: ../src/applet.c:903
 #, c-format
 msgid ""
 "\n"
@@ -310,7 +308,7 @@
 "La conexión de red «%s» ha fallado porque el servicio VPN se interrumpió "
 "inesperadamente."
 
-#: ../src/applet.c:900
+#: ../src/applet.c:905
 #, c-format
 msgid ""
 "\n"
@@ -321,7 +319,7 @@
 "La conexión VPN «%s» ha fallado porque el servicio VPN devolvió una "
 "configuración no válida."
 
-#: ../src/applet.c:902
+#: ../src/applet.c:907
 #, c-format
 msgid ""
 "\n"
@@ -330,7 +328,7 @@
 "\n"
 "La conexión VPN «%s» ha fallado porque expiró el tiempo de conexión."
 
-#: ../src/applet.c:904
+#: ../src/applet.c:909
 #, c-format
 msgid ""
 "\n"
@@ -339,7 +337,7 @@
 "\n"
 "La conexión VPN «%s» ha fallado porque el servicio VPN no se inició a tiempo."
 
-#: ../src/applet.c:906
+#: ../src/applet.c:911
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +346,7 @@
 "\n"
 "La conexión VPN «%s» ha fallado porque el servició VPN no pudo iniciarse."
 
-#: ../src/applet.c:908
+#: ../src/applet.c:913
 #, c-format
 msgid ""
 "\n"
@@ -357,7 +355,7 @@
 "\n"
 "La conexión VPN «%s» falló porque no había secretos VPN válidos."
 
-#: ../src/applet.c:910
+#: ../src/applet.c:915
 #, c-format
 msgid ""
 "\n"
@@ -366,7 +364,7 @@
 "\n"
 "La conexión VPN «%s» falló porque los secretos VPN no eran válidos."
 
-#: ../src/applet.c:915
+#: ../src/applet.c:920
 #, c-format
 msgid ""
 "\n"
@@ -375,7 +373,7 @@
 "\n"
 "La conexión VPN «%s» ha fallado."
 
-#: ../src/applet.c:942
+#: ../src/applet.c:947
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -386,19 +384,19 @@
 "\n"
 "%s\n"
 
-#: ../src/applet.c:944
+#: ../src/applet.c:949
 msgid "VPN connection has been successfully established.\n"
 msgstr "La conexión VPN se ha establecido con éxito.\n"
 
-#: ../src/applet.c:946
+#: ../src/applet.c:951
 msgid "VPN Login Message"
 msgstr "Mensaje de acceso VPN"
 
-#: ../src/applet.c:954 ../src/applet.c:994
+#: ../src/applet.c:959 ../src/applet.c:999
 msgid "VPN Connection Failed"
 msgstr "Falló la conexión VPN"
 
-#: ../src/applet.c:998
+#: ../src/applet.c:1003
 #, c-format
 msgid ""
 "\n"
@@ -411,7 +409,7 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:1001
+#: ../src/applet.c:1006
 #, c-format
 msgid ""
 "\n"
@@ -424,144 +422,144 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:1290
+#: ../src/applet.c:1295
 msgid "device not ready (firmware missing)"
 msgstr "el dispositivo no está listo (falta el firmware)"
 
-#: ../src/applet.c:1292
+#: ../src/applet.c:1297
 msgid "device not ready"
 msgstr "el dispositivo no está listo"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1302 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconectado"
 
-#: ../src/applet.c:1318
+#: ../src/applet.c:1323
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/applet.c:1332
+#: ../src/applet.c:1337
 msgid "device not managed"
 msgstr "el dispositivo no está gestionado"
 
-#: ../src/applet.c:1405
+#: ../src/applet.c:1410
 msgid "No network devices available"
 msgstr "No hay dispositivos de red disponibles"
 
-#: ../src/applet.c:1459
+#: ../src/applet.c:1464
 msgid "_VPN Connections"
 msgstr "Conexiones _VPN"
 
-#: ../src/applet.c:1503
+#: ../src/applet.c:1508
 msgid "_Configure VPN…"
 msgstr "_Configurar VPN…"
 
-#: ../src/applet.c:1506
+#: ../src/applet.c:1511
 msgid "_Add a VPN connection…"
 msgstr "_Añadir una conexión VPN…"
 
-#: ../src/applet.c:1612
+#: ../src/applet.c:1617
 msgid "NetworkManager is not running…"
 msgstr "El Gestor de la red no se está ejecutando…"
 
-#: ../src/applet.c:1617 ../src/applet.c:2682
+#: ../src/applet.c:1622 ../src/applet.c:2687
 msgid "Networking disabled"
 msgstr "Red desactivada"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1827
+#: ../src/applet.c:1832
 msgid "Enable _Networking"
 msgstr "Activar _red"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1836
+#: ../src/applet.c:1841
 msgid "Enable _Wi-Fi"
 msgstr "Activar _inalámbrica"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1845
+#: ../src/applet.c:1850
 msgid "Enable _Mobile Broadband"
 msgstr "Activar la banda ancha _móvil"
 
 #. Toggle notifications item
-#: ../src/applet.c:1857
+#: ../src/applet.c:1862
 msgid "Enable N_otifications"
 msgstr "Activar n_otificaciones"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1869
+#: ../src/applet.c:1874
 msgid "Connection _Information"
 msgstr "_Información de la conexión"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1877
+#: ../src/applet.c:1882
 msgid "Edit Connections…"
 msgstr "Editar las conexiones…"
 
-#: ../src/applet.c:1891
+#: ../src/applet.c:1896
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../src/applet.c:2202
+#: ../src/applet.c:2207
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Ahora está conectado a «%s»."
 
-#: ../src/applet.c:2242
+#: ../src/applet.c:2247
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../src/applet.c:2243
+#: ../src/applet.c:2248
 msgid "The network connection has been disconnected."
 msgstr "La conexión de red se ha desconectado."
 
-#: ../src/applet.c:2545
+#: ../src/applet.c:2550
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Preparando la conexión de red «%s»…"
 
-#: ../src/applet.c:2548
+#: ../src/applet.c:2553
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Se necesita autenticación de usuario para la conexión de red «%s»…"
 
-#: ../src/applet.c:2551 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Solicitando una dirección de red para «%s»…"
 
-#: ../src/applet.c:2554
+#: ../src/applet.c:2559
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Conexión de red «%s» activa"
 
-#: ../src/applet.c:2627
+#: ../src/applet.c:2632
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Iniciando conexión VPN «%s»…"
 
-#: ../src/applet.c:2630
+#: ../src/applet.c:2635
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Se necesita autenticación de usuario para la conexión VPN «%s»…"
 
-#: ../src/applet.c:2633
+#: ../src/applet.c:2638
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Solicitando una dirección VPN para «%s»…"
 
-#: ../src/applet.c:2636
+#: ../src/applet.c:2641
 #, c-format
 msgid "VPN connection active"
 msgstr "Conexión VPN activa"
 
-#: ../src/applet.c:2686
+#: ../src/applet.c:2691
 msgid "No network connection"
 msgstr "Sin conexión de red"
 
-#: ../src/applet.c:3287
+#: ../src/applet.c:3292
 msgid "NetworkManager Applet"
 msgstr "Miniaplicación Gestor de la red"
 
@@ -578,46 +576,46 @@
 msgid "Sending unlock code…"
 msgstr "Enviando código de desbloqueo…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:507
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda ancha móvil (%s)"
 
-#: ../src/applet-device-broadband.c:738
+#: ../src/applet-device-broadband.c:739
 #: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Banda ancha móvil"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Disponible"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 msgid "New Mobile Broadband connection…"
 msgstr "Conexión de banda ancha móvil nueva…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Se ha establecido la conexión"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Ahora está conectado a la red de banda ancha móvil."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "Red de banda ancha móvil."
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "Ahora está registrado en la red de casa."
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "Ahora está registrado en una red de «roaming»."
 
@@ -726,7 +724,7 @@
 msgid "(none)"
 msgstr "(ninguna)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Falló al añadir la conexión nueva"
 
@@ -734,80 +732,80 @@
 msgid "Insufficient privileges."
 msgstr "Privilegios insuficientes."
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Redes inalámbricas (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Red inalámbrica (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Red inalámbrica"
 msgstr[1] "Redes inalámbricas"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "La red inalámbrica está desactivada"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Red inalámbrica desactivada por el interruptor físico"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Más redes"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Redes inalámbricas disponibles"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Usar el menú de red para conectarse a una red inalámbrica"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Ahora está conectado a la red inalámbrica «%s»."
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Preparando la conexión de red inalámbrica «%s»…"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Configurando la conexión de red inalámbrica «%s»…"
 
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 "Se necesita autenticación de usuario para la conexión de red inalámbrica "
 "«%s»…"
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Solicitando una dirección de red inalámbrica para «%s»…"
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "La conexión de red inalámbrica a «%s» está activa: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "La conexión de red inalámbrica «%s» está activa"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Falló al activar la conexión"
 
@@ -815,8 +813,7 @@
 msgid "Error displaying connection information:"
 msgstr "Ha ocurrido un error al mostrar información de la conexión:"
 
-#: ../src/applet-dialogs.c:73
-#: ../src/connection-editor/page-wifi-security.c:381
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
 #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
@@ -984,10 +981,6 @@
 msgstr "No se encontró ninguna conexión activa válida"
 
 #: ../src/applet-dialogs.c:1007
-#| msgid ""
-#| "Copyright © 2004-2014 Red Hat, Inc.\n"
-#| "Copyright © 2005-2008 Novell, Inc.\n"
-#| "and many other community contributors and translators"
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -1105,6 +1098,20 @@
 msgid "Show PIN/PUK codes"
 msgstr "Mostrar códigos PIN/PUK"
 
+#: ../src/applet-vpn-request.c:201
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "No se puede eliminar la conexión"
+
+#: ../src/applet-vpn-request.c:251
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Falló al activar la conexión"
+
+#: ../src/applet-vpn-request.c:259
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
+
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
 #: ../src/connection-editor/ce-page.h:114
@@ -1120,7 +1127,7 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
 #: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
@@ -1131,7 +1138,7 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
 #: ../src/connection-editor/connection-helpers.c:772
 #: ../src/connection-editor/nm-connection-list.ui.h:4
@@ -1158,7 +1165,6 @@
 "predeterminada."
 
 #: ../src/connection-editor/ce-new-connection.ui.h:2
-#| msgid "Create…"
 msgid "C_reate…"
 msgstr "C_rear"
 
@@ -1327,36 +1333,76 @@
 msgstr "_Tiempo de saludo:"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "Enable I_GMP snooping"
 msgstr "Activar snooping I_GMP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:14
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Activar _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:15
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:16
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:17
 msgid "_Max age:"
 msgstr "Edad _máxima:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:18
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:19
 msgid "_Aging time:"
 msgstr "_Tiempo de de caducidad:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: ../src/connection-editor/ce-page-bridge.ui.h:20
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:21
 msgid "Group _forward mask:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78
-#: ../src/connection-editor/ce-page.c:112
+#: ../src/connection-editor/ce-page-bridge.ui.h:22
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automático"
 
-#: ../src/connection-editor/ce-page.c:86
-#: ../src/connection-editor/ce-page.c:121
+#: ../src/connection-editor/ce-page.c:86 ../src/connection-editor/ce-page.c:121
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
 #: ../src/connection-editor/page-wifi.c:168
 #: ../src/connection-editor/page-wifi.c:172
@@ -1415,13 +1461,11 @@
 
 #: ../src/connection-editor/ce-page.c:388
 #, c-format
-#| msgid "invalid interface-name for %s (%s)"
 msgid "invalid interface-name for %s (%s): "
 msgstr "nombre de interfaz no válido para %s (%s): "
 
 #: ../src/connection-editor/ce-page.c:392
 #, c-format
-#| msgid "invalid interface-name (%s)"
 msgid "invalid interface-name (%s): "
 msgstr "nombre de interfaz no válido (%s): "
 
@@ -1430,13 +1474,11 @@
 msgstr "no se puede analizar el nombre del dispositivo"
 
 #: ../src/connection-editor/ce-page.c:589
-#| msgid "Hardware Address:"
 msgid "invalid hardware address"
 msgstr "dirección hardware no válida"
 
 #: ../src/connection-editor/ce-page.c:611
 #, c-format
-#| msgid "invalid %s (%s)"
 msgid "invalid %s (%s): "
 msgstr "%s no válido (%s): "
 
@@ -1447,7 +1489,6 @@
 
 #: ../src/connection-editor/ce-page.c:616
 #, c-format
-#| msgid "invalid %s (%s)"
 msgid "invalid %s (%s) "
 msgstr "%s no válido (%s)"
 
@@ -1458,7 +1499,6 @@
 "desconocido."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:1
-#| msgid "Use Data Center Bridging (DCB) for this connection"
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "_Usar «Data Center Bridging» (DCB) para esta conexión"
 
@@ -1620,10 +1660,20 @@
 msgstr "Nombre de _usuario:"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
 msgid "_Service:"
 msgstr "_Servicio:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:5
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 #: ../src/wireless-security/ws-leap.ui.h:3
@@ -1631,7 +1681,11 @@
 msgid "Sho_w password"
 msgstr "_Mostrar la contraseña"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-dsl.ui.h:6
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:7
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
 #: ../src/libnma/nma-vpn-password-dialog.c:97
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
@@ -1642,13 +1696,29 @@
 msgid "_Password:"
 msgstr "Contrase_ña:"
 
+#: ../src/connection-editor/ce-page-dsl.ui.h:8
+msgid "PPP _interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:9
+msgid "P_arent interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:10
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:11
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
 #: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "Automático"
@@ -1694,7 +1764,7 @@
 msgstr "Completa"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -1702,7 +1772,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "Manual"
 
@@ -1814,7 +1884,6 @@
 msgstr "Conectarse _automáticamente a esta red cuando esté disponible"
 
 #: ../src/connection-editor/ce-page-general.ui.h:4
-#| msgid "Connection _Information"
 msgid "Connection _priority for auto-activation:"
 msgstr "_Prioridad de la conexión para la activación automática:"
 
@@ -1831,9 +1900,6 @@
 
 #: ../src/connection-editor/ce-page.h:111
 #, fuzzy
-#| msgid ""
-#| "IP addresses identify your computer on the network.  Click the \"Add\" "
-#| "button to add an IP address."
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add static IP address to be configured in addition to the automatic ones."
@@ -1843,9 +1909,6 @@
 
 #: ../src/connection-editor/ce-page.h:116
 #, fuzzy
-#| msgid ""
-#| "IP addresses identify your computer on the network.  Click the \"Add\" "
-#| "button to add an IP address."
 msgid ""
 "The IP address identify your computer on the network and determines the "
 "address range distributed to other computers. Click the “Add” button to add "
@@ -1919,44 +1982,36 @@
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
 #: ../src/connection-editor/ce-page-macsec.ui.h:6
-#| msgid "Device name"
 msgid "Device name:"
 msgstr "Nombre del dispositivo:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
 #: ../src/connection-editor/ce-page-macsec.ui.h:8
-#| msgid "Parent device"
 msgid "Parent device:"
 msgstr "Dispositivo padre:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
 #: ../src/connection-editor/ce-page-macsec.ui.h:16
-#| msgid "M_ode:"
 msgid "Mode:"
 msgstr "Modo:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-#| msgid "Local IP"
 msgid "Local IP:"
 msgstr "IP local:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-#| msgid "Remote IP"
 msgid "Remote IP:"
 msgstr "IP remota:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-#| msgid "Input key"
 msgid "Input key:"
 msgstr "Clave de entrada:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-#| msgid "Output key"
 msgid "Output key:"
 msgstr "Clave de salida:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-#| msgid "_MTU:"
 msgid "MTU:"
 msgstr "MTU:"
 
@@ -1973,12 +2028,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "Compartida con otros equipos"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "_Método:"
 
@@ -1993,7 +2048,7 @@
 "de cliente DHCP introdúzcalo aquí."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2006,16 +2061,16 @@
 msgstr "ID del cliente D_HCP:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "Dominios de bú_squeda:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "Servidores _DNS:"
 
@@ -2041,7 +2096,7 @@
 "configuración IPv4 falla pero la configuración IPv6 tiene éxito. "
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "_Rutas…"
 
@@ -2059,7 +2114,15 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "Activado (preferir dirección temporal)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Stable privacy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -2070,15 +2133,19 @@
 "nombres de dominio múltiples. El ámbito de las direcciones de enlaces "
 "locales se definirá automáticamente al conectar la interfaz."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "Extensiones de _privacidad IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Requiere dirección IPv_6 para que esta conexión complete"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2143,22 +2210,18 @@
 msgstr "CAK:"
 
 #: ../src/connection-editor/ce-page-macsec.ui.h:17
-#| msgid "Keys"
 msgid "Keys:"
 msgstr "Claves:"
 
 #: ../src/connection-editor/ce-page-macsec.ui.h:18
-#| msgid "Parameters"
 msgid "Parameters:"
 msgstr "Parámetros:"
 
 #: ../src/connection-editor/ce-page-macsec.ui.h:19
-#| msgid "Validation"
 msgid "Validation:"
 msgstr "Validación:"
 
 #: ../src/connection-editor/ce-page-macsec.ui.h:20
-#| msgid "SCI port"
 msgid "SCI port:"
 msgstr "Puerto SCI:"
 
@@ -2533,7 +2596,6 @@
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:46
 #: ../src/connection-editor/ce-page-team.ui.h:93
-#| msgid "Im_port team configuration from a file..."
 msgid "Im_port team configuration from a file…"
 msgstr "I_mportar configuración redundada desde un archivo…"
 
@@ -2568,7 +2630,6 @@
 msgstr "Prioridad del puerto"
 
 #: ../src/connection-editor/ce-page-team.ui.h:6
-#| msgid "Ethernet device"
 msgid "From the team device"
 msgstr "Del dispositivo redundado"
 
@@ -2924,9 +2985,9 @@
 msgstr "Bluetooth"
 
 #: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: ../src/connection-editor/page-dsl.c:201
+msgid "DSL/PPPoE"
+msgstr ""
 
 #: ../src/connection-editor/connection-helpers.c:116
 #: ../src/connection-editor/page-infiniband.c:148
@@ -2941,13 +3002,13 @@
 msgstr "Bond"
 
 #: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1031
-#: ../src/libnm-gtk/nm-ui-utils.c:335 ../src/libnm-gtk/nm-ui-utils.c:579
+#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Unir"
 
 #: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:221
+#: ../src/connection-editor/page-bridge.c:233
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Puente"
@@ -3049,7 +3110,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "Dirección"
 
@@ -3061,7 +3122,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "Puerta de enlace"
 
@@ -3071,7 +3132,7 @@
 msgstr "Métrica"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "Prefijo"
 
@@ -3146,7 +3207,7 @@
 msgid "Error initializing editor"
 msgstr "Error al inicializar el editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:1159
+#: ../src/connection-editor/nm-connection-editor.c:1157
 msgid "Connection add failed"
 msgstr "Falló al añadir la conexión"
 
@@ -3156,9 +3217,6 @@
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:2
 #, fuzzy
-#| msgid ""
-#| "Set this to true to disable warnings about CA certificates in EAP "
-#| "authentication."
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3242,17 +3300,14 @@
 msgstr[1] "hace %d años"
 
 #: ../src/connection-editor/nm-connection-list.c:445
-#| msgid "Connection cannot be modified"
 msgid "Connection cannot be deleted"
 msgstr "No se puede eliminar la conexión"
 
 #: ../src/connection-editor/nm-connection-list.c:448
-#| msgid "Team connection %d"
 msgid "Select a connection to edit"
 msgstr "Seleccionar una conexión que editar"
 
 #: ../src/connection-editor/nm-connection-list.c:450
-#| msgid "Team connection %d"
 msgid "Select a connection to delete"
 msgstr "Seleccionar una conexión que eliminar"
 
@@ -3305,7 +3360,6 @@
 msgstr "No se encontró una conexión con UUID «%s»"
 
 #: ../src/connection-editor/nm-connection-list.ui.h:2
-#| msgid "_Add a VPN connection…"
 msgid "Add a new connection"
 msgstr "Añadir una conexión nueva"
 
@@ -3368,11 +3422,11 @@
 msgid "Bond connection %d"
 msgstr "Conexión Bond %d"
 
-#: ../src/connection-editor/page-bridge.c:224
+#: ../src/connection-editor/page-bridge.c:236
 msgid "Could not load bridge user interface."
 msgstr "No se pudo cargar la interfaz puente de usuario."
 
-#: ../src/connection-editor/page-bridge.c:328
+#: ../src/connection-editor/page-bridge.c:352
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Conexión puente %d"
@@ -3396,11 +3450,15 @@
 msgid "Could not load DCB user interface."
 msgstr "No se pudo cargar la interfaz de usuario para DCB."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: ../src/connection-editor/page-dsl.c:203
 msgid "Could not load DSL user interface."
 msgstr "No se pudo cargar la interfaz de usuario para DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: ../src/connection-editor/page-dsl.c:298
+msgid "missing parent interface"
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:343
 #, c-format
 msgid "DSL connection %d"
 msgstr "Conexión DSL %d"
@@ -3499,27 +3557,27 @@
 msgstr "Conexión por túnel IP %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "Automático (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "Sólo direcciones automáticas (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "Automático, sólo direcciones"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "Automático (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Sólo direcciones automáticas (PPPoE)"
 
@@ -3532,17 +3590,17 @@
 msgstr "Sólo direcciones automáticas (DHCP)"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "Sólo enlace local"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "Servidores _DNS adicionales:"
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "Dominios de bú_squeda adicionales:"
 
@@ -3579,39 +3637,39 @@
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "Servido DNS IPV4 «%s» no válido"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "Automático, DHCP únicamente"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editando las rutas IPv6 para %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "Ajustes de IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr "No se pudo cargar la interfaz de usuario para IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "Dirección IPV6 «%s» no válida"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "Prefijo IPV6 «%s» no válido"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "Puerta de enlace IPV6 «%s» no válida"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "Servido DNS IPV6 «%s» no válido"
@@ -3969,31 +4027,30 @@
 msgstr "Conexiones de red activas"
 
 #: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
 #, fuzzy
-#| msgid "No CA certificate is _required"
 msgid "No certificate set"
 msgstr "No se necesita ningún ce_rtificado CA"
 
 #: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
 msgid "No key set"
 msgstr ""
 
 #: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Elija una clave para el certificado %s"
 
 #: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
 #, c-format
 msgid "%s private _key:"
 msgstr "Clave pri_vada %s:"
 
 #: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
 #, c-format
 msgid "%s key _password:"
 msgstr "_Contraseña de la clave %s:"
@@ -4004,7 +4061,7 @@
 msgstr "Elija un certificado %s:"
 
 #: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
 msgid "%s _certificate:"
 msgstr "_Certificado %s:"
@@ -4239,12 +4296,12 @@
 msgid "Select from file…"
 msgstr "Seleccionar desde un archivo…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Elija un certificado %s"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s certificate _password:"
 msgstr "Contraseña del certificado %s:"
@@ -4827,693 +4884,3 @@
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "_Tipo:"
-
-#~ msgid "Mode"
-#~ msgstr "Modo"
-
-#~ msgid "MTU"
-#~ msgstr "MTU"
-
-#~ msgid "CKN"
-#~ msgstr "CKN"
-
-#~ msgid "CAK"
-#~ msgstr "CAK"
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection “%s” disconnected because the VPN service stopped."
-#~ msgstr ""
-#~ "\n"
-#~ "La conexión VPN «%s» se desconectó porque se detuvo el servicio VPN."
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection “%s” disconnected."
-#~ msgstr ""
-#~ "\n"
-#~ "La conexión VPN «%s» se ha desconectado."
-
-#~ msgid "unspecified error validating eap-method file"
-#~ msgstr "error no especificado al validar el archivo de método eap"
-
-#~ msgid "invalid EAP-PEAP CA certificate: %s"
-#~ msgstr "certificado CA de EAP-LEAP no válido: %s"
-
-#~ msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-#~ msgstr ""
-#~ "certificado CA de EAP-PEAP no válido: no se ha especificado ningún "
-#~ "certificado"
-
-#~ msgid "Choose a Certificate Authority certificate"
-#~ msgstr "Elija un certificado CA"
-
-#~ msgid "invalid EAP-TLS CA certificate: %s"
-#~ msgstr "Certificado EAP-TLS CA no válido: %s"
-
-#~ msgid "invalid EAP-TLS CA certificate: no certificate specified"
-#~ msgstr ""
-#~ "certificado CA de EAP-TLS no válido: no se ha especificado ningún "
-#~ "certificado"
-
-#~ msgid "invalid EAP-TLS password: missing"
-#~ msgstr "contraseña de EAP-TLS no válida: falta"
-
-#~ msgid "invalid EAP-TLS private-key: %s"
-#~ msgstr "clave privada de EAP-TLS no válida: %s"
-
-#~ msgid "invalid EAP-TLS user-certificate: %s"
-#~ msgstr "certificado de usuario de EAP-TLS no válido: %s"
-
-#~ msgid "Unencrypted private keys are insecure"
-#~ msgstr "Las claves privadas sin cifrar son inseguras"
-
-#~ msgid ""
-#~ "The selected private key does not appear to be protected by a password. "
-#~ "This could allow your security credentials to be compromised. Please "
-#~ "select a password-protected private key.\n"
-#~ "\n"
-#~ "(You can password-protect your private key with openssl)"
-#~ msgstr ""
-#~ "La clave privada seleccionada no parece estar protegida por una "
-#~ "contraseña. Esto podría permitir que sus credenciales de seguridad se "
-#~ "comprometiesen. Seleccione una clave privada protegida por contraseña.\n"
-#~ "\n"
-#~ "(Puede proteger su clave privada con una contraseña con openssl)"
-
-#~ msgid "Choose your personal certificate"
-#~ msgstr "Elija su certificado personal"
-
-#~ msgid "Choose your private key"
-#~ msgstr "Elija su clave privada"
-
-#~ msgid "invalid EAP-TTLS CA certificate: %s"
-#~ msgstr "certificado CA de usuario de EAP-TTLS no válido: %s"
-
-#~ msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-#~ msgstr ""
-#~ "certificado CA de usuario de EAP-TTLS no válido: no se ha especificado "
-#~ "ningún certificado"
-
-#~ msgid "New Mobile Broadband connection..."
-#~ msgstr "Conexión de banda ancha móvil nueva…"
-
-#~ msgid "_Connect to Hidden Wi-Fi Network..."
-#~ msgstr "_Conectar a una red inalámbrica oculta…"
-
-#~ msgid "Create _New Wi-Fi Network..."
-#~ msgstr "Crear una red inalámbrica _nueva…"
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "15"
-#~ msgstr "15"
-
-#~ msgid "Aut_onegotiate"
-#~ msgstr "Aut_onegociar"
-
-#~ msgid "Ad_vanced..."
-#~ msgstr "Avanzada…"
-
-#~ msgid "FirewallD is not running."
-#~ msgstr "FirewallD no se está ejecutando."
-
-#~ msgid "New..."
-#~ msgstr "Nueva…"
-
-#~ msgid "NetworkManager for GNOME"
-#~ msgstr "Gestor de la red para GNOME"
-
-#~ msgid "_Disconnect VPN"
-#~ msgstr "_Desconectar VPN"
-
-#~ msgid "_Help"
-#~ msgstr "Ay_uda"
-
-#~ msgid "bdaddr"
-#~ msgstr "bdaddr"
-
-#~ msgid "Infrastructure"
-#~ msgstr "Infraestructura"
-
-#~ msgid "I_mport team configuration from a file..."
-#~ msgstr "I_mportar configuración redundada desde un archivo…"
-
-#~ msgid "Enable WiMA_X Mobile Broadband"
-#~ msgstr "Activar la banda ancha móvil WiMA_X"
-
-#~ msgid "You are now connected to the bonded network."
-#~ msgstr "Ahora está conectado a la red redundada."
-
-#~ msgid "Preparing bond connection '%s'..."
-#~ msgstr "Preparando la conexión redundada «%s»…"
-
-#~ msgid "Configuring bond connection '%s'..."
-#~ msgstr "Configurando la conexión redundada «%s»…"
-
-#~ msgid "User authentication required for bond connection '%s'..."
-#~ msgstr ""
-#~ "Se necesita autenticación de usuario para la conexión redundada «%s»…"
-
-#~ msgid "Requesting address for '%s'..."
-#~ msgstr "Solicitando una dirección para «%s»…"
-
-#~ msgid "Bond connection '%s' active"
-#~ msgstr "Conexión redundada «%s» activa"
-
-#~ msgid "You are now connected to the bridged network."
-#~ msgstr "Ahora está conectado a la red puente."
-
-#~ msgid "Preparing bridge connection '%s'..."
-#~ msgstr "Preparando la conexión puente «%s»…"
-
-#~ msgid "Configuring bridge connection '%s'..."
-#~ msgstr "Configurando la conexión puente «%s»…"
-
-#~ msgid "User authentication required for bridge connection '%s'..."
-#~ msgstr "Se necesita autenticación de usuario para la conexión puente «%s»…"
-
-#~ msgid "Bridge connection '%s' active"
-#~ msgstr "Conexión puente «%s» activa"
-
-#~ msgid "Auto InfiniBand"
-#~ msgstr "Auto InfiniBand"
-
-#~ msgid "InfiniBand Networks (%s)"
-#~ msgstr "Redes InfiniBand (%s)"
-
-#~ msgid "InfiniBand Network (%s)"
-#~ msgstr "Red InfiniBand (%s)"
-
-#~ msgid "InfiniBand Networks"
-#~ msgstr "Redes InfiniBand"
-
-#~ msgid "InfiniBand Network"
-#~ msgstr "Red InfiniBand"
-
-#~ msgid "You are now connected to the InfiniBand network."
-#~ msgstr "Ahora está conectado a la red InfiniBand."
-
-#~ msgid "Preparing InfiniBand connection '%s'..."
-#~ msgstr "Preparando la conexión InfiniBand «%s»…"
-
-#~ msgid "Configuring InfiniBand connection '%s'..."
-#~ msgstr "Configurando la conexión InfiniBand «%s»…"
-
-#~ msgid "User authentication required for InfiniBand connection '%s'..."
-#~ msgstr ""
-#~ "Se necesita autenticación de usuario para la conexión InfiniBand «%s»…"
-
-#~ msgid "InfiniBand connection '%s' active"
-#~ msgstr "Conexión InfiniBand «%s» activa"
-
-#~ msgid "You are now connected to the teamed network."
-#~ msgstr "Ahora está conectado a la red redundada."
-
-#~ msgid "Preparing team connection '%s'..."
-#~ msgstr "Preparando la conexión redundada «%s»…"
-
-#~ msgid "Configuring team connection '%s'..."
-#~ msgstr "Configurando la conexión redundada «%s»…"
-
-#~ msgid "User authentication required for team connection '%s'..."
-#~ msgstr ""
-#~ "Se necesita autenticación de usuario para la conexión redundada «%s»…"
-
-#~ msgid "Team connection '%s' active"
-#~ msgstr "Conexión redundada «%s» activa"
-
-#~ msgid "You are now connected to the VLAN."
-#~ msgstr "Ahora está conectado a la VLAN."
-
-#~ msgid "Preparing VLAN connection '%s'..."
-#~ msgstr "Preparando la conexión VLAN «%s»…"
-
-#~ msgid "Configuring VLAN connection '%s'..."
-#~ msgstr "Configurando la conexión VLAN «%s»…"
-
-#~ msgid "User authentication required for VLAN connection '%s'..."
-#~ msgstr "Se necesita autenticación de usuario para la conexión VLAN «%s»…"
-
-#~ msgid "VLAN connection '%s' active"
-#~ msgstr "Conexión VLAN «%s» activa"
-
-#~ msgid "WiMAX Mobile Broadband (%s)"
-#~ msgstr "Banda ancha móvil WiMAX (%s)"
-
-#~ msgid "WiMAX Mobile Broadband"
-#~ msgstr "Banda ancha móvil WiMAX"
-
-#~ msgid "WiMAX is disabled"
-#~ msgstr "WiMAX está desactivada"
-
-#~ msgid "WiMAX is disabled by hardware switch"
-#~ msgstr "WiMAX está desactivada por el interruptor físico"
-
-#~ msgid "You are now connected to the WiMAX network."
-#~ msgstr "Ahora está conectado a la red WiMAX."
-
-#~ msgid "%d dB"
-#~ msgstr "%d dB"
-
-#~ msgctxt "WiMAX CINR"
-#~ msgid "unknown"
-#~ msgstr "Desconocido"
-
-#~ msgctxt "WiMAX Base Station ID"
-#~ msgid "unknown"
-#~ msgstr "Desconocido"
-
-#~ msgid "WiMAX (%s)"
-#~ msgstr "WiMAX (%s)"
-
-#~ msgid "CINR:"
-#~ msgstr "CINR:"
-
-#~ msgid "BSID:"
-#~ msgstr "BSID:"
-
-#~ msgid "WiMAX"
-#~ msgstr "WiMAX"
-
-#~ msgid "_Device MAC address:"
-#~ msgstr "Dirección MAC del _dispositivo:"
-
-#~ msgid "New Mobile Broadband (CDMA) connection..."
-#~ msgstr "Conexión de banda ancha móvil (CDMA) nueva…"
-
-#~ msgid "You are now connected to the CDMA network."
-#~ msgstr "Ahora está conectado a la red CDMA."
-
-#~ msgid "CDMA network."
-#~ msgstr "Red CDMA."
-
-#~ msgid "New Mobile Broadband (GSM) connection..."
-#~ msgstr "Conexión de banda ancha móvil (GSM) nueva…"
-
-#~ msgid "You are now connected to the GSM network."
-#~ msgstr "Ahora está conectado a la red GSM."
-
-#~ msgid "GSM network."
-#~ msgstr "Red GSM."
-
-#~ msgid "Any"
-#~ msgstr "Cualquiera"
-
-#~ msgid "3G (UMTS/HSPA)"
-#~ msgstr "3G (UMTS/HSPA)"
-
-#~ msgid "2G (GPRS/EDGE)"
-#~ msgstr "2G (GPRS/EDGE)"
-
-#~ msgid "Prefer 3G (UMTS/HSPA)"
-#~ msgstr "Preferir 3G (UMTS/HSPA)"
-
-#~ msgid "Prefer 2G (GPRS/EDGE)"
-#~ msgstr "Preferir 2G (GPRS/EDGE)"
-
-#~ msgid "Prefer 4G (LTE)"
-#~ msgstr "Preferir 4G (LTE)"
-
-#~ msgid "Use only 4G (LTE)"
-#~ msgstr "Usar sólo 4G (LTE)"
-
-#~ msgid "Error saving connection"
-#~ msgstr "Error al guardar la conexión"
-
-#~ msgid "The property '%s' / '%s' is invalid: %d"
-#~ msgstr "La propiedad «%s» / «%s» no es válida: %d"
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
-#~ "%s)."
-#~ msgstr ""
-#~ "La configuración de Bluetooth no es posible (No se pudo conectar a D-Bus: "
-#~ "(%s) %s)."
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
-#~ "%s)."
-#~ msgstr ""
-#~ "La configuración de Bluetooth no es posible (error al buscar "
-#~ "NetworkManager: (%s) %s)."
-
-#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
-#~ msgstr "Usar su teléfono móvil como un dispositivo de red (PAN/NAP)"
-
-#~ msgid "Access the Internet using your mobile phone (DUN)"
-#~ msgstr "Acceder a Internet usando su teléfono móvil (DUN)"
-
-#~ msgid "Error: %s"
-#~ msgstr "Error: %s"
-
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Falló al crear la conexión DUN: %s"
-
-#~ msgid "Your phone is now ready to use!"
-#~ msgstr "Su teléfono está listo para usarse"
-
-#~ msgid "Mobile wizard was canceled"
-#~ msgstr "Se canceló el asistente móvil"
-
-#~ msgid "Unknown phone device type (not GSM or CDMA)"
-#~ msgstr "Tipo de dispositivo de teléfono desconocido (no es GSM ni CDMA)"
-
-#~ msgid "failed to connect to the phone."
-#~ msgstr "falló al conectar con el teléfono."
-
-#~ msgid "error getting bus connection"
-#~ msgstr "error al obtener la conexión al bus"
-
-#~ msgid "unexpectedly disconnected from the phone."
-#~ msgstr "el teléfono se desconectó de forma inesperada."
-
-#~ msgid "timed out detecting phone details."
-#~ msgstr "expiró el tiempo al detectar los detalles del teléfono."
-
-#~ msgid "Detecting phone configuration..."
-#~ msgstr "Detectando la configuración del teléfono…"
-
-#~ msgid ""
-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-#~ "Networking connection."
-#~ msgstr ""
-#~ "El adaptador de Bluetooth predeterminado debe estar activado antes de "
-#~ "configurar una conexión de red de marcado telefónico."
-
-#~ msgid "Failed to create PAN connection: %s"
-#~ msgstr "Falló al crear la conexión PAN: %s"
-
-#~ msgid "%s Network"
-#~ msgstr "Red %s"
-
-#~ msgid "Primary DNS:"
-#~ msgstr "DNS primario:"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS secundario:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS terciario:"
-
-#~ msgid "Automatic (PPP)"
-#~ msgstr "Automático (PPP)"
-
-#~ msgid "Automatic (PPP) addresses only"
-#~ msgstr "Sólo direcciones automáticas (PPP)"
-
-#~ msgid "unknown modem type."
-#~ msgstr "tipo de módem desconocido."
-
-#~ msgid "_Save..."
-#~ msgstr "_Guardar…"
-
-#~ msgid "_Edit..."
-#~ msgstr "_Editar…"
-
-#~ msgid "_Delete..."
-#~ msgstr "_Eliminar…"
-
-#~ msgid "No Certificate Authority certificate chosen"
-#~ msgstr "No se ha elegido ningún certificado CA"
-
-#~ msgid ""
-#~ "Not using a Certificate Authority (CA) certificate can result in "
-#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
-#~ "a Certificate Authority certificate?"
-#~ msgstr ""
-#~ "No usar un certificado de Certificate Authority (CA) puede dar lugar a "
-#~ "conexiones inseguras a redes inalámbricas promiscuas. ¿Quiere elegir un "
-#~ "certificado Certificate Authority?"
-
-#~ msgid "No"
-#~ msgstr "No"
-
-#~ msgid "Yes"
-#~ msgstr "Sí"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "Conectar _automáticamente"
-
-#~ msgid "A_vailable to all users"
-#~ msgstr "Disponible para _todos los usuarios"
-
-#~ msgid "An unknown error occurred."
-#~ msgstr "Ocurrió un error desconocido."
-
-#~ msgid "Could not edit new connection"
-#~ msgstr "No se pudo editar la conexión nueva"
-
-#~ msgid "Wireless Networks (%s)"
-#~ msgstr "Redes inalámbricas (%s)"
-
-#~ msgid "Wireless Network (%s)"
-#~ msgstr "Red inalámbrica (%s)"
-
-#~ msgid "Wireless Network"
-#~ msgid_plural "Wireless Networks"
-#~ msgstr[0] "Red inalámbrica"
-#~ msgstr[1] "Redes inalámbricas"
-
-#~ msgid "wireless is disabled"
-#~ msgstr "la red inalámbrica está desactivada"
-
-#~ msgid "wireless is disabled by hardware switch"
-#~ msgstr "la red inalámbrica está desactivada por el interruptor físico"
-
-#~ msgid "Preparing wireless network connection '%s'..."
-#~ msgstr "Preparando la conexión de red inalámbrica «%s»…"
-
-#~ msgid "Configuring wireless network connection '%s'..."
-#~ msgstr "Configurando la conexión de red inalámbrica «%s»…"
-
-#~ msgid "Requesting a wireless network address for '%s'..."
-#~ msgstr "Solicitando una dirección de red inalámbrica para «%s»…"
-
-#~ msgid "Wireless network connection '%s' active"
-#~ msgstr "La conexión de red «%s» está activa"
-
-#~ msgid "Wireless"
-#~ msgstr "Inalámbrico"
-
-#~ msgid "Could not load Wired Security security user interface."
-#~ msgstr "No se pudo cargar la interfaz de usuario de seguridad cableada."
-
-#~ msgid "Wireless connection %d"
-#~ msgstr "Conexión inalámbrica %d"
-
-#~ msgid ""
-#~ "failed to find Bluetooth device (unknown gnome-bluetooth proxy object "
-#~ "type)."
-#~ msgstr ""
-#~ "falló al buscar el dispositivo Bluetooth (tipo de objeto de proxy gnome-"
-#~ "bluetooth desconocido)"
-
-#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-#~ msgstr ""
-#~ "La configuración de Bluetooth no es posible (No se pudo crear proxy D-Bus)"
-
-#~ msgid "Could not edit imported connection"
-#~ msgstr "No se pudo editar la conexión importada"
-
-#~ msgid "No VPN plugin available. Please install one to enable this button."
-#~ msgstr ""
-#~ "No existe un complemento de VPN disponible. Instale uno para activar este "
-#~ "botón."
-
-#~ msgid "Don't know how to edit '%s' connections"
-#~ msgstr "Se desconoce cómo editar conexiones «%s»"
-
-#~ msgid "_Security:"
-#~ msgstr "_Seguridad:"
-
-#~ msgid "Click on this icon to connect to a wireless network"
-#~ msgstr "Pulse sobre este icono para conectarse a una red inalámbrica"
-
-#~ msgid "United Kingdom"
-#~ msgstr "Reino Unido"
-
-#~ msgid "Other Wireless Network..."
-#~ msgstr "Otras redes inalámbricas…"
-
-#~ msgid "An instance of nm-applet is already running.\n"
-#~ msgstr "Ya existe una instancia de nm-applet en ejecución.\n"
-
-#~ msgid "Could not acquire the %s service. (%d)\n"
-#~ msgstr "No se pudo adquirir el servicio %s. (%d)\n"
-
-#~ msgid "could not connect to the system bus."
-#~ msgstr "no se pudo conectar con el bus del sistema."
-
-#~ msgid "Cannot start VPN connection '%s'"
-#~ msgstr "No se puede iniciar la conexión VPN «%s»"
-
-#~ msgid ""
-#~ "Could not find the authentication dialog for VPN connection type '%s'. "
-#~ "Contact your system administrator."
-#~ msgstr ""
-#~ "No se ha podido encontrar el diálogo de autenticación para el tipo de "
-#~ "conexión VPN «%s». Póngase en contacto con su administrador de sistemas."
-
-#~ msgid ""
-#~ "There was a problem launching the authentication dialog for VPN "
-#~ "connection type '%s'. Contact your system administrator."
-#~ msgstr ""
-#~ "Ha habido un problema al iniciar el diálogo de autenticación para el tipo "
-#~ "de conexión VPN «%s». Póngase en contacto con su administrador de "
-#~ "sistemas."
-
-#~ msgid "Country"
-#~ msgstr "País"
-
-#~ msgid "Create…"
-#~ msgstr "Crear…"
-
-#~| msgid ""
-#~| "The connection editor could not find some required resources (the "
-#~| "NetworkManager applet glade file was not found)."
-#~ msgid ""
-#~ "The connection editor could not find some required resources (the "
-#~ "NetworkManager applet .ui file was not found)."
-#~ msgstr ""
-#~ "El editor de la conexión no pudo encontrar algunos archivos de recursos "
-#~ "(no se encontró el archivo .iu de la miniaplicación Gestor de red)."
-
-#~ msgid ""
-#~ "Active Network Connections"
-#~ msgstr ""
-#~ "Conexiones de red activas"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "Version 0\n"
-#~ "Version 1"
-#~ msgstr ""
-#~ "Automático\n"
-#~ "Versión 0\n"
-#~ "Versión 1"
-
-#~ msgid "Addresses"
-#~ msgstr "Direcciones"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "Automatic with manual DNS settings\n"
-#~ "Manual\n"
-#~ "Link-Local\n"
-#~ "Shared to other computers"
-#~ msgstr ""
-#~ "Automático\n"
-#~ "Automático con ajustes DNS manuales\n"
-#~ "Manual\n"
-#~ "Enlace local\n"
-#~ "Compartida con otros equipos"
-
-#~ msgid "Basic"
-#~ msgstr "Básico"
-
-#~ msgid ""
-#~ "Any\n"
-#~ "3G (UMTS/HSPA)\n"
-#~ "2G (GPRS/EDGE)\n"
-#~ "Prefer 3G (UMTS/HSPA)\n"
-#~ "Prefer 2G (GPRS/EDGE)"
-#~ msgstr ""
-#~ "Cualquiera\n"
-#~ "3G (UMTS/HSPA)\n"
-#~ "2G (GPRS/EDGE)\n"
-#~ "Preferir 3G (UMTS/HSPA)\n"
-#~ "Preferir 2G (GPRS/EDGE)"
-
-#~ msgid "Authentication"
-#~ msgstr "Autenticación"
-
-#~ msgid "Echo"
-#~ msgstr "Echo"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "10 Mb/s\n"
-#~ "100 Mb/s\n"
-#~ "1 Gb/s\n"
-#~ "10 Gb/s"
-#~ msgstr ""
-#~ "Automático\n"
-#~ "10 Mb/s\n"
-#~ "100 Mb/s\n"
-#~ "1 Gb/s\n"
-#~ "10 Gb/s"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "Twisted Pair (TP)\n"
-#~ "Attachment Unit Interface (AUI)\n"
-#~ "BNC\n"
-#~ "Media Independent Interface (MII)"
-#~ msgstr ""
-#~ "Automático\n"
-#~ "Par cruzado (TP)\n"
-#~ "Unidad de interfaz adjunto (AUI)\n"
-#~ "BNC\n"
-#~ "Interfaz de medios independiente (MII)"
-
-#~ msgid ""
-#~ "Automatic\n"
-#~ "A (5 GHz)\n"
-#~ "B/G (2.4 GHz)"
-#~ msgstr ""
-#~ "Automático\n"
-#~ "A (5 GHz)\n"
-#~ "B/G (2.4 GHz)"
-
-#~ msgid "Apply"
-#~ msgstr "Aplicar"
-
-#~ msgid "Apply..."
-#~ msgstr "Aplicar…"
-
-#~ msgid "PUK code required"
-#~ msgstr "Se necesita un código PUK"
-
-#~ msgid "PUK code is needed for the mobile broadband device"
-#~ msgstr "Se necesita un código PUK para el dispositivo de banda ancha móvil"
-
-#~ msgctxt "No wired security used"
-#~ msgid "None"
-#~ msgstr "Ninguna"
-
-#~ msgctxt "Unknown/unrecognized wired or wifi security"
-#~ msgid "Unknown"
-#~ msgstr "Desconocido"
-
-#~| msgid "Sho_w key"
-#~ msgid "Show it"
-#~ msgstr "Mostrarlo"
-
-#~ msgid "Save this connection for all users of this machine."
-#~ msgstr "Guardar esta conexión para todos los usuarios en este equipo."
diff -Nru network-manager-applet-1.8.4/po/fr.po network-manager-applet-1.8.10/po/fr.po
--- network-manager-applet-1.8.4/po/fr.po	2017-05-10 10:44:54.000000000 +0000
+++ network-manager-applet-1.8.10/po/fr.po	2017-12-19 11:44:30.000000000 +0000
@@ -11,22 +11,23 @@
 # Sam Friedmann , 2010.
 # Bruno Brouard , 2010-2012.
 # Alain Lojewski , 2013-2014.
-#
+# lrintel , 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: fr\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
-"PO-Revision-Date: 2015-09-01 11:10+0200\n"
-"Last-Translator: Claude Paroz \n"
+"POT-Creation-Date: 2017-12-12 11:18+0100\n"
+"PO-Revision-Date: 2017-11-07 06:45+0000\n"
+"Last-Translator: Copied by Zanata \n"
 "Language-Team: GNOME French TEAM \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
+"X-Generator: Zanata 4.3.2\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
 msgstr "Réseau"
 
@@ -35,7 +36,7 @@
 msgstr "Gérer vos connexions réseau"
 
 #: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: ../src/connection-editor/nm-connection-list.ui.h:1
 msgid "Network Connections"
 msgstr "Connexions réseau"
 
@@ -165,55 +166,68 @@
 msgid "The NetworkManager Developers"
 msgstr "Applet NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
 
-#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Authentification 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1
+#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
+#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
 #: ../src/connection-editor/ce-new-connection.ui.h:1
 #: ../src/connection-editor/ce-page-dcb.ui.h:17
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/connection-editor/connection-helpers.c:308
+#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/page-bluetooth.c:311
+#: ../src/connection-editor/page-mobile.c:543
+#: ../src/connection-editor/page-proxy.c:121
+#: ../src/connection-editor/page-team.c:344
+#: ../src/connection-editor/page-team-port.c:206
+#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
+#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/libnma/nma-vpn-password-dialog.c:209
+#: ../src/libnma/nma-wifi-dialog.c:1066
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "Se _connecter"
 
@@ -230,38 +244,38 @@
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: ../src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Échec de l'ajout/création de la connexion"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Échec de la connexion"
 
-#: ../src/applet.c:435
+#: ../src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "La déconnexion du périphérique a échoué"
 
-#: ../src/applet.c:440
+#: ../src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Échec de la déconnexion"
 
-#: ../src/applet.c:470
+#: ../src/applet.c:481
 msgid "Connection activation failed"
 msgstr "L'activation de la connexion a échoué"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Ne plus m'avertir"
 
-#: ../src/applet.c:883
+#: ../src/applet.c:899
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -272,7 +286,7 @@
 "La connexion VPN « %s » a été déconnectée car la connexion réseau a été "
 "interrompue."
 
-#: ../src/applet.c:885
+#: ../src/applet.c:901
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -282,7 +296,7 @@
 "\n"
 "La connexion VPN « %s » a échoué car la connexion réseau a été interrompue."
 
-#: ../src/applet.c:887
+#: ../src/applet.c:903
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -292,7 +306,7 @@
 "La connexion VPN « %s » a échoué car le service VPN a été arrêté de manière "
 "inattendue."
 
-#: ../src/applet.c:889
+#: ../src/applet.c:905
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -303,7 +317,7 @@
 "La connexion VPN « %s » a échoué car le service VPN a renvoyé une "
 "configuration invalide."
 
-#: ../src/applet.c:891
+#: ../src/applet.c:907
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -312,7 +326,7 @@
 "\n"
 "La connexion VPN « %s » a échoué car le délai de connexion est dépassé."
 
-#: ../src/applet.c:893
+#: ../src/applet.c:909
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -321,7 +335,7 @@
 "\n"
 "La connexion VPN « %s » a échoué car le service VPN n'a pas démarré à temps."
 
-#: ../src/applet.c:895
+#: ../src/applet.c:911
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -330,7 +344,7 @@
 "\n"
 "La connexion VPN « %s » a échoué car le démarrage du service VPN a échoué."
 
-#: ../src/applet.c:897
+#: ../src/applet.c:913
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -339,7 +353,7 @@
 "\n"
 "La connexion VPN « %s » a échoué car il n'y avait pas de secrets VPN valides."
 
-#: ../src/applet.c:899
+#: ../src/applet.c:915
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -348,7 +362,7 @@
 "\n"
 "La connexion VPN « %s » a échoué en raison de secrets VPN non valides."
 
-#: ../src/applet.c:904
+#: ../src/applet.c:920
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -357,7 +371,7 @@
 "\n"
 "La connexion VPN « %s » a échoué."
 
-#: ../src/applet.c:931
+#: ../src/applet.c:947
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -368,19 +382,19 @@
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: ../src/applet.c:949
 msgid "VPN connection has been successfully established.\n"
 msgstr "La connexion VPN a été établie avec succès.\n"
 
-#: ../src/applet.c:935
+#: ../src/applet.c:951
 msgid "VPN Login Message"
 msgstr "Message d'identification VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: ../src/applet.c:959 ../src/applet.c:999
 msgid "VPN Connection Failed"
 msgstr "La connexion VPN a échoué"
 
-#: ../src/applet.c:987
+#: ../src/applet.c:1003
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -393,7 +407,7 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: ../src/applet.c:1006
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -406,148 +420,148 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: ../src/applet.c:1295
 msgid "device not ready (firmware missing)"
 msgstr "périphérique non prêt (micrologiciel manquant)"
 
-#: ../src/applet.c:1281
+#: ../src/applet.c:1297
 msgid "device not ready"
 msgstr "périphérique non prêt"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "déconnecté"
 
-#: ../src/applet.c:1307
+#: ../src/applet.c:1323
 msgid "Disconnect"
 msgstr "Se déconnecter"
 
-#: ../src/applet.c:1321
+#: ../src/applet.c:1337
 msgid "device not managed"
 msgstr "périphérique non géré"
 
-#: ../src/applet.c:1394
+#: ../src/applet.c:1410
 msgid "No network devices available"
 msgstr "Aucun périphérique réseau disponible"
 
-#: ../src/applet.c:1448
+#: ../src/applet.c:1464
 msgid "_VPN Connections"
 msgstr "_Connexions VPN"
 
-#: ../src/applet.c:1492
+#: ../src/applet.c:1508
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Configurer le VPN..."
 
-#: ../src/applet.c:1495
+#: ../src/applet.c:1511
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_Connexions VPN"
 
-#: ../src/applet.c:1601
+#: ../src/applet.c:1617
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager n'est pas lancé..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: ../src/applet.c:1622 ../src/applet.c:2687
 msgid "Networking disabled"
 msgstr "Réseau désactivé"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: ../src/applet.c:1832
 msgid "Enable _Networking"
 msgstr "Activer le _réseau"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: ../src/applet.c:1841
 msgid "Enable _Wi-Fi"
 msgstr "Activer le réseau _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: ../src/applet.c:1850
 msgid "Enable _Mobile Broadband"
 msgstr "Activer la connexion _mobile"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: ../src/applet.c:1862
 msgid "Enable N_otifications"
 msgstr "Activer les _notifications"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: ../src/applet.c:1874
 msgid "Connection _Information"
 msgstr "_Informations sur la connexion"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: ../src/applet.c:1882
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Modification des connexions..."
 
-#: ../src/applet.c:1880
+#: ../src/applet.c:1896
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/applet.c:2191
+#: ../src/applet.c:2207
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Vous êtes maintenant connecté à « %s »."
 
-#: ../src/applet.c:2231
+#: ../src/applet.c:2247
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: ../src/applet.c:2232
+#: ../src/applet.c:2248
 msgid "The network connection has been disconnected."
 msgstr "La connexion réseau a été déconnectée."
 
-#: ../src/applet.c:2534
+#: ../src/applet.c:2550
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Préparation de la connexion réseau « %s »..."
 
-#: ../src/applet.c:2537
+#: ../src/applet.c:2553
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Authentification nécessaire pour la connexion réseau « %s »..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Obtention d'une adresse réseau pour « %s »..."
 
-#: ../src/applet.c:2543
+#: ../src/applet.c:2559
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Connexion réseau « %s » active"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2632
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Démarrage de la connexion VPN « %s »..."
 
-#: ../src/applet.c:2619
+#: ../src/applet.c:2635
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Authentification nécessaire pour la connexion VPN « %s »..."
 
-#: ../src/applet.c:2622
+#: ../src/applet.c:2638
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Obtention d'une adresse VPN pour « %s »..."
 
-#: ../src/applet.c:2625
+#: ../src/applet.c:2641
 #, fuzzy, c-format
 msgid "VPN connection active"
 msgstr "Connexion VPN « %s » active"
 
-#: ../src/applet.c:2675
+#: ../src/applet.c:2691
 msgid "No network connection"
 msgstr "Aucune connexion réseau"
 
-#: ../src/applet.c:3276
+#: ../src/applet.c:3292
 msgid "NetworkManager Applet"
 msgstr "Applet NetworkManager"
 
@@ -565,47 +579,47 @@
 msgid "Sending unlock code…"
 msgstr "Envoi du code de déverrouillage..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Connexion mobile (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/applet-device-broadband.c:739
+#: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Connexion mobile"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Disponible"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Nouvelle connexion mobile"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Connexion établie"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Vous êtes maintenant connecté au réseau mobile."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "Réseau mobile."
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "Vous êtes maintenant enregistré sur le réseau domestique."
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "Vous êtes maintenant enregistré sur un réseau itinérant."
 
@@ -613,23 +627,23 @@
 msgid "You are now connected to the mobile broadband network."
 msgstr "Vous êtes maintenant connecté au réseau mobile."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Préparation de la connexion mobile « %s »..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Configuration de la connexion mobile « %s »..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Authentification personnelle nécessaire pour la connexion mobile « %s »..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Connexion mobile « %s » active"
@@ -690,6 +704,18 @@
 msgid "DSL authentication"
 msgstr "Authentification DSL"
 
+#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/page-bluetooth.c:313
+#: ../src/connection-editor/page-mobile.c:545
+#: ../src/libnma/nma-vpn-password-dialog.c:210
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
 #: ../src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
@@ -704,7 +730,7 @@
 msgid "(none)"
 msgstr "(aucun)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "L'ajout de la nouvelle connexion a échoué"
 
@@ -712,78 +738,78 @@
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Réseaux Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Réseau Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Réseau Wi-Fi"
 msgstr[1] "Réseaux Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "le Wi-Fi est désactivé"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "le Wi-Fi est désactivé par un commutateur matériel"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Plus de réseaux"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Réseaux Wi-Fi disponibles"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Utilisez le menu réseau pour vous connecter à un réseau Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Vous êtes maintenant connecté au réseau Wi-Fi « %s »."
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Préparation de la connexion réseau Wi-Fi « %s »..."
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Configuration de la connexion au réseau Wi-Fi « %s »..."
 
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Authentification nécessaire pour le réseau Wi-Fi « %s »..."
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Obtention d'une adresse réseau Wi-Fi pour « %s »..."
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Connexion au réseau Wi-Fi « %s » active : %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Connexion au réseau Wi-Fi « %s » active"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "L'activation de la connexion a échoué"
 
@@ -791,197 +817,197 @@
 msgid "Error displaying connection information:"
 msgstr "Erreur lors de l'affichage des informations de connexion :"
 
-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
 #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: ../src/applet-dialogs.c:75
 msgid "Dynamic WEP"
 msgstr "WEP dynamique"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:231
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: ../src/applet-dialogs.c:152
 #, fuzzy
 msgid "More addresses"
 msgstr "Adresses"
 
-#: ../src/applet-dialogs.c:226
+#: ../src/applet-dialogs.c:227
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
+#: ../src/connection-editor/page-wifi-security.c:332
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Aucune"
 
-#: ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:261
 #, c-format
 msgid "%s (default)"
 msgstr "%s (par défaut)"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Inconnue"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Inconnue"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
 msgid "IP Address:"
 msgstr "Adresse IP :"
 
-#: ../src/applet-dialogs.c:369
+#: ../src/applet-dialogs.c:370
 msgid "Broadcast Address:"
 msgstr "Adresse de broadcast :"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: ../src/applet-dialogs.c:382
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:383
 msgid "Subnet Mask:"
 msgstr "Masque de sous-réseau :"
 
-#: ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:493
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:496
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "Wi-Fi 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: ../src/applet-dialogs.c:503
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: ../src/applet-dialogs.c:505
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
 #: ../src/connection-editor/ce-page-team-port.ui.h:23
 #: ../src/connection-editor/ce-page-team.ui.h:48
 #: ../src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Général"
 
-#: ../src/applet-dialogs.c:516
+#: ../src/applet-dialogs.c:517
 msgid "Interface:"
 msgstr "Interface :"
 
-#: ../src/applet-dialogs.c:536
+#: ../src/applet-dialogs.c:537
 msgid "Hardware Address:"
 msgstr "Adresse matérielle :"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:551
 msgid "Driver:"
 msgstr "Pilote :"
 
-#: ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:586
 msgid "Speed:"
 msgstr "Vitesse :"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:601
 msgid "Security:"
 msgstr "Sécurité :"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
 #: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
 msgid "Default Route:"
 msgstr "Route par défaut :"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
 #: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
 msgid "Ignored"
 msgstr "Ignoré"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:816
 msgid "VPN Type:"
 msgstr "Type de VPN :"
 
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:823
 msgid "VPN Gateway:"
 msgstr "Passerelle pour le VPN"
 
-#: ../src/applet-dialogs.c:828
+#: ../src/applet-dialogs.c:829
 msgid "VPN Username:"
 msgstr "Nom d'utilisateur pour le VPN :"
 
-#: ../src/applet-dialogs.c:834
+#: ../src/applet-dialogs.c:835
 msgid "VPN Banner:"
 msgstr "Bannière pour le VPN :"
 
-#: ../src/applet-dialogs.c:840
+#: ../src/applet-dialogs.c:841
 msgid "Base Connection:"
 msgstr "Connexion de base :"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Inconnue"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: ../src/applet-dialogs.c:958
 msgid "No valid active connections found!"
 msgstr "Aucune connexion valide active trouvée !"
 
-#: ../src/applet-dialogs.c:985
-#, fuzzy
+#: ../src/applet-dialogs.c:1007
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc.\n"
-"et beaucoup d'autres contributeurs et traducteurs de la communauté"
 
-#: ../src/applet-dialogs.c:988
+#: ../src/applet-dialogs.c:1010
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Une zone de notification pour gérer vos périphériques réseaux et vos "
 "connexions."
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1012
 msgid "NetworkManager Website"
 msgstr "Site Web de NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: ../src/applet-dialogs.c:1016
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1026
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -989,33 +1015,33 @@
 "L'applet NetworkManager n'a pas pu trouver les ressources requises (le "
 "fichier .ui n'a pas été trouvé)."
 
-#: ../src/applet-dialogs.c:1006
+#: ../src/applet-dialogs.c:1031
 msgid "Missing resources"
 msgstr "Ressources manquantes"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1057
 msgid "Mobile broadband network password"
 msgstr "Mot de passe du réseau mobile"
 
-#: ../src/applet-dialogs.c:1040
+#: ../src/applet-dialogs.c:1066
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Un mot de passe est requis pour vous connecter à « %s »."
 
-#: ../src/applet-dialogs.c:1055
+#: ../src/applet-dialogs.c:1081
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1363
 msgid "SIM PIN unlock required"
 msgstr "Déverrouillage SIM PIN requis"
 
-#: ../src/applet-dialogs.c:1338
+#: ../src/applet-dialogs.c:1364
 msgid "SIM PIN Unlock Required"
 msgstr "Déverrouillage SIM PIN requis"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1366
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1025,25 +1051,25 @@
 "utilisé."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1368
 msgid "PIN code:"
 msgstr "Code PIN :"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1372
 msgid "Show PIN code"
 msgstr "Afficher le code PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1374
 msgid "SIM PUK unlock required"
 msgstr "Déverrouillage SIM PUK requis"
 
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1375
 msgid "SIM PUK Unlock Required"
 msgstr "Déverrouillage SIM PUK requis"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: ../src/applet-dialogs.c:1377
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1053,30 +1079,37 @@
 "utilisé."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1379
 msgid "PUK code:"
 msgstr "Code PUK :"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: ../src/applet-dialogs.c:1382
 msgid "New PIN code:"
 msgstr "Nouveau code PIN :"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: ../src/applet-dialogs.c:1384
 msgid "Re-enter new PIN code:"
 msgstr "Resaisissez le nouveau code PIN :"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: ../src/applet-dialogs.c:1389
 msgid "Show PIN/PUK codes"
 msgstr "Afficher les codes PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: ../src/applet-vpn-request.c:201
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Informations sur la connexion"
+
+#: ../src/applet-vpn-request.c:251
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "L'activation de la connexion a échoué"
+
+#: ../src/applet-vpn-request.c:259
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
@@ -1095,21 +1128,21 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
 msgstr ""
 
-#. Delete
 #: ../src/connection-editor/ce-ip4-routes.ui.h:5
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/nm-connection-list.c:711
+#: ../src/connection-editor/connection-helpers.c:772
+#: ../src/connection-editor/nm-connection-list.ui.h:4
 msgid "_Delete"
 msgstr "_Supprimer"
 
@@ -1201,11 +1234,10 @@
 msgid "M_ode:"
 msgstr "M_ode :"
 
-#. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: ../src/connection-editor/nm-connection-list.ui.h:5
 msgid "_Edit"
 msgstr "_Modifier"
 
@@ -1261,7 +1293,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 #: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
@@ -1270,7 +1302,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-infiniband.ui.h:7
 #: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
@@ -1303,26 +1335,72 @@
 msgstr "Délai _hello :"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Activer le _réseau"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:14
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Activer _STP (protocole Spanning Tree)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:15
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:16
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:17
 msgid "_Max age:"
 msgstr "_Durée maximum :"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:18
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:19
 msgid "_Aging time:"
 msgstr "_Durée de vie :"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:20
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:21
+msgid "Group _forward mask:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:22
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
 #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatique"
@@ -1596,10 +1674,20 @@
 msgstr "Nom d'_utilisateur :"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
 msgid "_Service:"
 msgstr "_Service :"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:5
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 #: ../src/wireless-security/ws-leap.ui.h:3
@@ -1607,7 +1695,11 @@
 msgid "Sho_w password"
 msgstr "A_fficher le mot de passe"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-dsl.ui.h:6
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:7
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
 #: ../src/libnma/nma-vpn-password-dialog.c:97
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
@@ -1618,13 +1710,29 @@
 msgid "_Password:"
 msgstr "_Mot de passe :"
 
+#: ../src/connection-editor/ce-page-dsl.ui.h:8
+msgid "PPP _interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:9
+msgid "P_arent interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:10
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:11
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "Automatique"
@@ -1670,7 +1778,7 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -1678,7 +1786,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "Manuel"
 
@@ -1687,7 +1795,7 @@
 msgstr "_Port :"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
 #, fuzzy
 msgid "_Device:"
@@ -1840,20 +1948,20 @@
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "Mode de _transport :"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
 msgid "Datagram"
 msgstr "Datagramme"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
 msgid "Connected"
 msgstr "Connecté"
 
+#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+msgid "_Transport mode:"
+msgstr "Mode de _transport :"
+
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
 msgid "IPIP"
 msgstr ""
@@ -1891,40 +1999,39 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#, fuzzy
-msgid "Device name"
-msgstr "Numéro + du nom du périphérique"
+#: ../src/connection-editor/ce-page-macsec.ui.h:6
+msgid "Device name:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#, fuzzy
-msgid "Parent device"
-msgstr "Ethernet"
+#: ../src/connection-editor/ce-page-macsec.ui.h:8
+msgid "Parent device:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#, fuzzy
-msgid "Mode"
-msgstr "_Mode :"
+#: ../src/connection-editor/ce-page-macsec.ui.h:16
+msgid "Mode:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP"
+msgid "Local IP:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP"
+msgid "Remote IP:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key"
+msgid "Input key:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key"
+msgid "Output key:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-#, fuzzy
-msgid "MTU"
-msgstr "MT_U :"
+msgid "MTU:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1939,12 +2046,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "Partagé avec d'autres ordinateurs"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "_Méthode :"
 
@@ -1960,7 +2067,7 @@
 "utiliser un identifiant de client DHCP, ajoutez-le ici."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1973,16 +2080,16 @@
 msgstr "ID de client D_HCP :"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "Do_maines de recherche :"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "Ser_veurs DNS :"
 
@@ -2008,11 +2115,12 @@
 "configuration IPv4 échoue."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "_Routes…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-macsec.ui.h:3
 #: ../src/connection-editor/page-ip4.c:198
 msgid "Disabled"
 msgstr "Désactivé"
@@ -2025,7 +2133,15 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "Activé (adresse temporaire préférée)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Stable privacy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -2035,15 +2151,19 @@
 "Utilisez des virgules pour séparer plusieurs adresses DNS. Les adresses de "
 "lien local seront automatiquement liées à l'interface de connexion."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "Extensions de confidentialité IPv6 :"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Requiert un adressage IPv_6 pour que cette connexion fonctionne"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2052,6 +2172,94 @@
 "de fonctionner lorsque la configuration IPv4 est réussie, même si la "
 "configuration IPv6 échoue."
 
+#: ../src/connection-editor/ce-page-macsec.ui.h:1
+msgid "PSK"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:2
+#: ../src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:4
+msgid "Check"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:5
+msgid "Strict"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:7
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:9
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:10
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:11
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:12
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:13
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:14
+msgid "CKN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:15
+msgid "CAK:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:17
+msgid "Keys:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:18
+msgid "Parameters:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:19
+msgid "Validation:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:20
+msgid "SCI port:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:21
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:22
+msgid "Encrypt"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:23
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:24
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:26
 msgid "Basic"
@@ -2140,41 +2348,41 @@
 msgstr "Envoyer les pa_quets d'écho PPP"
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Méthode :"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-team.ui.h:25
 #, fuzzy
 msgid "None"
 msgstr "Aucune"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: ../src/connection-editor/ce-page-proxy.ui.h:3
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: ../src/connection-editor/ce-page-proxy.ui.h:4
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: ../src/connection-editor/ce-page-proxy.ui.h:5
 msgid "PAC URL:"
 msgstr ""
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:6
+msgid "PAC script:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-proxy.ui.h:7
 msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "_Importer une configuration en équipe à partir d'un fichier..."
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#, fuzzy
+msgid "Method:"
+msgstr "_Méthode :"
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:19
 #, fuzzy
@@ -2222,76 +2430,76 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:10
+msgid "Active-Backup runner options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:11
 #, fuzzy
 msgid "_Port priority:"
 msgstr "_Priorité :"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
-msgstr ""
-
 #: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:82
-msgid ""
-"Validate received ARP packets on active ports. If this is not checked, all "
-"incoming ARP packets will be considered as a good reply."
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:44
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
 msgid "Port priority. The higher number means higher priority."
 msgstr ""
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port _sticky"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:15
-msgid "Active-Backup runner options"
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:16
+msgid "LACP runner options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
 #, fuzzy
 msgid "_LACP port priority:"
 msgstr "_Priorité :"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
 #, fuzzy
 msgid "LACP port _key:"
 msgstr "_Clé privée :"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
 #: ../src/connection-editor/ce-page-team.ui.h:43
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
 #: ../src/connection-editor/ce-page-team.ui.h:45
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
-msgid "LACP runner options"
-msgstr ""
-
 #: ../src/connection-editor/ce-page-team-port.ui.h:24
 #: ../src/connection-editor/ce-page-team.ui.h:70
 msgid "_Link watcher:"
@@ -2484,14 +2692,14 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/connection-helpers.c:105
 #: ../src/connection-editor/page-ethernet.c:351
 #: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/connection-helpers.c:120
 #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
 #: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
@@ -2753,6 +2961,7 @@
 msgid "SS_ID:"
 msgstr "SS_ID :"
 
+#: ../src/connection-editor/ce-polkit.c:63
 #: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
@@ -2811,58 +3020,63 @@
 "charge toutes les méthodes d'authentification. Si la connexion échoue, "
 "essayez d'en désactiver certaines."
 
-#: ../src/connection-editor/connection-helpers.c:105
+#: ../src/connection-editor/connection-helpers.c:106
 #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
+#: ../src/connection-editor/connection-helpers.c:114
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
-
 #: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-dsl.c:201
+msgid "DSL/PPPoE"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
 #: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:117
 #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Lien"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "En équipe"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-bridge.c:212
+#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/page-bridge.c:233
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Pont"
 
-#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/connection-helpers.c:121
 #: ../src/connection-editor/page-ip-tunnel.c:176
 msgid "IP tunnel"
 msgstr ""
 
 #: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
+#: ../src/connection-editor/page-macsec.c:190
+msgid "MACsec"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:124
+#: ../src/connection-editor/connection-helpers.c:398
 #: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:205
+#: ../src/connection-editor/connection-helpers.c:207
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2872,11 +3086,11 @@
 "\n"
 "Erreur : aucun type de service VPN."
 
-#: ../src/connection-editor/connection-helpers.c:217
+#: ../src/connection-editor/connection-helpers.c:219
 msgid "Cannot import VPN connection"
 msgstr "Impossible d'importer la connexion VPN"
 
-#: ../src/connection-editor/connection-helpers.c:219
+#: ../src/connection-editor/connection-helpers.c:221
 #, fuzzy, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2889,33 +3103,40 @@
 "\n"
 "Erreur : %s."
 
-#: ../src/connection-editor/connection-helpers.c:220
+#: ../src/connection-editor/connection-helpers.c:222
 #, fuzzy
 msgid "unknown error"
 msgstr "Erreur inconnue"
 
-#: ../src/connection-editor/connection-helpers.c:303
+#: ../src/connection-editor/connection-helpers.c:305
 #: ../src/connection-editor/page-proxy.c:118
 #: ../src/connection-editor/page-team.c:341
 #: ../src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Sélectionnez le fichier à importer"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: ../src/connection-editor/connection-helpers.c:309
+#: ../src/connection-editor/page-proxy.c:122
+#: ../src/connection-editor/page-team.c:345
+#: ../src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:340
 msgid "Hardware"
 msgstr "Matériel"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: ../src/connection-editor/connection-helpers.c:367
 msgid "Virtual"
 msgstr "Virtuel"
 
-#: ../src/connection-editor/connection-helpers.c:514
 #: ../src/connection-editor/connection-helpers.c:516
+#: ../src/connection-editor/connection-helpers.c:518
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Importer une configuration VPN enregistrée..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: ../src/connection-editor/connection-helpers.c:548
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2923,15 +3144,15 @@
 "La fenêtre d'édition de connexion n'a pas pu être initialisée en raison "
 "d'une erreur inconnue."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: ../src/connection-editor/connection-helpers.c:557
 msgid "Could not create new connection"
 msgstr "Impossible de créer une nouvelle connexion"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: ../src/connection-editor/connection-helpers.c:720
 msgid "Connection delete failed"
 msgstr "La suppression de la connexion a échoué"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: ../src/connection-editor/connection-helpers.c:768
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Voulez-vous vraiment supprimer la connexion %s ?"
@@ -2939,7 +3160,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "Adresse"
 
@@ -2951,7 +3172,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "Passerelle"
 
@@ -2961,41 +3182,41 @@
 msgstr "Métrique"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "Préfixe"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: ../src/connection-editor/nm-connection-editor.c:109
 #, c-format
 msgid "Editing %s"
 msgstr "Modification de %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: ../src/connection-editor/nm-connection-editor.c:113
 msgid "Editing un-named connection"
 msgstr "Modification de la connexion anonyme"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: ../src/connection-editor/nm-connection-editor.c:133
 #, fuzzy
 msgid "Missing connection name"
 msgstr "_Nom de la connexion :"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: ../src/connection-editor/nm-connection-editor.c:353
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Erreur lors de l'initialisation de l'éditeur"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: ../src/connection-editor/nm-connection-editor.c:360
+#: ../src/connection-editor/nm-connection-list.c:443
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "L'ajout de la connexion a échoué"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: ../src/connection-editor/nm-connection-editor.c:375
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: ../src/connection-editor/nm-connection-editor.c:451
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3003,56 +3224,53 @@
 "L'éditeur de connexion n'a pas pu trouver les ressources requises (le "
 "fichier .ui n'a pas été trouvé)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/nm-connection-editor.c:579
 msgid "Save any changes made to this connection."
 msgstr "Enregistrer toute modification apportée à cette connexion."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: ../src/connection-editor/nm-connection-editor.c:580
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "S'authentifier pour enregistrer cette connexion pour tous les utilisateurs "
 "de cet ordinateur."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not create connection"
 msgstr "Impossible de créer une connexion"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not edit connection"
 msgstr "Impossible de modifier la connexion"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: ../src/connection-editor/nm-connection-editor.c:598
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 "Erreur inconnue lors de la création de la fenêtre d'édition de connexion."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: ../src/connection-editor/nm-connection-editor.c:739
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:758
+#: ../src/connection-editor/nm-connection-editor.c:759
 msgid "Error initializing editor"
 msgstr "Erreur lors de l'initialisation de l'éditeur"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: ../src/connection-editor/nm-connection-editor.c:1157
 msgid "Connection add failed"
 msgstr "L'ajout de la connexion a échoué"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3061,139 +3279,155 @@
 "Définir ce paramètre à vrai (true) pour désactiver les avertissements à "
 "propos des certificats CA dans l'authentification EAP."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "_Nom de la connexion :"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 #, fuzzy
 msgid "_Export…"
 msgstr "_Exporter..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: ../src/connection-editor/nm-connection-list.c:151
 msgid "never"
 msgstr "jamais"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:173
 msgid "now"
 msgstr "maintenant"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: ../src/connection-editor/nm-connection-list.c:180
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "il y a %d minute"
 msgstr[1] "il y a %d minutes"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: ../src/connection-editor/nm-connection-list.c:184
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "il y a %d heure"
 msgstr[1] "il y a %d heures"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:196
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "il y a %d jour"
 msgstr[1] "il y a %d jours"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: ../src/connection-editor/nm-connection-list.c:202
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "il y a %d mois"
 msgstr[1] "il y a %d mois"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: ../src/connection-editor/nm-connection-list.c:206
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "il y a %d an"
 msgstr[1] "il y a %d ans"
 
-#: ../src/connection-editor/nm-connection-list.c:635
+#: ../src/connection-editor/nm-connection-list.c:445
+msgid "Connection cannot be deleted"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:448
+msgid "Select a connection to edit"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:450
+msgid "Select a connection to delete"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:785
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: ../src/connection-editor/nm-connection-list.c:798
 msgid "Last Used"
 msgstr "Dernière utilisation"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: ../src/connection-editor/nm-connection-list.c:836
 msgid "Edit the selected connection"
 msgstr "Modifie la connexion sélectionnée"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: ../src/connection-editor/nm-connection-list.c:837
 msgid "Authenticate to edit the selected connection"
 msgstr "S'authentifier pour modifier la connexion sélectionnée"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: ../src/connection-editor/nm-connection-list.c:842
 msgid "Delete the selected connection"
 msgstr "Supprime la connexion sélectionnée"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: ../src/connection-editor/nm-connection-list.c:843
 msgid "Authenticate to delete the selected connection"
 msgstr "S'authentifier pour supprimer la connexion sélectionnée"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:1048
+#: ../src/connection-editor/nm-connection-list.c:1051
 msgid "Error creating connection"
 msgstr "Erreur lors de la création de la connexion"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:1049
 msgid "No VPN plugins are installed."
 msgstr "Aucun greffon VPN n'est installé."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:1052
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "La méthode pour créer des connexions « %s » est inconnue"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: ../src/connection-editor/nm-connection-list.c:1085
 msgid "Error editing connection"
 msgstr "Erreur lors de la modification de la connexion"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: ../src/connection-editor/nm-connection-list.c:1086
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "La connexion avec l'UUID « %s » n'a pas été trouvée"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: ../src/connection-editor/nm-connection-list.ui.h:2
+msgid "Add a new connection"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:116
 msgid "802.1X Security"
 msgstr "Sécurité 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: ../src/connection-editor/page-8021x-security.c:118
 msgid "Could not load 802.1X Security user interface."
 msgstr "Impossible de charger l'interface utilisateur de sécurité 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: ../src/connection-editor/page-8021x-security.c:132
 msgid "Use 802.1_X security for this connection"
 msgstr "Utiliser la sécurité 802.1_X pour cette connexion"
 
@@ -3249,11 +3483,11 @@
 msgid "Bond connection %d"
 msgstr "Connexion lien %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:236
 msgid "Could not load bridge user interface."
 msgstr "Impossible de charger l'interface utilisateur du pont."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: ../src/connection-editor/page-bridge.c:352
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Connexion pont %d"
@@ -3277,11 +3511,15 @@
 msgid "Could not load DCB user interface."
 msgstr "Impossible de charger l'interface utilisateur DCB."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: ../src/connection-editor/page-dsl.c:203
 msgid "Could not load DSL user interface."
 msgstr "Impossible de charger l'interface utilisateur DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: ../src/connection-editor/page-dsl.c:298
+msgid "missing parent interface"
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:343
 #, c-format
 msgid "DSL connection %d"
 msgstr "Connexion DSL %d"
@@ -3383,27 +3621,27 @@
 msgstr "Connexion Ethernet %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "Automatique (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "Adresses automatiques uniquement (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "Automatique, adresses uniquement"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "Automatique (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Adresses automatiques uniquement (PPPoE)"
 
@@ -3416,17 +3654,17 @@
 msgstr "Adresses automatiques uniquement (DHCP)"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "Lien-local uniquement"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "Ser_veurs DNS supplémentaires :"
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "Do_maines de recherche supplémentaires :"
 
@@ -3463,43 +3701,52 @@
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "Automatique, DHCP uniquement"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Modification des routes IPv6 pour %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "Paramètres IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr "Impossible de charger l'interface utilisateur IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
+#: ../src/connection-editor/page-macsec.c:192
+msgid "Could not load MACsec user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-macsec.c:331
+#, c-format
+msgid "MACSEC connection %d"
+msgstr ""
+
 #: ../src/connection-editor/page-master.c:247
 #: ../src/connection-editor/page-master.c:258
 msgid "Duplicate slaves"
@@ -3561,38 +3808,34 @@
 "Mon fournisseur utilise une technologie de type C_DMA (1xRTT, EVOD, etc.)"
 
 #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: ../src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
 #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: ../src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
 #: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: ../src/wireless-security/eap-method-ttls.c:287
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: ../src/wireless-security/eap-method-fast.c:282
+#: ../src/wireless-security/eap-method-peap.c:299
+#: ../src/wireless-security/eap-method-ttls.c:317
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: ../src/wireless-security/eap-method-ttls.c:302
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3629,11 +3872,11 @@
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Erreur : le fichier ne contient pas de configuration JSON valide"
 
-#: ../src/connection-editor/page-team.c:1156
+#: ../src/connection-editor/page-team.c:1034
 msgid "Could not load team user interface."
 msgstr "Impossible de charger l'interface utilisateur en équipe."
 
-#: ../src/connection-editor/page-team.c:1253
+#: ../src/connection-editor/page-team.c:1131
 #, c-format
 msgid "Team connection %d"
 msgstr "Connexion en équipe %d"
@@ -3641,11 +3884,11 @@
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: ../src/connection-editor/page-team-port.c:655
 msgid "Team Port"
 msgstr "Port d'équipe"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: ../src/connection-editor/page-team-port.c:657
 msgid "Could not load team port user interface."
 msgstr "Impossible de charger l'interface utilisateur du port d'équipe."
 
@@ -3756,50 +3999,50 @@
 msgid "Wi-Fi connection %d"
 msgstr "Connexion Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
+#: ../src/connection-editor/page-wifi-security.c:358
 #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clé WEP 40/128-bit (Hex ou ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
+#: ../src/connection-editor/page-wifi-security.c:368
 #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit à phrase secrète"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: ../src/connection-editor/page-wifi-security.c:394
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dynamique (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
+#: ../src/connection-editor/page-wifi-security.c:407
 #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA et WPA2 personnel"
 
-#: ../src/connection-editor/page-wifi-security.c:418
+#: ../src/connection-editor/page-wifi-security.c:420
 #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA et WPA2 entreprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: ../src/connection-editor/page-wifi-security.c:463
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Impossible de charger l'interface utilisateur de sécurité Wi-Fi ; paramètre "
 "Wi-Fi manquant."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: ../src/connection-editor/page-wifi-security.c:474
 msgid "Wi-Fi Security"
 msgstr "Sécurité Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: ../src/connection-editor/page-wifi-security.c:476
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Impossible de charger l'interface utilisateur de sécurité Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:558
+#: ../src/connection-editor/page-wifi-security.c:560
 #, c-format
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
+#: ../src/connection-editor/page-wifi-security.c:566
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
@@ -3852,35 +4095,39 @@
 msgid "Connection Information"
 msgstr "Informations sur la connexion"
 
+#: ../src/info.ui.h:2
+msgid "_Close"
+msgstr ""
+
 #: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Connexions réseau actives"
 
 #: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
 #, fuzzy
 msgid "No certificate set"
 msgstr "Aucun certificat de CA n'est _requis"
 
 #: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
 msgid "No key set"
 msgstr ""
 
 #: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Choisissez votre certificat personnel..."
 
 #: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
 #, fuzzy, c-format
 msgid "%s private _key:"
 msgstr "_Clé privée :"
 
 #: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
 #, fuzzy, c-format
 msgid "%s key _password:"
 msgstr "_Mot de passe de la clé privée :"
@@ -3891,7 +4138,7 @@
 msgstr "Choisissez votre certificat personnel..."
 
 #: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
 msgid "%s _certificate:"
 msgstr "Certificat de l'_utilisateur :"
@@ -4102,47 +4349,47 @@
 msgid "New Mobile Broadband Connection"
 msgstr "Nouvelle connexion mobile"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: ../src/libnma/nma-cert-chooser-button.c:165
 #, fuzzy
 msgid "(None)"
 msgstr "(aucun)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: ../src/libnma/nma-cert-chooser-button.c:173
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: ../src/libnma/nma-cert-chooser-button.c:174
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Certificat du C_A :"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
+#: ../src/libnma/nma-cert-chooser-button.c:193
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Inconnue"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: ../src/libnma/nma-cert-chooser-button.c:215
+#: ../src/libnma/nma-cert-chooser-button.c:245
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: ../src/libnma/nma-cert-chooser-button.c:216
+#: ../src/libnma/nma-cert-chooser-button.c:246
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: ../src/libnma/nma-cert-chooser-button.c:472
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Choisissez votre certificat personnel..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
 msgid "%s certificate _password:"
 msgstr "Certificat de l'_utilisateur :"
@@ -4209,8 +4456,8 @@
 msgid "_Tertiary Password:"
 msgstr "Mot de passe _secondaire :"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: ../src/libnma/nma-vpn-password-dialog.c:238
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "A_fficher les mots de passe"
 
@@ -4239,11 +4486,11 @@
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dynamique (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_réer"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4251,35 +4498,35 @@
 "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:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Authentification nécessaire pour le réseau Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Authentification demandée par le réseau Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Création d'un nouveau réseau Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Nouveau réseau Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Saisissez le nom du réseau Wi-Fi que vous voulez créer."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connexion au réseau Wi-Fi invisible"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Réseau Wi-Fi invisible"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4433,25 +4680,25 @@
 msgid "Roaming network"
 msgstr "Réseau itinérant"
 
-#: ../src/mobile-helpers.c:331
+#: ../src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Code PIN pour carte SIM « %s » sur « %s »"
 
-#: ../src/mobile-helpers.c:464
+#: ../src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Code PIN requis"
 
-#: ../src/mobile-helpers.c:472
+#: ../src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Le code PIN est nécessaire pour la connexion mobile"
 
-#: ../src/mobile-helpers.c:622
+#: ../src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Connexion mobile « %s » active : (%d %%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: ../src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "itinérance"
 
@@ -4461,12 +4708,12 @@
 msgid "%s connection"
 msgstr "Connexion à %s"
 
-#: ../src/utils/utils.c:563
+#: ../src/utils/utils.c:565
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Certificats DER ou PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: ../src/utils/utils.c:577
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Clés privées DER, PEM ou PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
@@ -4474,39 +4721,35 @@
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: ../src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Aucun certificat de CA n'est _requis"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: ../src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: ../src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: ../src/wireless-security/eap-method-fast.c:267
+#: ../src/wireless-security/eap-method-peap.c:329
+#: ../src/wireless-security/eap-method-ttls.c:379
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:405
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Choisir un fichier PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:412
 msgid "PAC files (*.pac)"
 msgstr "Fichier PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: ../src/wireless-security/eap-method-fast.c:416
 msgid "All files"
 msgstr "Tous les fichiers"
 
@@ -4524,7 +4767,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:4
 #: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "Anony_mous identity:"
 msgstr "Identité anony_me :"
 
@@ -4534,7 +4777,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:6
 #: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
 msgid "_Inner authentication:"
 msgstr "Authentification i_nterne :"
 
@@ -4550,27 +4793,12 @@
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: ../src/wireless-security/eap-method-peap.c:314
+#: ../src/wireless-security/eap-method-ttls.c:364
 #: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Choisissez un certificat d'une autorité de certification..."
-
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "Version 0"
@@ -4580,20 +4808,27 @@
 msgstr "Version 1"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Certificat du C_A :"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
 #: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
 msgid "No CA certificate is _required"
 msgstr "Aucun certificat de CA n'est _requis"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:6
 msgid "PEAP _version:"
 msgstr "Version de _PEAP :"
 
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Domain:"
+msgstr ""
+
 #: ../src/wireless-security/eap-method-simple.c:75
 msgid "missing EAP username"
 msgstr ""
@@ -4606,46 +4841,28 @@
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: ../src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Aucun certificat de CA n'est _requis"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: ../src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: ../src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Aucun certificat de CA n'est _requis"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "I_dentité :"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: ../src/wireless-security/eap-method-ttls.c:333
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4719,17 +4936,17 @@
 msgstr ""
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (par défaut)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Open System"
 msgstr "Système ouvert"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Shared Key"
 msgstr "À clé partagée"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "1 (Default)"
+msgstr "1 (par défaut)"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key:"
 msgstr "_Clé :"
@@ -4756,383 +4973,3 @@
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "_Type :"
-
-#, fuzzy
-#~ msgid "NetworkManager for GNOME"
-#~ msgstr "Applet NetworkManager"
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection '%s' disconnected because the VPN service stopped."
-#~ msgstr ""
-#~ "\n"
-#~ "La connexion VPN « %s » a été déconnectée car le service VPN a été arrêté."
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection '%s' disconnected."
-#~ msgstr ""
-#~ "\n"
-#~ "La connexion VPN « %s » a été déconnectée."
-
-#~ msgid "_Disconnect VPN"
-#~ msgstr "_Déconnecter le VPN"
-
-#~ msgid "New Mobile Broadband connection..."
-#~ msgstr "Nouvelle connexion mobile..."
-
-#~ msgid "_Connect to Hidden Wi-Fi Network..."
-#~ msgstr "_Se connecter à un réseau Wi-Fi invisible..."
-
-#~ msgid "Create _New Wi-Fi Network..."
-#~ msgstr "Créer un _nouveau réseau Wi-Fi..."
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "15"
-#~ msgstr "15"
-
-#~ msgid "Aut_onegotiate"
-#~ msgstr "Négociation aut_omatique"
-
-#~ msgid "FirewallD is not running."
-#~ msgstr "FirewallD n'est pas lancé."
-
-#~ msgid "New..."
-#~ msgstr "Nouveau..."
-
-#, fuzzy
-#~ msgid "invalid EAP-TLS CA certificate: %s"
-#~ msgstr "Certificat du C_A :"
-
-#~ msgid "Unencrypted private keys are insecure"
-#~ msgstr "Les clés privées non chiffrées ne sont pas sûres."
-
-#~ msgid ""
-#~ "The selected private key does not appear to be protected by a password.  "
-#~ "This could allow your security credentials to be compromised.  Please "
-#~ "select a password-protected private key.\n"
-#~ "\n"
-#~ "(You can password-protect your private key with openssl)"
-#~ msgstr ""
-#~ "La clé privée sélectionnée ne semble pas être protégée par un mot de "
-#~ "passe. Ceci pourrait amener à compromettre la sécurité de vos données de "
-#~ "connexion. Veuillez sélectionner une clé privée protégée par un mot de "
-#~ "passe.\n"
-#~ "\n"
-#~ "(Vous pouvez protéger votre clé privée avec un mot de passe grâce à "
-#~ "openssl)"
-
-#~ msgid "Choose your private key..."
-#~ msgstr "Choisissez votre clé privée..."
-
-#~ msgid "Enable WiMA_X Mobile Broadband"
-#~ msgstr "Activer la connexion mobile WiMA_X"
-
-#~ msgid "_Help"
-#~ msgstr "_Aide"
-
-#~ msgid "You are now connected to the bonded network."
-#~ msgstr "Vous êtes maintenant connecté au réseau lié."
-
-#~ msgid "Preparing bond connection '%s'..."
-#~ msgstr "Préparation de la connexion liée « %s »..."
-
-#~ msgid "Configuring bond connection '%s'..."
-#~ msgstr "Configuration de la connexion liée « %s »..."
-
-#~ msgid "User authentication required for bond connection '%s'..."
-#~ msgstr "Authentification nécessaire pour la connexion liée « %s »..."
-
-#~ msgid "Requesting address for '%s'..."
-#~ msgstr "Obtention d'une adresse pour « %s »..."
-
-#~ msgid "Bond connection '%s' active"
-#~ msgstr "Connexion liée « %s » active"
-
-#~ msgid "You are now connected to the bridged network."
-#~ msgstr "Vous êtes maintenant connecté au réseau pont."
-
-#~ msgid "Preparing bridge connection '%s'..."
-#~ msgstr "Préparation de la connexion pont « %s »..."
-
-#~ msgid "Configuring bridge connection '%s'..."
-#~ msgstr "Configuration de la connexion pont « %s »..."
-
-#~ msgid "User authentication required for bridge connection '%s'..."
-#~ msgstr "Authentification nécessaire pour la connexion pont « %s »..."
-
-#~ msgid "Bridge connection '%s' active"
-#~ msgstr "Connexion pont « %s » active"
-
-#~ msgid "New Mobile Broadband (CDMA) connection..."
-#~ msgstr "Nouvelle connexion mobile (CDMA)..."
-
-#~ msgid "You are now connected to the CDMA network."
-#~ msgstr "Vous êtes maintenant connecté au réseau CDMA."
-
-#~ msgid "CDMA network."
-#~ msgstr "Réseau CDMA."
-
-#~ msgid "New Mobile Broadband (GSM) connection..."
-#~ msgstr "Nouvelle connexion mobile (GSM)..."
-
-#~ msgid "You are now connected to the GSM network."
-#~ msgstr "Vous êtes maintenant connecté au réseau GSM."
-
-#~ msgid "GSM network."
-#~ msgstr "Réseau GSM."
-
-#~ msgid "Auto InfiniBand"
-#~ msgstr "InfiniBand automatique"
-
-#~ msgid "InfiniBand Networks (%s)"
-#~ msgstr "Réseaux InfiniBand (%s)"
-
-#~ msgid "InfiniBand Network (%s)"
-#~ msgstr "Réseau InfiniBand (%s)"
-
-#~ msgid "InfiniBand Networks"
-#~ msgstr "Réseaux InfiniBand"
-
-#~ msgid "InfiniBand Network"
-#~ msgstr "Réseau InfiniBand"
-
-#~ msgid "You are now connected to the InfiniBand network."
-#~ msgstr "Vous êtes maintenant connecté au réseau InfiniBand."
-
-#~ msgid "Preparing InfiniBand connection '%s'..."
-#~ msgstr "Préparation de la connexion InfiniBand « %s »..."
-
-#~ msgid "Configuring InfiniBand connection '%s'..."
-#~ msgstr "Configuration de la connexion InfiniBand « %s »..."
-
-#~ msgid "User authentication required for InfiniBand connection '%s'..."
-#~ msgstr "Authentification nécessaire pour la connexion InfiniBand « %s »..."
-
-#~ msgid "InfiniBand connection '%s' active"
-#~ msgstr "Connexion InfiniBand « %s » active"
-
-#~ msgid "You are now connected to the teamed network."
-#~ msgstr "Vous êtes maintenant connecté au réseau en équipe."
-
-#~ msgid "Preparing team connection '%s'..."
-#~ msgstr "Préparation de la connexion en équipe « %s »..."
-
-#~ msgid "Configuring team connection '%s'..."
-#~ msgstr "Configuration de la connexion en équipe « %s »..."
-
-#~ msgid "User authentication required for team connection '%s'..."
-#~ msgstr "Authentification nécessaire pour la connexion en équipe « %s »..."
-
-#~ msgid "Team connection '%s' active"
-#~ msgstr "Connexion en équipe « %s » active"
-
-#~ msgid "You are now connected to the VLAN."
-#~ msgstr "Vous êtes maintenant connecté au VLAN."
-
-#~ msgid "Preparing VLAN connection '%s'..."
-#~ msgstr "Préparation de la connexion VLAN « %s »..."
-
-#~ msgid "Configuring VLAN connection '%s'..."
-#~ msgstr "Configuration de la connexion VLAN « %s »..."
-
-#~ msgid "User authentication required for VLAN connection '%s'..."
-#~ msgstr "Authentification nécessaire pour la connexion VLAN « %s »..."
-
-#~ msgid "VLAN connection '%s' active"
-#~ msgstr "Connexion VLAN « %s » active"
-
-#~ msgid "WiMAX Mobile Broadband (%s)"
-#~ msgstr "WiMAX mobile (%s)"
-
-#~ msgid "WiMAX Mobile Broadband"
-#~ msgstr "WiMAX mobile"
-
-#~ msgid "WiMAX is disabled"
-#~ msgstr "le WiMAX est désactivé"
-
-#~ msgid "WiMAX is disabled by hardware switch"
-#~ msgstr "le WiMAX est désactivé par un commutateur matériel"
-
-#~ msgid "You are now connected to the WiMAX network."
-#~ msgstr "Vous êtes maintenant connecté au réseau WiMAX."
-
-#~ msgid "%d dB"
-#~ msgstr "%d dB"
-
-#~ msgctxt "WiMAX CINR"
-#~ msgid "unknown"
-#~ msgstr "inconnu"
-
-#~ msgctxt "WiMAX Base Station ID"
-#~ msgid "unknown"
-#~ msgstr "inconnu"
-
-#~ msgid "WiMAX (%s)"
-#~ msgstr "WiMAX (%s)"
-
-#~ msgid "CINR:"
-#~ msgstr "CINR :"
-
-#~ msgid "BSID:"
-#~ msgstr "BSID :"
-
-#~ msgid "_Device MAC address:"
-#~ msgstr "Adresse M_AC du périphérique :"
-
-#~ msgid "Any"
-#~ msgstr "N'importe lequel"
-
-#~ msgid "3G (UMTS/HSPA)"
-#~ msgstr "3G (UMTS/HSPA)"
-
-#~ msgid "2G (GPRS/EDGE)"
-#~ msgstr "2G (GPRS/EDGE)"
-
-#~ msgid "Prefer 3G (UMTS/HSPA)"
-#~ msgstr "Préférer 3G (UMTS/HSPA)"
-
-#~ msgid "Prefer 2G (GPRS/EDGE)"
-#~ msgstr "Préférer 2G (GPRS/EDGE)"
-
-#~ msgid "Prefer 4G (LTE)"
-#~ msgstr "Préférer 4G (LTE)"
-
-#~ msgid "Use only 4G (LTE)"
-#~ msgstr "N'utiliser que 4G (LTE)"
-
-#~ msgid "I_mport team configuration from a file..."
-#~ msgstr "I_mporter une configuration en équipe à partir d'un fichier..."
-
-#~ msgid "Infrastructure"
-#~ msgstr "Infrastructure"
-
-#~ msgid "WiMAX"
-#~ msgstr "WiMAX"
-
-#~ msgid "Error saving connection"
-#~ msgstr "Erreur lors de l'enregistrement de la connexion"
-
-#~ msgid "The property '%s' / '%s' is invalid: %d"
-#~ msgstr "La propriété « %s » / « %s » n'est pas valide : %d"
-
-#~ msgid "Automatic (PPP)"
-#~ msgstr "Automatique (PPP)"
-
-#~ msgid "Automatic (PPP) addresses only"
-#~ msgstr "Adresses automatiques uniquement (PPP)"
-
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Impossible de charger l'interface utilisateur WiMAX."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "Connexion WiMAX %d"
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
-#~ "%s)."
-#~ msgstr ""
-#~ "Configuration Bluetooth impossible (échec de connexion D-Bus : (%s) %s)."
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
-#~ "%s)."
-#~ msgstr ""
-#~ "Configuration Bluetooth impossible (erreur de recherche de "
-#~ "NetworkManager : (%s) %s)."
-
-#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
-#~ msgstr "Utiliser un téléphone portable comme périphérique réseau (PAN/NAP)"
-
-#~ msgid "Access the Internet using your mobile phone (DUN)"
-#~ msgstr "Accéder à Internet à l'aide d'un téléphone portable (DUN)"
-
-#~ msgid "Error: %s"
-#~ msgstr "Erreur : %s"
-
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Échec de création de la connexion DUN : %s"
-
-#~ msgid "Your phone is now ready to use!"
-#~ msgstr "Votre téléphone est prêt pour son utilisation"
-
-#~ msgid "Mobile wizard was canceled"
-#~ msgstr "L'assistant de connexion mobile a été annulé"
-
-#~ msgid "Unknown phone device type (not GSM or CDMA)"
-#~ msgstr "Type d'équipement téléphonique inconnu (ni GSM, ni CDMA)"
-
-#~ msgid "unknown modem type."
-#~ msgstr "type de modem inconnu."
-
-#~ msgid "failed to connect to the phone."
-#~ msgstr "échec de connexion au téléphone."
-
-#~ msgid "error getting bus connection"
-#~ msgstr "erreur lors de la modification de la connexion"
-
-#~ msgid "unexpectedly disconnected from the phone."
-#~ msgstr "déconnexion intempestive du téléphone."
-
-#~ msgid "timed out detecting phone details."
-#~ msgstr "expiration de délai lors de la détection des détails du téléphone."
-
-#~ msgid "Detecting phone configuration..."
-#~ msgstr "Détection de la configuration du téléphone..."
-
-#~ msgid ""
-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-#~ "Networking connection."
-#~ msgstr ""
-#~ "L'adaptateur Bluetooth par défaut doit être activé avant de pouvoir "
-#~ "configurer une connexion d'accès distant."
-
-#~ msgid "Failed to create PAN connection: %s"
-#~ msgstr "Échec de création de la connexion PAN : %s"
-
-#~ msgid "%s Network"
-#~ msgstr "Réseau %s"
-
-#~ msgid "Primary DNS:"
-#~ msgstr "DNS primaire :"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS secondaire :"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS tertiaire :"
-
-#~ msgid "_Save..."
-#~ msgstr "_Enregistrer..."
-
-#~ msgid "_Edit..."
-#~ msgstr "_Modifier..."
-
-#~ msgid "_Delete..."
-#~ msgstr "_Supprimer..."
diff -Nru network-manager-applet-1.8.4/po/hr.po network-manager-applet-1.8.10/po/hr.po
--- network-manager-applet-1.8.4/po/hr.po	2017-09-10 18:05:55.000000000 +0000
+++ network-manager-applet-1.8.10/po/hr.po	2017-12-19 11:44:30.000000000 +0000
@@ -8,8 +8,8 @@
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2017-09-08 08:39+0000\n"
-"PO-Revision-Date: 2017-09-09 01:14+0200\n"
+"POT-Creation-Date: 2017-11-13 18:22+0000\n"
+"PO-Revision-Date: 2017-11-15 18:34+0100\n"
 "Last-Translator: gogo \n"
 "Language-Team: Croatian \n"
 "Language: hr\n"
@@ -19,7 +19,7 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2017-04-09 22:32+0000\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Poedit 2.0.4\n"
 
 #: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
@@ -239,12 +239,12 @@
 msgstr "Neuspjelo dodavanje/uključivanje povezivanja"
 
 #: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
 #: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Neuspjelo povezivanje"
 
@@ -260,7 +260,7 @@
 msgid "Connection activation failed"
 msgstr "Neuspjelo uključivanje povezivanja"
 
-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Ne prikazuj više ovu poruku"
 
@@ -562,46 +562,46 @@
 msgid "Sending unlock code…"
 msgstr "Slanje kôda za otključavanje…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:507
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilno širokopojasno povezivanje (%s)"
 
-#: ../src/applet-device-broadband.c:738
+#: ../src/applet-device-broadband.c:739
 #: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobilno širokopojasno povezivanje"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Dostupan"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 msgid "New Mobile Broadband connection…"
 msgstr "Novo mobilno širokopojasno povezivanje…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Povezivanje uspostavljeno"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Sada ste povezani s mobilnom širokopojasnom mrežom."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "Mobilna širokopojasna mreža."
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "Registrirani ste na matičnoj mreži."
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "Registrirani ste na roaming mreži."
 
@@ -709,7 +709,7 @@
 msgid "(none)"
 msgstr "(nijedan)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Neuspjelo dodavanje novog povezivanja"
 
@@ -717,79 +717,79 @@
 msgid "Insufficient privileges."
 msgstr "Nedovoljne ovlasti."
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Bežične mreže (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Bežična mreža (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Bežična mreža"
 msgstr[1] "Bežične mreže"
 msgstr[2] "Bežične mreže"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Bežična mreža je onemogućena"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Bežična mreža je onemogućena hardverskim isključivanjem"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Više mreža"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Bežične mreže su dostupne"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Upotrijebi mrežni izbornik za povezivanje na bežičnu mrežu"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Sada ste povezani s bežičnom mrežom “%s”."
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Priprema bežičnog mrežnog povezivanja “%s”…"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Podešavanje bežičnog mrežnog povezivanja “%s”…"
 
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Potrebna je ovjera korisnika za bežičnu mrežu “%s”…"
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Potrebna je adresa bežične mreže za “%s”…"
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Bežično povezivanje “%s” je aktivno: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Bežično povezivanje “%s” je aktivno"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Neuspjelo aktiviranje povezivanja"
 
@@ -1097,7 +1097,7 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
 #: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
@@ -1108,7 +1108,7 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
 #: ../src/connection-editor/connection-helpers.c:772
 #: ../src/connection-editor/nm-connection-list.ui.h:4
@@ -1696,7 +1696,7 @@
 #: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "Automatski"
@@ -1742,7 +1742,7 @@
 msgstr "Potpuno"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "Zanemari"
 
@@ -1750,7 +1750,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "Ručno"
 
@@ -2019,12 +2019,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "Podijeljeno s ostalim računalima"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "_Način:"
 
@@ -2039,7 +2039,7 @@
 "klijentski identifikator, upišite ga ovdje."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2052,16 +2052,16 @@
 msgstr "D_HCP ID klijenta:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "Pr_etraži domene:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "DNS pos_lužitelji:"
 
@@ -2087,7 +2087,7 @@
 "ako IPv4 podešavanje ne uspije, ali zato IPv6 podešavanje uspije."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "_Rute…"
 
@@ -2105,7 +2105,15 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "Omogućeno (preferiraj privremenu adresu)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr "EUI64"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Stable privacy"
+msgstr "Stabilna privatnost"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -2116,15 +2124,19 @@
 "domena. Adrese lokalnog-povezivanja biti će automatski u dometu putem "
 "sučelja povezivanja."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6 _proširenja privatnosti:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr "Način stvaranja _IPv6 adresa:"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Zahtijevaj IPv_6 adresiranje kako bi se ovo povezivanje dovršilo"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -3134,7 +3146,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "Adresa"
 
@@ -3146,7 +3158,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "Pristupnik"
 
@@ -3156,7 +3168,7 @@
 msgstr "Metrički"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "Prefiks"
 
@@ -3589,27 +3601,27 @@
 msgstr "IP tunelsko povezivanje %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "Automatski (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "Samo automatske (VPN) adrese"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "Automatski, samo adrese"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "Automatski (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Samo automatske (PPPoE) adrese"
 
@@ -3622,17 +3634,17 @@
 msgstr "Samo automatske (DHCP) adrese"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "Samo Lokalno-povezivanje"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "Dodatni DNS pos_lužitelji:"
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "Dodatne d_omene pretraživanja:"
 
@@ -3669,39 +3681,39 @@
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "Neispravan IPv4 DNS poslužitelj \"%s\""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "Automatski, samo DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Uređivanje IPv6 ruta za %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "IPv6 postavke"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr "Učitavanje IPv6 korisničkog sučelja nije uspjelo."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "Neispravna IPv6 adresa \"%s\""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "Neispravan IPv6 prefiks \"%s\""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "Neispravan IPv6 pristupnik \"%s\""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "Neispravan IPv6 DNS poslužitelj \"%s\""
diff -Nru network-manager-applet-1.8.4/po/id.po network-manager-applet-1.8.10/po/id.po
--- network-manager-applet-1.8.4/po/id.po	2017-09-07 15:39:32.000000000 +0000
+++ network-manager-applet-1.8.10/po/id.po	2017-12-19 11:44:30.000000000 +0000
@@ -10,9 +10,9 @@
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2017-08-30 14:06+0000\n"
-"PO-Revision-Date: 2017-09-01 15:53+0700\n"
-"Last-Translator: Andika Triwidada \n"
+"POT-Creation-Date: 2017-12-12 14:25+0000\n"
+"PO-Revision-Date: 2017-12-17 15:20+0700\n"
+"Last-Translator: Andika Triwidada \n"
 "Language-Team: Indonesian \n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.0.5\n"
 
 #: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
@@ -37,7 +37,7 @@
 
 #: ../nm-connection-editor.desktop.in.h:2
 msgid "Manage and change your network connection settings"
-msgstr "Kelola dan ubah tatanan sambungan jaringan Anda"
+msgstr "Kelola dan ubah tatanan koneksi jaringan Anda"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
@@ -158,34 +158,34 @@
 msgid "The NetworkManager Developers"
 msgstr "Para Pengembang NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "kelas objek '%s' tidak punya properti bernama '%s'"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "properti '%s' dari kelas objek '%s' tidak dapat ditulisi"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 "properti construct \"%s\" bagi objek '%s' tak bisa ditata setelah konstruksi"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr "'%s::%s' bukan nama properti yang valid; '%s' bukan sub tipe GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "tidak bisa menata properti '%s' bertipe '%s' dari nilai bertipe '%s'"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -194,7 +194,6 @@
 "nilai \"%s\" bertipe '%s' tidak valid atau di luar jangkauan untuk properti "
 "'%s' bertipe '%s'"
 
-#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Otentikasi 802.1X"
@@ -244,12 +243,12 @@
 msgstr "Gagal menambah/mengaktifkan koneksi"
 
 #: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Galat tak dikenal"
 
 #: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Kegagalan koneksi"
 
@@ -265,7 +264,7 @@
 msgid "Connection activation failed"
 msgstr "Aktivasi koneksi gagal"
 
-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Jangan tunjukkan pesan ini lagi"
 
@@ -277,7 +276,7 @@
 "interrupted."
 msgstr ""
 "\n"
-"Sambungan VPN \"%s\" terputus karena sambungan jaringan terinterupsi."
+"Sambungan VPN \"%s\" terputus karena koneksi jaringan terinterupsi."
 
 #: ../src/applet.c:901
 #, c-format
@@ -287,7 +286,7 @@
 "interrupted."
 msgstr ""
 "\n"
-"Sambungan VPN \"%s\" gagal karena sambungan jaringan terinterupsi."
+"Sambungan VPN \"%s\" gagal karena koneksi jaringan terinterupsi."
 
 #: ../src/applet.c:903
 #, c-format
@@ -316,7 +315,7 @@
 "The VPN connection “%s” failed because the connection attempt timed out."
 msgstr ""
 "\n"
-"Sambungan VPN \"%s\" gagal karena batas waktu percobaan sambungan habis."
+"Sambungan VPN \"%s\" gagal karena batas waktu percobaan koneksi habis."
 
 #: ../src/applet.c:909
 #, c-format
@@ -507,12 +506,12 @@
 #: ../src/applet.c:2550
 #, c-format
 msgid "Preparing network connection “%s”…"
-msgstr "Menyiapkan sambungan jaringan \"%s\"…"
+msgstr "Menyiapkan koneksi jaringan \"%s\"…"
 
 #: ../src/applet.c:2553
 #, c-format
 msgid "User authentication required for network connection “%s”…"
-msgstr "Otentikasi pengguna diperlukan untuk sambungan jaringan \"%s\"…"
+msgstr "Otentikasi pengguna diperlukan untuk koneksi jaringan \"%s\"…"
 
 #: ../src/applet.c:2556 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:607
@@ -528,12 +527,12 @@
 #: ../src/applet.c:2632
 #, c-format
 msgid "Starting VPN connection “%s”…"
-msgstr "Memulai sambungan VPN \"%s\"…"
+msgstr "Memulai koneksi VPN \"%s\"…"
 
 #: ../src/applet.c:2635
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
-msgstr "Otentikasi pengguna diperlukan untuk sambungan VPN \"%s\"…"
+msgstr "Otentikasi pengguna diperlukan untuk koneksi VPN \"%s\"…"
 
 #: ../src/applet.c:2638
 #, c-format
@@ -547,7 +546,7 @@
 
 #: ../src/applet.c:2691
 msgid "No network connection"
-msgstr "Tak ada sambungan jaringan"
+msgstr "Tak ada koneksi jaringan"
 
 #: ../src/applet.c:3292
 msgid "NetworkManager Applet"
@@ -566,46 +565,46 @@
 msgid "Sending unlock code…"
 msgstr "Mengirim kode pembuka…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:507
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Data Seluler (%s)"
 
-#: ../src/applet-device-broadband.c:738
+#: ../src/applet-device-broadband.c:739
 #: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Data Seluler"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Tersedia"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 msgid "New Mobile Broadband connection…"
 msgstr "Sambungan Data Seluler baru…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Sambungan Terjalin"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Anda kini tersambung ke jaringan Data Seluler."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "Jaringan Data Seluler."
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "Anda kini terdaftar ke jaringan rumah."
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "Anda kini terdaftar ke jaringan roaming."
 
@@ -616,17 +615,17 @@
 #: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
-msgstr "Menyiapkan sambungan data seluler \"%s\"…"
+msgstr "Menyiapkan koneksi data seluler \"%s\"…"
 
 #: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
-msgstr "Mengatur sambungan data seluler \"%s\"…"
+msgstr "Mengatur koneksi data seluler \"%s\"…"
 
 #: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
-msgstr "Otentikasi pengguna dibutuhkan untuk sambungan data seluler \"%s\"…"
+msgstr "Otentikasi pengguna dibutuhkan untuk koneksi data seluler \"%s\"…"
 
 #: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
 #, c-format
@@ -662,18 +661,17 @@
 #: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
-msgstr "Menyiapkan sambungan jaringan ethernet \"%s\"…"
+msgstr "Menyiapkan koneksi jaringan ethernet \"%s\"…"
 
 #: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
-msgstr "Mengatur sambungan jaringan ethernet \"%s\"…"
+msgstr "Mengatur koneksi jaringan ethernet \"%s\"…"
 
 #: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
-msgstr ""
-"Otentikasi pengguna diperlukan untuk sambungan jaringan ethernet \"%s\"…"
+msgstr "Otentikasi pengguna diperlukan untuk koneksi jaringan ethernet \"%s\"…"
 
 #: ../src/applet-device-ethernet.c:170
 #, c-format
@@ -713,91 +711,91 @@
 msgid "(none)"
 msgstr "(tidak ada)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
-msgstr "Gagal menambahkan sambungan baru"
+msgstr "Gagal menambahkan koneksi baru"
 
 #: ../src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Privilese tidak cukup."
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Jaringan Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Jaringan Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Jaringan Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi dinonaktifkan"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi dinonaktifkan oleh saklar perangkat keras"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Jaringan lain"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Jaringan Wi-Fi Tersedia"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Gunakan menu jaringan untuk menyambung ke jaringan Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Anda sekarang tersambung ke jaringan Wi-Fi \"%s\"."
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
-msgstr "Menyiapkan sambungan jaringan Wi-Fi \"%s\"…"
+msgstr "Menyiapkan koneksi jaringan Wi-Fi \"%s\"…"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
-msgstr "Mengatur sambungan jaringan Wi-Fi \"%s\"…"
+msgstr "Mengatur koneksi jaringan Wi-Fi \"%s\"…"
 
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Otentikasi pengguna diperlukan untuk jaringan Wi-Fi \"%s\"…"
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Meminta alamat jaringan Wi-Fi untuk \"%s\"…"
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Sambungan jaringan Wi-Fi \"%s\" aktif: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Sambungan jaringan Wi-Fi \"%s\" aktif"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Gagal mengaktifkan koneksi"
 
 #: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
-msgstr "Galat menampilkan informasi sambungan:"
+msgstr "Galat menampilkan informasi koneksi:"
 
 #: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
 #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
@@ -964,7 +962,7 @@
 #. Shouldn't really happen but ...
 #: ../src/applet-dialogs.c:958
 msgid "No valid active connections found!"
-msgstr "Tak ditemukan sambungan aktif yang valid!"
+msgstr "Tak ditemukan koneksi aktif yang valid!"
 
 #: ../src/applet-dialogs.c:1007
 msgid ""
@@ -980,7 +978,7 @@
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
-"Aplet wilayah pemberitahuan untuk mengelola perangkat dan sambungan jaringan "
+"Aplet wilayah pemberitahuan untuk mengelola perangkat dan koneksi jaringan "
 "Anda."
 
 #: ../src/applet-dialogs.c:1012
@@ -1080,6 +1078,19 @@
 msgid "Show PIN/PUK codes"
 msgstr "Tampilkan kode PIN/PUK"
 
+#: ../src/applet-vpn-request.c:201
+msgid "Connection had no VPN setting"
+msgstr "Sambungan tidak memiliki pengaturan VPN"
+
+#: ../src/applet-vpn-request.c:251
+#, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Gagal menulis koneksi ke UI VPN: %s (%d)"
+
+#: ../src/applet-vpn-request.c:259
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr "Gagal menulis koneksi ke UI VPN: tidak lengkap menulis"
+
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
 #: ../src/connection-editor/ce-page.h:114
@@ -1095,7 +1106,7 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
 #: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
@@ -1106,7 +1117,7 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
 #: ../src/connection-editor/connection-helpers.c:772
 #: ../src/connection-editor/nm-connection-list.ui.h:4
@@ -1121,7 +1132,7 @@
 #: ../src/connection-editor/ce-ip4-routes.ui.h:7
 #: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
-msgstr "G_unakan sambungan ini hanya untuk sumber daya pada jaringannya"
+msgstr "G_unakan koneksi ini hanya untuk sumber daya pada jaringannya"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:8
 #: ../src/connection-editor/ce-ip6-routes.ui.h:8
@@ -1129,8 +1140,8 @@
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
-"Bila diaktifkan, sambungan ini tidak akan pernah bisa digunakan sebagai "
-"sambungan jaringan baku."
+"Bila diaktifkan, koneksi ini tidak akan pernah bisa digunakan sebagai "
+"koneksi jaringan baku."
 
 #: ../src/connection-editor/ce-new-connection.ui.h:2
 msgid "C_reate…"
@@ -1149,7 +1160,7 @@
 msgstr ""
 "Pilih tipe koneksi yang ingin Anda buat.\n"
 "\n"
-"Bila Anda membuat suatu VPN, dan sambungan VPN yang ingin Anda buat tidak "
+"Bila Anda membuat suatu VPN, dan koneksi VPN yang ingin Anda buat tidak "
 "muncul pada daftar, mungkin Anda belum memasang plugin VPN yang tepat."
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
@@ -1416,7 +1427,7 @@
 "cloning or spoofing. Example: 00:11:22:33:44:55"
 msgstr ""
 "Alamat MAC yang dimasukkan di sini akan dipakai sebagai alamat perangkat "
-"keras bagi perangkat jaringan untuk sambungan yang diaktifkan. Fitur ini "
+"keras bagi perangkat jaringan untuk koneksi yang diaktifkan. Fitur ini "
 "dikenal sebagai klon atau spoof MAC. Contoh: 00:11:22:33:44:55"
 
 #: ../src/connection-editor/ce-page.c:341
@@ -1472,11 +1483,11 @@
 
 #: ../src/connection-editor/ce-page.c:725
 msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Gagal memperbarui rahasia sambungan karena galat yang tak dikenal."
+msgstr "Gagal memperbarui rahasia koneksi karena galat yang tak dikenal."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:1
 msgid "_Use Data Center Bridging (DCB) for this connection"
-msgstr "G_unakan Data Center Bridging (DCB) untuk sambungan ini"
+msgstr "G_unakan Data Center Bridging (DCB) untuk koneksi ini"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:2
 msgid "FCoE"
@@ -1634,10 +1645,22 @@
 msgstr "Nama pengg_una:"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "Username used to authenticate with the PPPoE service."
+msgstr "Nama pengguna digunakan untuk mengotentikasi dengan layanan PPPoE."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+"Hanya memulai sesi dengan konsentrator akses yang menyediakan layanan yang "
+"ditentukan. Bagi sebagian besar penyedia, ini harus dibiarkan kosong."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
 msgid "_Service:"
 msgstr "_Layanan:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:5
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 #: ../src/wireless-security/ws-leap.ui.h:3
@@ -1645,7 +1668,11 @@
 msgid "Sho_w password"
 msgstr "Tampilkan _sandi"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-dsl.ui.h:6
+msgid "Password used to authenticate with the PPPoE service."
+msgstr "Kata sandi digunakan untuk mengotentikasi dengan layanan PPPoE."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:7
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
 #: ../src/libnma/nma-vpn-password-dialog.c:97
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
@@ -1656,13 +1683,29 @@
 msgid "_Password:"
 msgstr "_Sandi:"
 
+#: ../src/connection-editor/ce-page-dsl.ui.h:8
+msgid "PPP _interface:"
+msgstr "Antar_muka PPP:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:9
+msgid "P_arent interface:"
+msgstr "_Antarmuka induk:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:10
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr "Nama sebarang untuk diberikan pada antarmuka PPP yang baru dibuat."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:11
+msgid "The interface on which the PPP connection will be established."
+msgstr "Antarmuka koneksi PPP akan terbentuk."
+
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
 #: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "Otomatis"
@@ -1708,7 +1751,7 @@
 msgstr "Penuh"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "Abaikan"
 
@@ -1716,7 +1759,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "Atur sendiri"
 
@@ -1984,12 +2027,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "Berbagi dengan komputer lain"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "_Metode:"
 
@@ -2004,7 +2047,7 @@
 "DHCP, masukkan disini."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2017,16 +2060,16 @@
 msgstr "ID klien D_HCP:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "Ranah p_encarian:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "Server _DNS:"
 
@@ -2040,18 +2083,18 @@
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 msgid "Require IPv_4 addressing for this connection to complete"
-msgstr "Memerlukan pengalamatan IPv_4 agar sambungan ini lengkap"
+msgstr "Memerlukan pengalamatan IPv_4 agar koneksi ini lengkap"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
-"Ketika menyambung ke jaringan yang mampu-IPv6, memungkinkan sambungan "
-"komplit bila konfigurasi IPv4 gagal tetapi konfigurasi IPv6 sukses."
+"Ketika menyambung ke jaringan yang mampu-IPv6, memungkinkan koneksi komplit "
+"bila konfigurasi IPv4 gagal tetapi konfigurasi IPv6 sukses."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "_Route…"
 
@@ -2069,7 +2112,15 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "Difungsikan (lebih suka alamat sementara)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr "EUI64"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Stable privacy"
+msgstr "Privasi Stabil"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -2079,21 +2130,25 @@
 "Gunakan koma untuk memisahkan alamat beberapa server nama domain. Alamat "
 "link-local akan secara otomatis di-scope ke antar muka penyambung."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "Ekstensi _privasi IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr "Mode _pembuatan alamat IPv6:"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
-msgstr "Memerlukan pengalamatan IPv_6 agar sambungan ini lengkap"
+msgstr "Memerlukan pengalamatan IPv_6 agar koneksi ini lengkap"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
-"Ketika menyambung ke jaringan yang mampu-IPv4, memungkinkan sambungan "
-"komplit bila konfigurasi IPv6 gagal tetapi konfigurasi IPv4 sukses."
+"Ketika menyambung ke jaringan yang mampu-IPv4, memungkinkan koneksi komplit "
+"bila konfigurasi IPv6 gagal tetapi konfigurasi IPv4 sukses."
 
 #: ../src/connection-editor/ce-page-macsec.ui.h:1
 msgid "PSK"
@@ -2963,7 +3018,7 @@
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
 "Pada kebanyakan kasus, server PPP dari penyedia akan mendukung semua metoda "
-"otentikasi. Bila sambungan gagal, cobalah mematikan dukungan untuk beberapa "
+"otentikasi. Bila koneksi gagal, cobalah mematikan dukungan untuk beberapa "
 "metoda."
 
 #: ../src/connection-editor/connection-helpers.c:106
@@ -2978,7 +3033,7 @@
 msgstr "Bluetooth"
 
 #: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:127
+#: ../src/connection-editor/page-dsl.c:201
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
@@ -3018,7 +3073,7 @@
 
 #: ../src/connection-editor/connection-helpers.c:124
 #: ../src/connection-editor/connection-helpers.c:398
-#: ../src/connection-editor/page-vpn.c:96
+#: ../src/connection-editor/page-vpn.c:103
 msgid "VPN"
 msgstr "VPN"
 
@@ -3028,13 +3083,13 @@
 "\n"
 "Error: no VPN service type."
 msgstr ""
-"Plugin VPN gagal mengimpor sambungan VPN dengan benar\n"
+"Plugin VPN gagal mengimpor koneksi VPN dengan benar\n"
 "\n"
 "Galat: tak ada tipe layanan VPN."
 
 #: ../src/connection-editor/connection-helpers.c:219
 msgid "Cannot import VPN connection"
-msgstr "Tak dapat mengimpor sambungan VPN"
+msgstr "Tak dapat mengimpor koneksi VPN"
 
 #: ../src/connection-editor/connection-helpers.c:221
 #, c-format
@@ -3044,7 +3099,7 @@
 "\n"
 "Error: %s."
 msgstr ""
-"Berkas \"%s\" tidak dapat dibaca atau tidak berisi informasi sambungan VPN "
+"Berkas \"%s\" tidak dapat dibaca atau tidak berisi informasi koneksi VPN "
 "yang dikenali\n"
 "\n"
 "Galat: %s."
@@ -3085,26 +3140,26 @@
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
-"Dialog penyunting sambungan tidak dapat diinisialisasi karena galat yang tak "
+"Dialog penyunting koneksi tidak dapat diinisialisasi karena galat yang tak "
 "dikenal."
 
 #: ../src/connection-editor/connection-helpers.c:557
 msgid "Could not create new connection"
-msgstr "Tak bisa membuat sambungan baru"
+msgstr "Tak bisa membuat koneksi baru"
 
 #: ../src/connection-editor/connection-helpers.c:720
 msgid "Connection delete failed"
-msgstr "Penghapusan sambungan gagal"
+msgstr "Penghapusan koneksi gagal"
 
 #: ../src/connection-editor/connection-helpers.c:768
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
-msgstr "Anda yakin ingin menghapus sambungan %s?"
+msgstr "Anda yakin ingin menghapus koneksi %s?"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "Alamat"
 
@@ -3116,7 +3171,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "Gateway"
 
@@ -3126,7 +3181,7 @@
 msgstr "Metrik"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "Awalan"
 
@@ -3137,7 +3192,7 @@
 
 #: ../src/connection-editor/nm-connection-editor.c:113
 msgid "Editing un-named connection"
-msgstr "Sunting sambungan tak bernama"
+msgstr "Sunting koneksi tak bernama"
 
 #: ../src/connection-editor/nm-connection-editor.c:133
 msgid "Missing connection name"
@@ -3162,8 +3217,8 @@
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
-"Penyunting sambungan tak dapat menemukan beberapa sumber daya yang "
-"diperlukan (berkas .ui tak ditemukan)."
+"Penyunting koneksi tak dapat menemukan beberapa sumber daya yang diperlukan "
+"(berkas .ui tak ditemukan)."
 
 #: ../src/connection-editor/nm-connection-editor.c:578
 #: ../src/connection-editor/vpn-helpers.c:213
@@ -3172,25 +3227,25 @@
 
 #: ../src/connection-editor/nm-connection-editor.c:579
 msgid "Save any changes made to this connection."
-msgstr "Simpan perubahan yang dibuat atas sambungan ini."
+msgstr "Simpan perubahan yang dibuat atas koneksi ini."
 
 #: ../src/connection-editor/nm-connection-editor.c:580
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
-"Lalukan otentikasi untuk menyimpan sambungan ini bagi semua pengguna dari "
+"Lalukan otentikasi untuk menyimpan koneksi ini bagi semua pengguna dari "
 "mesin ini."
 
 #: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not create connection"
-msgstr "Tak bisa membuat sambungan"
+msgstr "Tak bisa membuat koneksi"
 
 #: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not edit connection"
-msgstr "Tak bisa menyunting sambungan"
+msgstr "Tak bisa menyunting koneksi"
 
 #: ../src/connection-editor/nm-connection-editor.c:598
 msgid "Unknown error creating connection editor dialog."
-msgstr "Galat tak dikenal saat membuat dialog penyunting sambungan."
+msgstr "Galat tak dikenal saat membuat dialog penyunting koneksi."
 
 #: ../src/connection-editor/nm-connection-editor.c:739
 msgid ""
@@ -3204,7 +3259,7 @@
 msgid "Error initializing editor"
 msgstr "Galat menginisialisasi penyunting"
 
-#: ../src/connection-editor/nm-connection-editor.c:1159
+#: ../src/connection-editor/nm-connection-editor.c:1157
 msgid "Connection add failed"
 msgstr "Penambahan koneksi gagal"
 
@@ -3222,7 +3277,7 @@
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
-msgstr "_Nama sambungan:"
+msgstr "_Nama koneksi:"
 
 #: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "_Export…"
@@ -3315,24 +3370,24 @@
 
 #: ../src/connection-editor/nm-connection-list.c:836
 msgid "Edit the selected connection"
-msgstr "Sunting sambungan terpilih"
+msgstr "Sunting koneksi terpilih"
 
 #: ../src/connection-editor/nm-connection-list.c:837
 msgid "Authenticate to edit the selected connection"
-msgstr "Lakukan otentikasi untuk menyunting sambungan yang dipilih"
+msgstr "Lakukan otentikasi untuk menyunting koneksi yang dipilih"
 
 #: ../src/connection-editor/nm-connection-list.c:842
 msgid "Delete the selected connection"
-msgstr "Hapus sambungan yang dipilih"
+msgstr "Hapus koneksi yang dipilih"
 
 #: ../src/connection-editor/nm-connection-list.c:843
 msgid "Authenticate to delete the selected connection"
-msgstr "Lakukan otentikasi untuk menghapus sambungan yang dipilih"
+msgstr "Lakukan otentikasi untuk menghapus koneksi yang dipilih"
 
 #: ../src/connection-editor/nm-connection-list.c:1048
 #: ../src/connection-editor/nm-connection-list.c:1051
 msgid "Error creating connection"
-msgstr "Galat saat membuat sambungan"
+msgstr "Galat saat membuat koneksi"
 
 #: ../src/connection-editor/nm-connection-list.c:1049
 msgid "No VPN plugins are installed."
@@ -3341,11 +3396,11 @@
 #: ../src/connection-editor/nm-connection-list.c:1052
 #, c-format
 msgid "Don’t know how to create “%s” connections"
-msgstr "Tidak tahu bagaimana membuat sambungan \"%s\""
+msgstr "Tidak tahu bagaimana membuat koneksi \"%s\""
 
 #: ../src/connection-editor/nm-connection-list.c:1085
 msgid "Error editing connection"
-msgstr "Galat saat menyunting sambungan"
+msgstr "Galat saat menyunting koneksi"
 
 #: ../src/connection-editor/nm-connection-list.c:1086
 #, c-format
@@ -3366,7 +3421,7 @@
 
 #: ../src/connection-editor/page-8021x-security.c:132
 msgid "Use 802.1_X security for this connection"
-msgstr "Gunakan keamanan 802.1_X untuk sambungan ini"
+msgstr "Gunakan keamanan 802.1_X untuk koneksi ini"
 
 #: ../src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
@@ -3443,11 +3498,15 @@
 msgid "Could not load DCB user interface."
 msgstr "Tak dapat memuat antar muka pengguna DCB."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: ../src/connection-editor/page-dsl.c:203
 msgid "Could not load DSL user interface."
 msgstr "Tak dapat memuat antar muka pengguna DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: ../src/connection-editor/page-dsl.c:298
+msgid "missing parent interface"
+msgstr "antarmuka induk yang hilang"
+
+#: ../src/connection-editor/page-dsl.c:343
 #, c-format
 msgid "DSL connection %d"
 msgstr "Sambungan DSL %d"
@@ -3458,7 +3517,7 @@
 "its interface name or permanent MAC or both. Examples: “em1”, "
 "“3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”"
 msgstr ""
-"Opsi ini mengunci sambungan ini ke perangkat jaringan yang dinyatakan oleh "
+"Opsi ini mengunci koneksi ini ke perangkat jaringan yang dinyatakan oleh "
 "nama antarmukanya atau MAC permanen atau keduanya. Contoh: \"em1\", "
 "\"3C:97:0E:42:1A:19\", \"em1 (3C:97:0E:42:1A:19)\""
 
@@ -3545,27 +3604,27 @@
 msgstr "Koneksi tunnel IP %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "Otomatis (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "Otomatis (VPN) hanya alamat"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "Otomatis, hanya alamat"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "Otomatis (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Otomatis (PPPoE) hanya alamat"
 
@@ -3578,17 +3637,17 @@
 msgstr "Otomatis (DHCP) hanya alamat"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "Hanya Link-Lokal"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "Server _DNS tambahan:"
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "Ranah p_encarian tambahan:"
 
@@ -3625,39 +3684,39 @@
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "Server DNS IPv4 \"%s\" tak valid"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "Otomatis, hanya DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Menyunting rute IPv6 untuk %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "Tatanan IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr "Tak bisa memuat antar muka pengguna IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "Alamat IPv6 \"%s\" tak valid"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "Prefiks IPv6 \"%s\" tak valid"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "Gateway IPv6 \"%s\" tak valid"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "Server DNS IPv6 \"%s\" tak valid"
@@ -3701,7 +3760,7 @@
 
 #: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
-msgstr "Jenis sambungan data seluler tidak didukung."
+msgstr "Jenis koneksi data seluler tidak didukung."
 
 #. Fall back to just asking for GSM vs. CDMA
 #: ../src/connection-editor/page-mobile.c:540
@@ -3836,49 +3895,49 @@
 msgid "VLAN connection %d"
 msgstr "Sambungan VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Tak bisa memuat antar muka pengguna VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Tak bisa menemukan plugin VPN bagi \"%s\"."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:67
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Tak bisa menemukan plugin VPN penyunting bagi \"%s\" (%s)."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: ../src/connection-editor/page-vpn.c:68
 msgid "unknown failure"
 msgstr "kegagalan yang tak dikenal"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:105
+msgid "Could not load VPN user interface."
+msgstr "Tak bisa memuat antar muka pengguna VPN."
+
+#: ../src/connection-editor/page-vpn.c:120
+#, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Tak bisa menemukan plugin VPN bagi \"%s\"."
+
+#: ../src/connection-editor/page-vpn.c:202
 #, c-format
 msgid "VPN connection %d"
 msgstr "Sambungan VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: ../src/connection-editor/page-vpn.c:208
 msgid "Choose a VPN Connection Type"
 msgstr "Pilih Jenis Sambungan VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: ../src/connection-editor/page-vpn.c:209
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
 "of VPN connection you wish to create does not appear in the list, you may "
 "not have the correct VPN plugin installed."
 msgstr ""
-"Pilih tipe VPN yang ingin Anda pakai untuk sambungan baru. Bila tipe "
-"sambungan VPN yang ingin Anda buat tidak muncul pada daftar, mungkin Anda "
-"belum memasang plugin VPN yang tepat."
+"Pilih tipe VPN yang ingin Anda pakai untuk koneksi baru. Bila tipe koneksi "
+"VPN yang ingin Anda buat tidak muncul pada daftar, mungkin Anda belum "
+"memasang plugin VPN yang tepat."
 
 #: ../src/connection-editor/page-wifi.c:77
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
 "by the BSSID entered here. Example: 00:11:22:33:44:55"
 msgstr ""
-"Opsi ini mengunci sambungan ini ke access point (AP) Wi-Fi yang dinyatakan "
+"Opsi ini mengunci koneksi ini ke access point (AP) Wi-Fi yang dinyatakan "
 "oleh BSSID yang dimasukkan disini. Contoh: 00:11:22:33:44:55"
 
 #: ../src/connection-editor/page-wifi.c:88
@@ -3887,7 +3946,7 @@
 "its interface name or permanent MAC or both. Examples: “wlan0”, "
 "“3C:97:0E:42:1A:19”, “wlan0 (3C:97:0E:42:1A:19)”"
 msgstr ""
-"Opsi ini mengunci sambungan ini ke perangkat jaringan yang dinyatakan oleh "
+"Opsi ini mengunci koneksi ini ke perangkat jaringan yang dinyatakan oleh "
 "nama antarmukanya atau MAC permanen atau keduanya. Contoh: \"wlan0\", "
 "\"3C:97:0E:42:1A:19\", \"wlan0 (3C:97:0E:42:1A:19)\""
 
@@ -3973,12 +4032,11 @@
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
-"Apakah Anda ingin menggantikan %s dengan sambungan VPN yang sedang Anda "
-"simpan?"
+"Apakah Anda ingin menggantikan %s dengan koneksi VPN yang sedang Anda simpan?"
 
 #: ../src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
-msgstr "Tidak dapat mengekspor sambungan VPN"
+msgstr "Tidak dapat mengekspor koneksi VPN"
 
 #: ../src/connection-editor/vpn-helpers.c:174
 #, c-format
@@ -3993,7 +4051,7 @@
 
 #: ../src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
-msgstr "Ekspor sambungan VPN…"
+msgstr "Ekspor koneksi VPN…"
 
 #: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
@@ -4088,8 +4146,8 @@
 "Preferences menu."
 msgstr ""
 "Sambungan kini akan dibuat ke operator data seluler Anda memakai tatanan "
-"yang Anda pilih. Bila sambungan gagal atau Anda tak dapat mengakses sumber "
-"daya jaringan, periksa ulang tatanan Anda. Untuk mengubah tatanan sambungan "
+"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 \"Sambungan Jaringan\" dari menu Sistem → "
 "Preferensi."
 
@@ -4122,7 +4180,7 @@
 "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 ketersambungan.\n"
+"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."
@@ -4208,7 +4266,7 @@
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr ""
-"Asisten ini membantu Anda menyiapkan dengan mudah sambungan data seluler ke "
+"Asisten ini membantu Anda menyiapkan dengan mudah koneksi data seluler ke "
 "jaringan 3G."
 
 #: ../src/libnma/nma-mobile-wizard.c:1360
@@ -4236,7 +4294,7 @@
 #: ../src/libnma/nma-mobile-wizard.c:1412
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
-msgstr "Buat sambungan bagi perangka_t data seluler ini:"
+msgstr "Buat koneksi bagi perangka_t data seluler ini:"
 
 #: ../src/libnma/nma-mobile-wizard.c:1427
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1428
diff -Nru network-manager-applet-1.8.4/po/it.po network-manager-applet-1.8.10/po/it.po
--- network-manager-applet-1.8.4/po/it.po	2017-09-10 18:05:55.000000000 +0000
+++ network-manager-applet-1.8.10/po/it.po	2017-12-19 11:44:30.000000000 +0000
@@ -11,15 +11,14 @@
 # Francesco Marletta , 2004, 2005, 2006, 2007, 2008, 2009, 2010.
 # Gianvito Cavasoli , 2011.
 # Milo Casagrande , 2011, 2012, 2013, 2014, 2015, 2016, 2017.
-#
+# lrintel , 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2017-09-08 08:39+0000\n"
-"PO-Revision-Date: 2017-09-10 15:29+0200\n"
-"Last-Translator: Milo Casagrande \n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-12-12 11:18+0100\n"
+"PO-Revision-Date: 2017-11-07 06:45+0000\n"
+"Last-Translator: Copied by Zanata \n"
 "Language-Team: Italian \n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +26,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Launchpad-Export-Date: 2012-03-09 08:20+0000\n"
-"X-Generator: Poedit 2.0.1\n"
+"X-Generator: Zanata 4.3.2\n"
 
 #: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
@@ -168,17 +167,17 @@
 msgid "The NetworkManager Developers"
 msgstr "Gli sviluppatori di NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:477
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "l'oggetto di classe «%s» non ha una proprietà di nome «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:484
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "la proprietà «%s» dell'oggetto di classe «%s» non è scrivibile"
 
-#: ../shared/nm-utils/nm-shared-utils.c:491
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -186,19 +185,19 @@
 "proprietà costruttore «%s» dell'oggetto «%s» non può essere impostata dopo "
 "l'inizializzazione"
 
-#: ../shared/nm-utils/nm-shared-utils.c:499
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "«%s::%s» non è un nome valido di proprietà; «%s» non un sotto-tipo GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:508
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "impossibile impostare la proprietà «%s» di tipo «%s» dal valore di tipo «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:519
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -257,12 +256,12 @@
 msgstr "Aggiunta/Attivazione della connessione non riuscita"
 
 #: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
 #: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Connessione non riuscita"
 
@@ -278,7 +277,7 @@
 msgid "Connection activation failed"
 msgstr "Attivazione della connessione non riuscita"
 
-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Non mostrare più questo messaggio"
 
@@ -522,7 +521,6 @@
 msgid "Disconnected"
 msgstr "Disconnessi"
 
-#
 #: ../src/applet.c:2248
 msgid "The network connection has been disconnected."
 msgstr "La connessione di rete è stata terminata."
@@ -589,46 +587,46 @@
 msgid "Sending unlock code…"
 msgstr "Invio codice di sblocco…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:507
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda larga mobile (%s)"
 
-#: ../src/applet-device-broadband.c:738
+#: ../src/applet-device-broadband.c:739
 #: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Banda larga mobile"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Disponibile"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 msgid "New Mobile Broadband connection…"
 msgstr "Nuova connessione a banda larga mobile…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Connessione stabilita"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Attualmente connessi alla rete a banda larga mobile."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "Rete a banda larga mobile."
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "Attualmente registrati sulla rete del proprio provider."
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "Attualmente registrati su una rete in roaming."
 
@@ -736,7 +734,7 @@
 msgid "(none)"
 msgstr "(nessuna)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Aggiunta della nuova connessione non riuscita"
 
@@ -744,79 +742,79 @@
 msgid "Insufficient privileges."
 msgstr "Privilegi insufficienti."
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Reti Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Rete Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Rete Wi-Fi"
 msgstr[1] "Reti Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi disabilitata"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi disabilitata da interruttore hardware"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Altre reti"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Disponibili reti Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Usare il menù rete per connettersi a una rete Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Attualmente connessi alla rete Wi-Fi «%s»."
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Preparazione della connessione Wi-Fi «%s»…"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Configurazione della connessione Wi-Fi «%s»…"
 
 # (ndt) un po' libera, ma resa simile a quella di ethernet
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Richiesta autenticazione utente per la connessione Wi-Fi «%s»…"
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Richiesta di un indirizzo Wi-Fi per «%s»…"
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Connessione Wi-Fi «%s» attiva: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Connessione Wi-Fi «%s» attiva"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Attivazione della connessione non riuscita"
 
@@ -1109,6 +1107,20 @@
 msgid "Show PIN/PUK codes"
 msgstr "Mostra codici PIN/PUK"
 
+#: ../src/applet-vpn-request.c:201
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "La connessione non può essere eliminata"
+
+#: ../src/applet-vpn-request.c:251
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Attivazione della connessione non riuscita"
+
+#: ../src/applet-vpn-request.c:259
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
+
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
 #: ../src/connection-editor/ce-page.h:114
@@ -1124,7 +1136,7 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
 #: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
@@ -1135,7 +1147,7 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
 #: ../src/connection-editor/connection-helpers.c:772
 #: ../src/connection-editor/nm-connection-list.ui.h:4
@@ -1730,7 +1742,7 @@
 #: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "Automatico"
@@ -1776,7 +1788,7 @@
 msgstr "Full"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -1784,7 +1796,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "Manuale"
 
@@ -2052,12 +2064,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "Condiviso con altri computer"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "_Metodo:"
 
@@ -2072,7 +2084,7 @@
 "identificatore del client DHCP, inserirlo qui."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2085,16 +2097,16 @@
 msgstr "Id client D_HCP:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "Domini di _ricerca:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "Server _DNS:"
 
@@ -2121,7 +2133,7 @@
 "IPv6 ha successo."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "_Instradamenti…"
 
@@ -2139,7 +2151,15 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "Abilitata (preferire indirizzo temporaneo)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Stable privacy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -2150,15 +2170,19 @@
 "dominio. Gli indirizzi link-local verranno collegati all'interfaccia di "
 "connessione."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "Estensioni _privacy IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Richiedere indirizzo IPv_6 per completare questa connessione"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -3183,7 +3207,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "Indirizzo"
 
@@ -3196,7 +3220,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "Gateway"
 
@@ -3206,7 +3230,7 @@
 msgstr "Metrica"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "Prefisso"
 
@@ -3638,27 +3662,27 @@
 msgstr "Connessione tunnel IP %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "Automatico (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatico (VPN) solo indirizzi"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "Automatico, solo indirizzi"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "Automatico (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatico (PPPoE) solo indirizzi"
 
@@ -3673,17 +3697,17 @@
 # [NdT] si tratta di un protocollo di risoluzione nomi locali
 #       http://en.wikipedia.org/wiki/Link-local_address
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "Solo Link-Local"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "Server _DNS aggiuntivi:"
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "Domini di _ricerca aggiuntivi:"
 
@@ -3720,39 +3744,39 @@
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "Server DNS IPv4 «%s» non valido"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "Automatico, solo (DHCP)"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Modifica instradamenti IPv6 per %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "Impostazioni IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr "Impossibile caricare l'interfaccia utente per IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "Indirizzo IPv6 «%s» non valido"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "Prefisso IPv6 «%s» non valido"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "Gateway IPv6 «%s» non valido"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "Server DNS IPv6 «%s» non valido"
@@ -4030,7 +4054,6 @@
 # fornite dai prodotti. I WPA(2)-Personal utilizzeranno il metodo PSK a
 # chiave condivisa mentre i WPA(2)-Enterprise utilizzeranno un server
 # di autenticazione.
-#
 #: ../src/connection-editor/page-wifi-security.c:407
 #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
@@ -4990,432 +5013,3 @@
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "_Tipo:"
-
-#~ msgid "DSL"
-#~ msgstr "DSL"
-
-#~ msgid "Mode"
-#~ msgstr "Modalità"
-
-#~ msgid "MTU"
-#~ msgstr "MTU"
-
-#~ msgid "no file selected"
-#~ msgstr "nessun file selezionato"
-
-#~ msgid "file “%s” does not exist"
-#~ msgstr "il file «%s» non esiste"
-
-#~ msgid "unspecified error validating eap-method file"
-#~ msgstr "errore non specificato nel validare il file eap-method"
-
-#~ msgid "invalid EAP-PEAP CA certificate: %s"
-#~ msgstr "certificato CA EAP-PEAP non valido: %s"
-
-#~ msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-#~ msgstr "certificato CA EAP-PEAP non valido: nessun certificato specificato"
-
-# (ndt) titolo finestra
-#~ msgid "Choose a Certificate Authority certificate"
-#~ msgstr "Scelta certificato di Autorità di Certificazione"
-
-#~ msgid "C_A certificate:"
-#~ msgstr "Certificato della C_A:"
-
-#~ msgid "invalid EAP-TTLS CA certificate: %s"
-#~ msgstr "certificato CA EAP-TTLS non valido: %s"
-
-#~ msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-#~ msgstr "certificato CA EAP-TTLS non valido: nessun certificato specificato"
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection “%s” disconnected because the VPN service stopped."
-#~ msgstr ""
-#~ "\n"
-#~ "La connessione VPN «%s» si è chiusa perché il servizio VPN è stato "
-#~ "fermato."
-
-# [NdT] certo che l'originare era proprio brutto
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection “%s” disconnected."
-#~ msgstr ""
-#~ "\n"
-#~ "La connessione VPN «%s» si è chiusa."
-
-#~ msgid "invalid EAP-TLS CA certificate: %s"
-#~ msgstr "certificato CA EAP-TLS non valido: %s"
-
-#~ msgid "invalid EAP-TLS CA certificate: no certificate specified"
-#~ msgstr "certificato CA EAP-TLS non valido: nessun certificato specificato"
-
-#~ msgid "invalid EAP-TLS password: missing"
-#~ msgstr "password EAP-TLS non valida: manca la password"
-
-#~ msgid "invalid EAP-TLS private-key: %s"
-#~ msgstr "chiave privata EAP-TLS non valida: %s"
-
-#~ msgid "invalid EAP-TLS user-certificate: %s"
-#~ msgstr "certificato utente EAP-TLS non valido: %s"
-
-#~ msgid "Unencrypted private keys are insecure"
-#~ msgstr "Le chiavi private non cifrate sono insicure"
-
-#~ msgid ""
-#~ "The selected private key does not appear to be protected by a password. "
-#~ "This could allow your security credentials to be compromised. Please "
-#~ "select a password-protected private key.\n"
-#~ "\n"
-#~ "(You can password-protect your private key with openssl)"
-#~ msgstr ""
-#~ "La chiave privata selezionata non sembra essere protetta da una password. "
-#~ "Ciò potrebbe compromettere le proprie credenziali di sicurezza. "
-#~ "Selezionare una chiave privata protetta con password.\n"
-#~ "\n"
-#~ "(È possibile proteggere con password la propria chiave privata usando "
-#~ "openssl)"
-
-# (ndt) titolo finestra
-#~ msgid "Choose your private key"
-#~ msgstr "Scelta chiave privata"
-
-#~ msgid "New Mobile Broadband connection..."
-#~ msgstr "Nuova connessione a banda larga mobile..."
-
-#~ msgid "_Connect to Hidden Wi-Fi Network..."
-#~ msgstr "_Connetti a rete Wi-Fi nascosta..."
-
-#~ msgid "Create _New Wi-Fi Network..."
-#~ msgstr "Crea _nuova rete Wi-Fi..."
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "15"
-#~ msgstr "15"
-
-#~ msgid "Aut_onegotiate"
-#~ msgstr "Aut_o-negoziazione"
-
-#~ msgid "FirewallD is not running."
-#~ msgstr "FirewallD non è in esecuzione."
-
-#~ msgid "New..."
-#~ msgstr "Nuova..."
-
-#~ msgid "NetworkManager for GNOME"
-#~ msgstr "NetworkManager per GNOME"
-
-#~ msgid "_Disconnect VPN"
-#~ msgstr "_Disconnetti VPN"
-
-#~ msgid "_Help"
-#~ msgstr "A_iuto"
-
-#~ msgid "bdaddr"
-#~ msgstr "bdaddr"
-
-#~ msgid "Infrastructure"
-#~ msgstr "Infrastruttura"
-
-#~ msgid "Enable WiMA_X Mobile Broadband"
-#~ msgstr "Abilita rete a banda larga mobile WiMA_X"
-
-#~ msgid "You are now connected to the bonded network."
-#~ msgstr "Attualmente connessi alla rete aggregata."
-
-#~ msgid "Preparing bond connection '%s'..."
-#~ msgstr "Preparazione della connessione aggregata «%s»..."
-
-#~ msgid "Configuring bond connection '%s'..."
-#~ msgstr "Configurazione della connessione aggregata «%s»..."
-
-#~ msgid "User authentication required for bond connection '%s'..."
-#~ msgstr ""
-#~ "Richiesta autenticazione utente per la connessione aggregata «%s»..."
-
-#~ msgid "Requesting address for '%s'..."
-#~ msgstr "Richiesta di un indirizzo per «%s»..."
-
-#~ msgid "Bond connection '%s' active"
-#~ msgstr "Connessione aggregata «%s» attiva"
-
-#~ msgid "You are now connected to the bridged network."
-#~ msgstr "Attualmente connessi alla rete bridged."
-
-#~ msgid "Preparing bridge connection '%s'..."
-#~ msgstr "Preparazione della connessione bridge «%s»..."
-
-#~ msgid "Configuring bridge connection '%s'..."
-#~ msgstr "Configurazione della connessione bridge «%s»..."
-
-#~ msgid "User authentication required for bridge connection '%s'..."
-#~ msgstr "Richiesta autenticazione utente per la connessione bridge «%s»..."
-
-#~ msgid "Bridge connection '%s' active"
-#~ msgstr "Connessione bridge «%s» attiva"
-
-#~ msgid "New Mobile Broadband (CDMA) connection..."
-#~ msgstr "Nuova connessione a banda larga mobile (CDMA)..."
-
-#~ msgid "You are now connected to the CDMA network."
-#~ msgstr "Attualmente connessi alla rete CDMA."
-
-#~ msgid "CDMA network."
-#~ msgstr "Rete CDMA"
-
-#~ msgid "New Mobile Broadband (GSM) connection..."
-#~ msgstr "Nuova connessione a banda larga mobile (GSM)..."
-
-#~ msgid "You are now connected to the GSM network."
-#~ msgstr "Attualmente connessi alla rete GSM."
-
-#~ msgid "GSM network."
-#~ msgstr "Rete GSM"
-
-#~ msgid "Auto InfiniBand"
-#~ msgstr "InfiniBand automatica"
-
-#~ msgid "InfiniBand Networks (%s)"
-#~ msgstr "Reti InfiniBand (%s)"
-
-#~ msgid "InfiniBand Network (%s)"
-#~ msgstr "Rete InfiniBand (%s)"
-
-#~ msgid "InfiniBand Networks"
-#~ msgstr "Reti InfiniBand"
-
-#~ msgid "InfiniBand Network"
-#~ msgstr "Rete InfiniBand"
-
-#~ msgid "You are now connected to the InfiniBand network."
-#~ msgstr "Attualmente connessi alla rete InfiniBand."
-
-#~ msgid "Preparing InfiniBand connection '%s'..."
-#~ msgstr "Preparazione della connessione InfiniBand «%s»..."
-
-#~ msgid "Configuring InfiniBand connection '%s'..."
-#~ msgstr "Configurazione della connessione InfiniBand «%s»..."
-
-#~ msgid "User authentication required for InfiniBand connection '%s'..."
-#~ msgstr ""
-#~ "Richiesta autenticazione utente per la connessione InfiniBand «%s»..."
-
-#~ msgid "InfiniBand connection '%s' active"
-#~ msgstr "Connessione InfiniBand «%s» attiva"
-
-#~ msgid "You are now connected to the teamed network."
-#~ msgstr "Attualmente connessi alla rete team."
-
-#~ msgid "Preparing team connection '%s'..."
-#~ msgstr "Preparazione della connessione team «%s»..."
-
-#~ msgid "Configuring team connection '%s'..."
-#~ msgstr "Configurazione della connessione team «%s»..."
-
-#~ msgid "User authentication required for team connection '%s'..."
-#~ msgstr "Richiesta autenticazione utente per la connessione team «%s»..."
-
-#~ msgid "Team connection '%s' active"
-#~ msgstr "Connessione team «%s» attiva"
-
-#~ msgid "You are now connected to the VLAN."
-#~ msgstr "Attualmente connessi alla VLAN."
-
-#~ msgid "Preparing VLAN connection '%s'..."
-#~ msgstr "Avvio della connessione VLAN «%s»..."
-
-#~ msgid "Configuring VLAN connection '%s'..."
-#~ msgstr "Avvio della connessione VLAN «%s»..."
-
-#~ msgid "User authentication required for VLAN connection '%s'..."
-#~ msgstr "Richiesta autenticazione utente per la connessione VLAN «%s»..."
-
-#~ msgid "VLAN connection '%s' active"
-#~ msgstr "Connessione VLAN «%s» attiva"
-
-#~ msgid "WiMAX Mobile Broadband (%s)"
-#~ msgstr "Banda larga mobile WiMAX (%s)"
-
-#~ msgid "WiMAX Mobile Broadband"
-#~ msgstr "Banda larga mobile WiMAX"
-
-#~ msgid "WiMAX is disabled"
-#~ msgstr "WiMAX disabilitata"
-
-#~ msgid "WiMAX is disabled by hardware switch"
-#~ msgstr "WiMAX disabilitata da interruttore hardware"
-
-#~ msgid "You are now connected to the WiMAX network."
-#~ msgstr "Attualmente connessi alla rete WiMAX."
-
-#~ msgid "%d dB"
-#~ msgstr "%d dB"
-
-#~ msgctxt "WiMAX CINR"
-#~ msgid "unknown"
-#~ msgstr "sconosciuto"
-
-#~ msgctxt "WiMAX Base Station ID"
-#~ msgid "unknown"
-#~ msgstr "sconosciuto"
-
-#~ msgid "WiMAX (%s)"
-#~ msgstr "WiMAX (%s)"
-
-#~ msgid "CINR:"
-#~ msgstr "CINR:"
-
-#~ msgid "BSID:"
-#~ msgstr "BSID:"
-
-#~ msgid "_Device MAC address:"
-#~ msgstr "Indirizzo _MAC dispositivo:"
-
-#~ msgid "Any"
-#~ msgstr "Qualunque"
-
-#~ msgid "3G (UMTS/HSPA)"
-#~ msgstr "3G (UMTS/HSPA)"
-
-#~ msgid "2G (GPRS/EDGE)"
-#~ msgstr "2G (GPRS/EDGE)"
-
-#~ msgid "Prefer 3G (UMTS/HSPA)"
-#~ msgstr "Preferire 3G (UMTS/HSPA)"
-
-#~ msgid "Prefer 2G (GPRS/EDGE)"
-#~ msgstr "Preferire 2G (GPRS/EDGE)"
-
-#~ msgid "Prefer 4G (LTE)"
-#~ msgstr "Preferire 4G (LTE)"
-
-#~ msgid "Use only 4G (LTE)"
-#~ msgstr "Usare solo 4G (LTE)"
-
-#~ msgid "I_mport team configuration from a file..."
-#~ msgstr "I_mporta configurazione team da file..."
-
-#~ msgid "WiMAX"
-#~ msgstr "WiMAX"
-
-#~ msgid "Error saving connection"
-#~ msgstr "Errore nel salvare la connessione"
-
-#~ msgid "The property '%s' / '%s' is invalid: %d"
-#~ msgstr "La proprietà «%s» / «%s» non è valida: %d"
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
-#~ "%s)."
-#~ msgstr ""
-#~ "Impossibile eseguire la configurazione Bluetooth (connessione a D-Bus non "
-#~ "riuscita: (%s) %s)."
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
-#~ "%s)."
-#~ msgstr ""
-#~ "Impossibile eseguire la configurazione Bluetooth (errore durante la "
-#~ "ricerca di NetworkManager: (%s) %s)."
-
-#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
-#~ msgstr "Usa il telefono cellulare come dispositivo di rete (PAN/NAP)"
-
-#~ msgid "Access the Internet using your mobile phone (DUN)"
-#~ msgstr "Accesso a Internet usando il telefono cellulare (DUN)"
-
-#~ msgid "Error: %s"
-#~ msgstr "Errore: %s"
-
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Creazione connessione DUN non riuscita: %s"
-
-#~ msgid "Your phone is now ready to use!"
-#~ msgstr "Il telefono è pronto all'uso."
-
-#~ msgid "Mobile wizard was canceled"
-#~ msgstr "L'assistente alla connessione mobile è stato annullato"
-
-#~ msgid "Unknown phone device type (not GSM or CDMA)"
-#~ msgstr "Tipo di telefono sconosciuto (né GSM né CDMA)"
-
-#~ msgid "failed to connect to the phone."
-#~ msgstr "connessione al telefono non riuscita."
-
-#~ msgid "error getting bus connection"
-#~ msgstr "errore nel recuperare il bus della connessione"
-
-#~ msgid "unexpectedly disconnected from the phone."
-#~ msgstr "disconnessione inattesa dal telefono."
-
-#~ msgid "timed out detecting phone details."
-#~ msgstr "tempo esaurito nel rilevare i dettagli del telefono."
-
-#~ msgid "Detecting phone configuration..."
-#~ msgstr "Rilevazione configurazione telefono..."
-
-#~ msgid ""
-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-#~ "Networking connection."
-#~ msgstr ""
-#~ "L'adattatore Bluetooth predefinito deve essere abilitato prima di poter "
-#~ "impostare una connessione Dial-Up-Networking."
-
-#~ msgid "Failed to create PAN connection: %s"
-#~ msgstr "Creazione connessione PAN non riuscita: %s"
-
-#~ msgid "%s Network"
-#~ msgstr "Rete %s"
-
-#~ msgid "Primary DNS:"
-#~ msgstr "DNS primario:"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS secondario:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS terziario:"
-
-#~ msgid "_Save..."
-#~ msgstr "_Salva..."
-
-#~ msgid "_Edit..."
-#~ msgstr "_Modifica..."
-
-#~ msgid "_Delete..."
-#~ msgstr "_Elimina..."
-
-#~ msgid "Automatic (PPP)"
-#~ msgstr "Automatico (PPP)"
-
-#~ msgid "Automatic (PPP) addresses only"
-#~ msgstr "Automatico (PPP) solo indirizzi"
-
-#~ msgid "unknown modem type."
-#~ msgstr "tipo di modem sconosciuto."
diff -Nru network-manager-applet-1.8.4/po/ja.po network-manager-applet-1.8.10/po/ja.po
--- network-manager-applet-1.8.4/po/ja.po	2017-06-05 15:13:55.000000000 +0000
+++ network-manager-applet-1.8.10/po/ja.po	2017-12-19 11:44:30.000000000 +0000
@@ -11,24 +11,24 @@
 # Takayoshi OKANO , 2011.
 # Jiro Matsuzawa , 2013.
 # Hajime Taira , 2013.
-# kmoriguc , 2017. #zanata
+# amoewaki , 2017. #zanata
 # lrintel , 2017. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-29 19:14+0200\n"
-"PO-Revision-Date: 2017-05-19 12:37+0000\n"
-"Last-Translator: kmoriguc \n"
+"POT-Creation-Date: 2017-12-12 11:18+0100\n"
+"PO-Revision-Date: 2017-12-04 09:21+0000\n"
+"Last-Translator: amoewaki \n"
 "Language-Team: Japanese \n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 4.1.1\n"
+"X-Generator: Zanata 4.3.2\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
 msgstr "ネットワーク"
 
@@ -37,7 +37,7 @@
 msgstr "ネットワーク接続を管理"
 
 #: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: ../src/connection-editor/nm-connection-list.ui.h:1
 msgid "Network Connections"
 msgstr "ネットワーク接続"
 
@@ -91,7 +91,7 @@
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:10
 msgid "Used to determine whether settings should be migrated to a new version."
-msgstr "セッティングが新規バージョンに移行すべきかどうかの判定に使用されます。"
+msgstr "設定を、新規バージョンに移行すべきかどうかの判定に使用されます。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:11
 msgid "Disable WiFi Create"
@@ -153,26 +153,26 @@
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
-"nm-connection-editor プログラムは NetworkManager と併用することで "
-"NetworkManager 用の接続プロファイルを作成し、また既存の接続プロファイルを編集"
-"します。"
+"nm-connection-editor プログラムは、NetworkManager と連携して NetworkManager "
+"用の接続プロファイルを作成し、また既存の接続プロファイルを編集します。"
 
 #: ../nm-connection-editor.appdata.xml.in.h:5
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager 開発者"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr "オブジェクトクラス '%s' には '%s' という名前のプロパティーがありません"
+msgstr ""
+"オブジェクトクラス '%s' には、'%s' という名前のプロパティーがありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 "オブジェクトクラス '%s' のプロパティー '%s' は、書き込み可能ではありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -180,43 +180,56 @@
 "オブジェクト '%s' のコンストラクトプロパティー \"%s\" は構築後に設定できませ"
 "ん"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプでは"
 "ありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
-msgstr "プロパティー '%s' (タイプ '%s') をタイプ '%s' の値から設定できません"
+msgstr "プロパティー '%s' (タイプ '%s') を、タイプ '%s' の値から設定できません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
-"値 \"%s\" (タイプ '%s') がプロパティー '%s' (タイプ '%s') に対して無効または"
-"範囲外です"
+"値 \"%s\" (タイプ '%s') が、プロパティー '%s' (タイプ '%s') に対して無効また"
+"は範囲外です"
 
-#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X の認証"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1
+#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
+#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
 #: ../src/connection-editor/ce-new-connection.ui.h:1
 #: ../src/connection-editor/ce-page-dcb.ui.h:17
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/connection-editor/connection-helpers.c:308
+#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/page-bluetooth.c:311
+#: ../src/connection-editor/page-mobile.c:543
+#: ../src/connection-editor/page-proxy.c:121
+#: ../src/connection-editor/page-team.c:344
+#: ../src/connection-editor/page-team-port.c:206
+#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
+#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/libnma/nma-vpn-password-dialog.c:209
+#: ../src/libnma/nma-wifi-dialog.c:1066
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "取り消し(_C)"
 
-#: ../src/8021x.ui.h:3
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "接続(_O)"
 
@@ -232,37 +245,37 @@
 msgid "secure."
 msgstr "セキュア。"
 
-#: ../src/applet.c:381
+#: ../src/applet.c:392
 msgid "Failed to add/activate connection"
-msgstr "接続の追加、あるいは有効にするのに失敗しました"
+msgstr "接続の追加、あるいは有効化に失敗しました"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "不明なエラー"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "接続に失敗"
 
-#: ../src/applet.c:435
+#: ../src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "デバイスの切断に失敗しました"
 
-#: ../src/applet.c:440
+#: ../src/applet.c:451
 msgid "Disconnect failure"
 msgstr "切断失敗"
 
-#: ../src/applet.c:470
+#: ../src/applet.c:481
 msgid "Connection activation failed"
 msgstr "接続のアクティベートに失敗しました"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "このメッセージを今後表示しない"
 
-#: ../src/applet.c:883
+#: ../src/applet.c:899
 #, c-format
 msgid ""
 "\n"
@@ -272,7 +285,7 @@
 "\n"
 "ネットワーク接続が中断されたため、VPN 接続 '%s' は切断されました。"
 
-#: ../src/applet.c:885
+#: ../src/applet.c:901
 #, c-format
 msgid ""
 "\n"
@@ -282,7 +295,7 @@
 "\n"
 "ネットワーク接続が中断されたため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:887
+#: ../src/applet.c:903
 #, c-format
 msgid ""
 "\n"
@@ -291,7 +304,7 @@
 "\n"
 "VPN サービスが予期せずに停止したため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:889
+#: ../src/applet.c:905
 #, c-format
 msgid ""
 "\n"
@@ -301,7 +314,7 @@
 "\n"
 "VPN サービスが無効な設定を返したため、VPN 接続 '%s'は失敗しました。"
 
-#: ../src/applet.c:891
+#: ../src/applet.c:907
 #, c-format
 msgid ""
 "\n"
@@ -310,7 +323,7 @@
 "\n"
 "接続試行がタイムアウトしたため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:893
+#: ../src/applet.c:909
 #, c-format
 msgid ""
 "\n"
@@ -319,7 +332,7 @@
 "\n"
 "VPN サービスが時間内に開始しなかったため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:895
+#: ../src/applet.c:911
 #, c-format
 msgid ""
 "\n"
@@ -328,25 +341,25 @@
 "\n"
 "VPN サービスが開始に失敗したため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:897
+#: ../src/applet.c:913
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because there were no valid VPN secrets."
 msgstr ""
 "\n"
-"有効な VPN secret がないため、VPN 接続 '%s' は失敗しました。"
+"有効な VPN シークレットがないため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:899
+#: ../src/applet.c:915
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because of invalid VPN secrets."
 msgstr ""
 "\n"
-"VPN secret が無効なため、VPN 接続 '%s' は失敗しました。"
+"VPN シークレットが無効なため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:904
+#: ../src/applet.c:920
 #, c-format
 msgid ""
 "\n"
@@ -355,7 +368,7 @@
 "\n"
 "VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:931
+#: ../src/applet.c:947
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -366,19 +379,19 @@
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: ../src/applet.c:949
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN 接続の確立に成功しました。\n"
 
-#: ../src/applet.c:935
+#: ../src/applet.c:951
 msgid "VPN Login Message"
 msgstr "VPN ログインメッセージ"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: ../src/applet.c:959 ../src/applet.c:999
 msgid "VPN Connection Failed"
 msgstr "VPN 接続は失敗しました"
 
-#: ../src/applet.c:987
+#: ../src/applet.c:1003
 #, c-format
 msgid ""
 "\n"
@@ -391,7 +404,7 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: ../src/applet.c:1006
 #, c-format
 msgid ""
 "\n"
@@ -404,200 +417,200 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: ../src/applet.c:1295
 msgid "device not ready (firmware missing)"
 msgstr "デバイスの準備ができていません (ファームウェア未検出)"
 
-#: ../src/applet.c:1281
+#: ../src/applet.c:1297
 msgid "device not ready"
 msgstr "デバイスの準備ができていません"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "切断されています"
 
-#: ../src/applet.c:1307
+#: ../src/applet.c:1323
 msgid "Disconnect"
 msgstr "切断する"
 
-#: ../src/applet.c:1321
+#: ../src/applet.c:1337
 msgid "device not managed"
 msgstr "デバイスは管理されていません"
 
-#: ../src/applet.c:1394
+#: ../src/applet.c:1410
 msgid "No network devices available"
 msgstr "ネットワークデバイスがありません"
 
-#: ../src/applet.c:1448
+#: ../src/applet.c:1464
 msgid "_VPN Connections"
 msgstr "VPN 接続(_V)"
 
-#: ../src/applet.c:1492
+#: ../src/applet.c:1508
 msgid "_Configure VPN…"
 msgstr "VPN を設定(_C)..."
 
-#: ../src/applet.c:1495
+#: ../src/applet.c:1511
 msgid "_Add a VPN connection…"
 msgstr "VPN 接続を追加(_A)"
 
-#: ../src/applet.c:1601
+#: ../src/applet.c:1617
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager は実行されていません..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: ../src/applet.c:1622 ../src/applet.c:2687
 msgid "Networking disabled"
 msgstr "ネットワークは無効になっています"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: ../src/applet.c:1832
 msgid "Enable _Networking"
 msgstr "ネットワークを有効にする(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: ../src/applet.c:1841
 msgid "Enable _Wi-Fi"
 msgstr "Wi-Fi を有効にする(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: ../src/applet.c:1850
 msgid "Enable _Mobile Broadband"
 msgstr "モバイルブロードバンドを有効にする(_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: ../src/applet.c:1862
 msgid "Enable N_otifications"
 msgstr "通知を有効にする(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: ../src/applet.c:1874
 msgid "Connection _Information"
 msgstr "接続情報(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: ../src/applet.c:1882
 msgid "Edit Connections…"
 msgstr "接続を編集する..."
 
-#: ../src/applet.c:1880
+#: ../src/applet.c:1896
 msgid "_About"
 msgstr "このアプリケーションについて(_A)"
 
-#: ../src/applet.c:2191
+#: ../src/applet.c:2207
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "現在'%s' に接続しています。"
 
-#: ../src/applet.c:2231
+#: ../src/applet.c:2247
 msgid "Disconnected"
 msgstr "切断されました"
 
-#: ../src/applet.c:2232
+#: ../src/applet.c:2248
 msgid "The network connection has been disconnected."
 msgstr "ネットワーク接続が切断されました。"
 
-#: ../src/applet.c:2534
+#: ../src/applet.c:2550
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "ネットワーク接続 '%s' を準備中..."
 
-#: ../src/applet.c:2537
+#: ../src/applet.c:2553
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "ネットワーク接続 '%s' にはユーザー認証が必要です..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s' のネットワークアドレスを要求しています..."
 
-#: ../src/applet.c:2543
+#: ../src/applet.c:2559
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "ネットワーク接続 '%s' はアクティブです。"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2632
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN 接続 '%s' を開始しています..."
 
-#: ../src/applet.c:2619
+#: ../src/applet.c:2635
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN 接続 '%s' にはユーザー認証が必要です..."
 
-#: ../src/applet.c:2622
+#: ../src/applet.c:2638
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s' の VPN アドレスを要求しています..."
 
-#: ../src/applet.c:2625
+#: ../src/applet.c:2641
 #, c-format
 msgid "VPN connection active"
 msgstr "VPN 接続はアクティブです"
 
-#: ../src/applet.c:2675
+#: ../src/applet.c:2691
 msgid "No network connection"
 msgstr "ネットワーク接続がありません"
 
-#: ../src/applet.c:3276
+#: ../src/applet.c:3292
 msgid "NetworkManager Applet"
 msgstr "NetworkManager アプレット"
 
 #: ../src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
-msgstr "PUK が違います; プロバイダーに連絡してください。"
+msgstr "PUK が違います。プロバイダーに連絡してください。"
 
 #: ../src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
-msgstr "PIN が違います; プロバイダーに連絡してください。"
+msgstr "PIN が違います。プロバイダーに連絡してください。"
 
 #. Start the spinner to show the progress of the unlock
 #: ../src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "ロック解除コードを送信中..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "モバイルブロードバンド (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/applet-device-broadband.c:739
+#: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "モバイルブロードバンド"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "利用可能"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 msgid "New Mobile Broadband connection…"
 msgstr "新規のモバイルブロードバンド接続…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "接続を確立しました"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "現在、モバイルブロードバンドネットワークに接続しています。"
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "モバイルブロードバンドネットワーク"
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "ホームネットワークに接続しました。"
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "ローミングネットワークに接続しました。"
 
@@ -605,22 +618,22 @@
 msgid "You are now connected to the mobile broadband network."
 msgstr "現在、モバイルブロードバンドネットワークに接続しています。"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "モバイルブロードバンド接続 '%s' を準備中です..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "モバイルブロードバンド接続 '%s' を設定中です..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "モバイルブロードバンド接続 '%s' にはユーザー認証が必要です..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "モバイルブロードバンド接続 '%s' はアクティブです。"
@@ -632,39 +645,39 @@
 #: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
-msgstr "Ethernet ネットワーク (%s)"
+msgstr " Ethernet ネットワーク (%s)"
 
 #: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
-msgstr "Ethernet ネットワーク (%s)"
+msgstr " Ethernet ネットワーク (%s)"
 
 #: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
-msgstr "Ethernet ネットワーク"
+msgstr " Ethernet ネットワーク"
 
 #: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
-msgstr "Ethernet ネットワーク"
+msgstr " Ethernet ネットワーク"
 
 #: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
-msgstr "Ethernet ネットワークに接続しました。"
+msgstr " Ethernet ネットワークに接続しました。"
 
 #: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
-msgstr "Ethernet ネットワーク接続 '%s' を準備中です..."
+msgstr " Ethernet ネットワーク接続 '%s' を準備中です..."
 
 #: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
-msgstr "Ethernet ネットワーク接続 '%s' を設定中です..."
+msgstr " Ethernet ネットワーク接続 '%s' を設定中です..."
 
 #: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
-msgstr "Ethernet ネットワーク接続 '%s'にはユーザー認証が必要です..."
+msgstr " Ethernet ネットワーク接続 '%s'にはユーザー認証が必要です..."
 
 #: ../src/applet-device-ethernet.c:170
 #, c-format
@@ -680,6 +693,18 @@
 msgid "DSL authentication"
 msgstr "DSL 認証"
 
+#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/page-bluetooth.c:313
+#: ../src/connection-editor/page-mobile.c:545
+#: ../src/libnma/nma-vpn-password-dialog.c:210
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+msgid "_OK"
+msgstr "OK(_O)"
+
 #: ../src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "非表示 Wi-Fi ネットワークに接続する(_C)"
@@ -692,7 +717,7 @@
 msgid "(none)"
 msgstr "(なし)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "新規接続の追加に失敗しました"
 
@@ -700,77 +725,77 @@
 msgid "Insufficient privileges."
 msgstr "権限が不足しています。"
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi ネットワーク (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi ネットワーク (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi ネットワーク"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi は無効になっています"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi はハードウェアのスイッチで無効になっています"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "その他のネットワーク"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi ネットワークは利用可能です"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Wi-Fi ネットワークに接続するにはネットワークメニューを使用します。"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Wi-Fi ネットワーク '%s' に接続しました。"
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Wi-Fi ネットワーク接続 '%s' を準備中..."
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Wi-Fi ネットワーク接続 '%s' を設定中です..."
 
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Wi-Fi ネットワーク '%s' にはユーザー認証が必要です..."
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s' の Wi-Fi ネットワークアドレスを要求しています..."
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi ネットワーク接続 '%s' はアクティブです: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr " Wi-Fi ネットワーク接続 '%s' はアクティブです"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "接続のアクティベートに失敗しました"
 
@@ -778,227 +803,231 @@
 msgid "Error displaying connection information:"
 msgstr "接続情報の表示中にエラーが起きました:"
 
-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
 #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: ../src/applet-dialogs.c:75
 msgid "Dynamic WEP"
 msgstr "動的 WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:231
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: ../src/applet-dialogs.c:152
 msgid "More addresses"
 msgstr "その他のアドレス"
 
-#: ../src/applet-dialogs.c:226
+#: ../src/applet-dialogs.c:227
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
+#: ../src/connection-editor/page-wifi-security.c:332
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "なし"
 
-#: ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:261
 #, c-format
 msgid "%s (default)"
 msgstr "%s (デフォルト)"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "不明"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
 msgctxt "Address"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
 msgid "IP Address:"
 msgstr "IP アドレス:"
 
-#: ../src/applet-dialogs.c:369
+#: ../src/applet-dialogs.c:370
 msgid "Broadcast Address:"
 msgstr "ブロードキャストアドレス:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: ../src/applet-dialogs.c:382
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:383
 msgid "Subnet Mask:"
 msgstr "サブネットマスク:"
 
-#: ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:493
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:496
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: ../src/applet-dialogs.c:503
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: ../src/applet-dialogs.c:505
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
 #: ../src/connection-editor/ce-page-team-port.ui.h:23
 #: ../src/connection-editor/ce-page-team.ui.h:48
 #: ../src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "全般"
 
-#: ../src/applet-dialogs.c:516
+#: ../src/applet-dialogs.c:517
 msgid "Interface:"
 msgstr "インターフェース:"
 
-#: ../src/applet-dialogs.c:536
+#: ../src/applet-dialogs.c:537
 msgid "Hardware Address:"
 msgstr "ハードウェアアドレス:"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:551
 msgid "Driver:"
 msgstr "ドライバー:"
 
-#: ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:586
 msgid "Speed:"
 msgstr "速度:"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:601
 msgid "Security:"
-msgstr "セキュリティ:"
+msgstr "セキュリティー:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
 #: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
 msgid "Default Route:"
 msgstr "デフォルトルート:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
 #: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
 msgid "Ignored"
 msgstr "無視"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:816
 msgid "VPN Type:"
 msgstr "VPN の種類:"
 
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:823
 msgid "VPN Gateway:"
 msgstr "VPN ゲートウェイ:"
 
-#: ../src/applet-dialogs.c:828
+#: ../src/applet-dialogs.c:829
 msgid "VPN Username:"
 msgstr "VPN ユーザー名:"
 
-#: ../src/applet-dialogs.c:834
+#: ../src/applet-dialogs.c:835
 msgid "VPN Banner:"
 msgstr "VPN バナー:"
 
-#: ../src/applet-dialogs.c:840
+#: ../src/applet-dialogs.c:841
 msgid "Base Connection:"
 msgstr "ベース接続:"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "不明"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: ../src/applet-dialogs.c:958
 msgid "No valid active connections found!"
 msgstr "有効なアクティブ接続がありません!"
 
-#: ../src/applet-dialogs.c:985
+#: ../src/applet-dialogs.c:1007
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 
-#: ../src/applet-dialogs.c:988
+#: ../src/applet-dialogs.c:1010
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "ネットワークデバイスと接続を管理するための通知領域アプレット。"
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1012
 msgid "NetworkManager Website"
 msgstr "NetworkManager ウェブサイト"
 
-#: ../src/applet-dialogs.c:1001
+#: ../src/applet-dialogs.c:1016
+msgid "translator-credits"
+msgstr "翻訳者クレジット"
+
+#: ../src/applet-dialogs.c:1026
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr ""
-"NetworkManager アプレットは必要ないくつかのリソースをみつけられませんでした "
-"(.ui ファイルがみつかりません)。"
+"NetworkManager アプレットは、必要なリソースをいくつか見つけられませんでした "
+"(.ui ファイルが見つかりません)。"
 
-#: ../src/applet-dialogs.c:1006
+#: ../src/applet-dialogs.c:1031
 msgid "Missing resources"
 msgstr "不足しているリソース"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1057
 msgid "Mobile broadband network password"
 msgstr "モバイルブロードバンドネットワークのパスワード"
 
-#: ../src/applet-dialogs.c:1040
+#: ../src/applet-dialogs.c:1066
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'%s' への接続にはパスワードが必要です。"
 
-#: ../src/applet-dialogs.c:1055
+#: ../src/applet-dialogs.c:1081
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1363
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN のアンロックが必要です"
 
-#: ../src/applet-dialogs.c:1338
+#: ../src/applet-dialogs.c:1364
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN の開錠が必要です"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1366
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1007,25 +1036,25 @@
 "モバイルブロードバンドデバイス %s' を使用するには SIM PIN コードが必要です。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1368
 msgid "PIN code:"
 msgstr "PIN コード:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1372
 msgid "Show PIN code"
 msgstr "PIN コードを表示"
 
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1374
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK のアンロックが必要です"
 
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1375
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK のアンロックが必要です"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: ../src/applet-dialogs.c:1377
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1034,31 +1063,38 @@
 "モバイルブロードバンドデバイス '%s' を使用するには SIM PUK コードが必要です。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1379
 msgid "PUK code:"
 msgstr "PUK コード:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: ../src/applet-dialogs.c:1382
 msgid "New PIN code:"
 msgstr "新規の PIN コード:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: ../src/applet-dialogs.c:1384
 msgid "Re-enter new PIN code:"
 msgstr "新規の PIN コードを再入力:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: ../src/applet-dialogs.c:1389
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK コードを表示"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
-msgstr "OK(_O)"
+#: ../src/applet-vpn-request.c:201
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "接続を削除できません"
+
+#: ../src/applet-vpn-request.c:251
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "接続のアクティベートに失敗しました"
+
+#: ../src/applet-vpn-request.c:259
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
@@ -1075,21 +1111,21 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
 msgstr "追加(_A)"
 
-#. Delete
 #: ../src/connection-editor/ce-ip4-routes.ui.h:5
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/nm-connection-list.c:711
+#: ../src/connection-editor/connection-helpers.c:772
+#: ../src/connection-editor/nm-connection-list.ui.h:4
 msgid "_Delete"
 msgstr "削除(_D)"
 
@@ -1101,7 +1137,7 @@
 #: ../src/connection-editor/ce-ip4-routes.ui.h:7
 #: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
-msgstr "そのネットワーク上のリソースのためにのみこの接続を使用(_U)"
+msgstr "この接続を、そのネットワーク上のリソースにのみ使用(_U)"
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:8
 #: ../src/connection-editor/ce-ip6-routes.ui.h:8
@@ -1109,8 +1145,7 @@
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
-"有効になっている場合、この接続は決してデフォルトのネットワーク接続として 使用"
-"されません。"
+"有効にすると、この接続はデフォルトのネットワーク接続として 使用されません。"
 
 #: ../src/connection-editor/ce-new-connection.ui.h:2
 msgid "C_reate…"
@@ -1127,10 +1162,10 @@
 "If you are creating a VPN, and the VPN connection you wish to create does "
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
-"新規接続で使用したい接続の種類を選択してください。\n"
+"新規接続で使用する接続の種類を選択してください。\n"
 "\n"
 "VPN 接続を作成しようとしていて、作成したい VPN 接続の種類が一覧に無い場合は、"
-"正しい VPN プラグインをインストールしていないかもしれません。"
+"正しい VPN プラグインがインストールされていない可能性があります。"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:21
@@ -1180,11 +1215,10 @@
 msgid "M_ode:"
 msgstr "モード(_O):"
 
-#. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: ../src/connection-editor/nm-connection-list.ui.h:5
 msgid "_Edit"
 msgstr "編集(_E)"
 
@@ -1228,19 +1262,19 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
-msgstr "プライマリ(_P):"
+msgstr "プライマリー(_P):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 msgstr ""
-"もし、プライマリデバイスのインターフェース名を指定した場合、それが利用可能で"
-"ある時、このデバイスは常にアクティブなスレーブになります。"
+"プライマリーデバイスのインターフェース名を指定した場合、そのデバイスが利用可"
+"能である時、常にアクティブなスレーブになります。"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 #: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
@@ -1249,7 +1283,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-infiniband.ui.h:7
 #: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
@@ -1282,25 +1316,82 @@
 msgstr "Hello タイム(_H):"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "STP forwarding delay, in seconds"
+msgstr "STP フォワード遅延 (秒単位)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "STP hello time, in seconds"
+msgstr "STP Hello タイム (秒単位)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "Enable I_GMP snooping"
 msgstr "IGMP スヌーピングを有効にする(_G)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+"このブリッジにおいて、IGMP スヌーピングが有効かどうかを制御します。ハッシュの"
+"不一致が原因でスヌーピングが自動的に無効になっている場合は、その矛盾が解決す"
+"るまでこの機能が有効にならないことがあります。"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:14
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "STP (スパニングツリープロトコル) を有効化(_S)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:15
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+"このブリッジにおいて、スパニングツリープロトコル (STP) が有効かどうかを制御し"
+"ます。"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:16
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+"このブリッジにおける STP の優先度。値が小さい方が優先度が高くなります。優先度"
+"が一番低いブリッジが root ブリッジに選択されます。"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:17
 msgid "_Max age:"
-msgstr "最大エージ(_M):"
+msgstr "最大エイジ(_M):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:18
+msgid "STP maximum message age, in seconds"
+msgstr "STP メッセージの最大エイジ (秒単位)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:19
 msgid "_Aging time:"
 msgstr "エージング時間(_A):"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:20
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr "イーサネット MAC アドレスのエージングタイム (秒単位)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:21
+msgid "Group _forward mask:"
+msgstr "グループの転送マスク(_F):"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:22
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+"16 ビットのマスク。それぞれのマスクが、転送される必要がある範囲 01:80:"
+"C2:00:00:00 から 01:80:C2:00:00:0F のグループアドレスに対応しています。このマ"
+"スクには、ビット 0、1、または 2 を設定することができません。STP で使用する"
+"と、MAC がフレームと LACP を停止するためです。"
+
 #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "自動"
@@ -1365,12 +1456,12 @@
 #: ../src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
-msgstr "%s の無効な interface-name (%s): "
+msgstr "%s の無効なインターフェース名 (%s): "
 
 #: ../src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
-msgstr "無効な interface-name (%s): "
+msgstr "無効なインターフェース名 (%s): "
 
 #: ../src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
@@ -1397,7 +1488,7 @@
 
 #: ../src/connection-editor/ce-page.c:725
 msgid "Failed to update connection secrets due to an unknown error."
-msgstr "不明なエラーのため接続 secret を更新できませんでした。"
+msgstr "不明なエラーのため、接続シークレットを更新できませんでした。"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:1
 msgid "_Use Data Center Bridging (DCB) for this connection"
@@ -1461,7 +1552,7 @@
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:19
 msgid "Enable or disable priority pause transmission for each User Priority."
-msgstr "ユーザー優先度ごとの優先ポーズ転送を有効もしくは無効にします。"
+msgstr "各ユーザー優先度の優先ポーズ転送を、有効もしくは無効にします。"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:20
 msgid "Priority:"
@@ -1521,7 +1612,7 @@
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "Enter the priority group ID for each User Priority."
-msgstr "ユーザーの優先度ごとの優先グループ ID を入力してください。"
+msgstr "各ユーザー優先度に優先グループ ID を入力してください。"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:36
 #, no-c-format
@@ -1536,8 +1627,8 @@
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
-"ユーザー優先度が使用可能な優先グループ 帯域幅のパーセンテージを入力してくださ"
-"い。"
+"ユーザー優先度が使用可能な、優先グループ 帯域幅のパーセンテージを入力してくだ"
+"さい。"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Enable or disable strict bandwidth for each user priority."
@@ -1545,7 +1636,7 @@
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Enter the traffic class for each user priority."
-msgstr "各ユーザー優先度ののトラフィッククラスを入力してください。"
+msgstr "各ユーザー優先度にトラフィッククラスを入力してください。"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
 #: ../src/connection-editor/ce-page-mobile.ui.h:3
@@ -1556,10 +1647,22 @@
 msgstr "ユーザー名(_U):"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "Username used to authenticate with the PPPoE service."
+msgstr "ユーザー名は、PPPoE サービスでの認証に使用されました。"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+"指定したサービスを提供するアクセス集線装置だけを使用してセッションを開始しま"
+"す。多くのプロバイダーでは、これを空白にする必要があります。"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
 msgid "_Service:"
 msgstr "サービス(_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:5
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 #: ../src/wireless-security/ws-leap.ui.h:3
@@ -1567,7 +1670,11 @@
 msgid "Sho_w password"
 msgstr "パスワードを表示(_W)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-dsl.ui.h:6
+msgid "Password used to authenticate with the PPPoE service."
+msgstr "PPPoE サービスでの認証に使用されるパスワード。"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:7
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
 #: ../src/libnma/nma-vpn-password-dialog.c:97
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
@@ -1578,13 +1685,29 @@
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
+#: ../src/connection-editor/ce-page-dsl.ui.h:8
+msgid "PPP _interface:"
+msgstr "PPP インスタンス(_I):"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:9
+msgid "P_arent interface:"
+msgstr "親インスタンス(_A):"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:10
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr "新規作成された PPP インターフェースに割り当てる任意の名前。"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:11
+msgid "The interface on which the PPP connection will be established."
+msgstr "PPP 接続が確立されるインターフェース。"
+
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "自動"
@@ -1630,7 +1753,7 @@
 msgstr "すべて"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "無視する"
 
@@ -1638,7 +1761,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "手動"
 
@@ -1647,7 +1770,7 @@
 msgstr "ポート(_P):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
 msgid "_Device:"
 msgstr "デバイス(_D):"
@@ -1695,13 +1818,12 @@
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
-msgstr "_Wake on LAN パスワード(_W):"
+msgstr "Wake on LAN パスワード(_W):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
-msgstr ""
-"Wake-on-LAN パスワード (イーサネット MAC)。magic packet にのみ有効です。"
+msgstr "Wake-on-LAN パスワード (Ethernet MAC)。magic packet にのみ有効です。"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:30
 msgid "Lin_k negotiation:"
@@ -1727,13 +1849,13 @@
 "“Automatic” options are not selected. Before specifying a speed value be "
 "sure your device supports it."
 msgstr ""
-"静的リンクネゴシエーションの速度の値で、「無視」または「自動」のオプションが"
-"選択されていない場合にのみ必要になります。速度の値を指定する前に、デバイスが"
-"サポートしていることを確認してください。"
+"静的リンクネゴシエーションの速度の値。「無視」または「自動」のオプションを選"
+"択していない場合にのみ必要になります。速度の値を指定する前に、デバイスがサ"
+"ポートしていることを確認してください。"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:34
 msgid "Duple_x:"
-msgstr "二重(_X)"
+msgstr "二重(_X):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:35
 msgid ""
@@ -1741,9 +1863,9 @@
 "“Automatic” options are not selected. Before specifying a duplex mode be "
 "sure your device supports it."
 msgstr ""
-"静的リンクネゴシエーションの二重の値で、「無視」または「自動」のオプションが"
-"選択されていない場合にのみ必要になります。二重モードを指定する前に、デバイス"
-"がサポートしていることを確認してください。"
+"静的リンクネゴシエーションの二重値。「無視」または「自動」のオプションを選択"
+"していない場合にのみ必要になります。二重モードを指定する前に、デバイスがサ"
+"ポートしていることを確認してください。"
 
 #: ../src/connection-editor/ce-page-general.ui.h:1
 msgid "Automatically connect to _VPN when using this connection"
@@ -1768,7 +1890,7 @@
 "Default value is 0."
 msgstr ""
 "自動アクティベーションの接続優先度。自動アクティベーションのプロファイル選択"
-"時により大きい数字の接続が優先されます。デフォルト値は 0 です。"
+"時に、より大きい数字の接続が優先されます。デフォルト値は 0 です。"
 
 #: ../src/connection-editor/ce-page-general.ui.h:6
 msgid "Firewall _zone:"
@@ -1791,7 +1913,7 @@
 msgstr ""
 "IP アドレスはネットワーク上のコンピューターを指定し、他のコンピューターに配布"
 "するアドレス範囲を決定します。「追加」ボタンを押して IP アドレスを追加しま"
-"す。アドレスが提供されない場合は、範囲は自動で決定されます。"
+"す。アドレスが提供されないと、範囲は自動的に決定します。"
 
 #: ../src/connection-editor/ce-page.h:121
 msgid "Additional static addresses"
@@ -1805,20 +1927,20 @@
 msgid "Address (optional)"
 msgstr "アドレス (オプション)"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "転送モード(_T):"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
 msgid "Datagram"
 msgstr "データグラム型"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
 msgid "Connected"
 msgstr "コネクション型"
 
+#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+msgid "_Transport mode:"
+msgstr "転送モード(_T):"
+
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
 msgid "IPIP"
 msgstr "IPIP"
@@ -1856,36 +1978,39 @@
 msgstr "VTI6"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-msgid "Device name"
-msgstr "デバイス名"
+#: ../src/connection-editor/ce-page-macsec.ui.h:6
+msgid "Device name:"
+msgstr "デバイス名:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-msgid "Parent device"
-msgstr "親デバイス"
+#: ../src/connection-editor/ce-page-macsec.ui.h:8
+msgid "Parent device:"
+msgstr "親デバイス:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-msgid "Mode"
-msgstr "モード"
+#: ../src/connection-editor/ce-page-macsec.ui.h:16
+msgid "Mode:"
+msgstr "モード:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP"
-msgstr "ローカル IP"
+msgid "Local IP:"
+msgstr "ローカル IP:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP"
-msgstr "リモート IP"
+msgid "Remote IP:"
+msgstr "リモート IP:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key"
-msgstr "入力キー"
+msgid "Input key:"
+msgstr "入力キー:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key"
-msgstr "出力キー"
+msgid "Output key:"
+msgstr "出力キー:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-msgid "MTU"
-msgstr "MTU"
+msgid "MTU:"
+msgstr "MTU:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1900,12 +2025,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "他のコンピューターへ共有"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "方式(_M):"
 
@@ -1915,12 +2040,12 @@
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
 "enter it here."
 msgstr ""
-"DHCP クライアント識別子を使用すると、ネットワーク管理者はコンピューター設定を"
-"カスタマイズできます。DHCP クライアント識別子を使用する場合は、ここに入力しま"
+"ネットワーク管理者は、DHCP クライアント識別子を使用してコンピューター設定をカ"
+"スタマイズできます。DHCP クライアント識別子を使用する場合は、ここに入力しま"
 "す。"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1933,16 +2058,16 @@
 msgstr "DHCP クライアント ID(_H):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "ドメインを検索(_E):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "DNS サーバー(_V):"
 
@@ -1951,27 +2076,28 @@
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 msgstr ""
-"ドメインネームサーバーの IP アドレスはホスト名を解決するために使用されます。 "
-"コンマを使用して複数のドメインネームサーバーアドレスを分離します。"
+"ドメインネームサーバーの IP アドレスは、ホスト名を解決するために使用されま"
+"す。ドメインネームサーバーアドレスが複数になる場合は、コンマで区切ります。"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 msgid "Require IPv_4 addressing for this connection to complete"
-msgstr "この接続を完了するには IPv4 アドレス化が必要になります(_4)"
+msgstr "この接続を完了するには、IPv4 アドレスが必要になります(_4)"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
-"IPv4 設定が失敗して、IPv6 設定が成功する場合、IPv6 対応のネットワークに接続す"
-"る時に接続が完了するまで待ちます。"
+"IPv4 設定が失敗して、IPv6 設定が成功する場合は、IPv6 対応のネットワークに接続"
+"する時に接続が完了するまで待ちます。"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "ルート(_R)…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-macsec.ui.h:3
 #: ../src/connection-editor/page-ip4.c:198
 msgid "Disabled"
 msgstr "無効になっています"
@@ -1984,32 +2110,137 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "有効 (一時アドレスを優先)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr "EUI64"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Stable privacy"
+msgstr "安定したプライバシー"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
 "be automatically scoped to the connecting interface."
 msgstr ""
-"ドメインネームサーバーの IP アドレスはホスト名を解決するために使用されます。 "
-"コンマを使用して複数のドメインネームサーバーアドレスを分離します。リンクロー"
-"カルアドレスは自動的に接続中のインターフェースにスコープされます。"
+"ドメインネームサーバーの IP アドレスは、ホスト名を解決するために使用されま"
+"す。ドメインネームサーバーアドレスが複数になる場合は、コンマで区切ります。リ"
+"ンクローカルアドレスは、接続中のインターフェースに自動的にスコープされます。"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6 のプライバシー拡張(_P):"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr "IPv6 アドレス生成モード(_G):"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
-msgstr "この接続が完了するには IPv6 アドレス化が必要になります(_6)"
+msgstr "この接続が完了するには、IPv6 アドレスが必要になります(_6)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
-"IPv6 設定が失敗して、IPv4 設定が成功する場合、IPv4 対応のネットワークに接続す"
+"IPv6 設定が失敗し、IPv4 設定が成功する場合は、IPv4 対応のネットワークに接続す"
 "る時に接続が完了するまで待ちます。"
 
+#: ../src/connection-editor/ce-page-macsec.ui.h:1
+msgid "PSK"
+msgstr "PSK"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:2
+#: ../src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:4
+msgid "Check"
+msgstr "チェック"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:5
+msgid "Strict"
+msgstr "厳密"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:7
+msgid "The name of the MACsec device."
+msgstr "MACsec デバイスの名前。"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:9
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+"この MACSEC インターフェースが作成される親インターフェースの名前、または親接"
+"続の UUID。"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:10
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+"この MACsec インターフェースが作成される親インターフェースまたは親接続の UUID"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:11
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr "共有前の接続に関連するキー名"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:12
+msgid "The pre-shared Connectivity Association Key"
+msgstr "共有前の接続に関連するキー"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:13
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+"MKA (MACsec キー一致) の CAK (接続関連キー) を取得する方法を指定します。EAP "
+"モードでは、802.1X セキュリティーページにパラメーターを追加します。"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:14
+msgid "CKN:"
+msgstr "CKN:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:15
+msgid "CAK:"
+msgstr "CAK:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:17
+msgid "Keys:"
+msgstr "キー:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:18
+msgid "Parameters:"
+msgstr "パラメーター:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:19
+msgid "Validation:"
+msgstr "検証:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:20
+msgid "SCI port:"
+msgstr "SCI ポート:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:21
+msgid "Specifies the validation mode for incoming frames"
+msgstr "入力フレームの検証モードを指定します"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:22
+msgid "Encrypt"
+msgstr "暗号化"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:23
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr "転送トラフィックの暗号化が必要かどうか"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:24
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr "SCI (セキュアチャネル識別子) のポートコンポーネント"
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:26
 msgid "Basic"
@@ -2066,15 +2297,15 @@
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:5
 msgid "_Use point-to-point encryption (MPPE)"
-msgstr "MPPE (ポイントツーポイント暗号化) を使用(_U)"
+msgstr "MPPE (ポイントツーポイント暗号化) を使用する(_U)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:6
 msgid "_Require 128-bit encryption"
-msgstr "128-bit の暗号化を要求(_R)"
+msgstr "128 ビットの暗号化を要求する(_R)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:7
 msgid "Use _stateful MPPE"
-msgstr "ステートフル MPPE を使用(_S)"
+msgstr "ステートフル MPPE を使用する(_S)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:8
 msgid "Allow _BSD data compression"
@@ -2086,7 +2317,7 @@
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:10
 msgid "Use TCP _header compression"
-msgstr "TCP ヘッダー圧縮を使用(_H)"
+msgstr "TCP ヘッダー圧縮を使用する(_H)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
 msgid "Echo"
@@ -2097,38 +2328,39 @@
 msgstr "PPP Echo のパケットを送信(_E)"
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:1
-msgid "Method:"
-msgstr "方式:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-team.ui.h:25
 msgid "None"
 msgstr "なし"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: ../src/connection-editor/ce-page-proxy.ui.h:3
 msgid "For browser only"
 msgstr "ブラウザー専用"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: ../src/connection-editor/ce-page-proxy.ui.h:4
 msgid "Use this proxy configuration for only browser clients/schemes."
-msgstr "ブラウザーのクライアント/スキームにのみこのプロキシ設定を使用します。"
+msgstr ""
+"このプロキシ設定を、ブラウザーのクライアント/スキームにのみ使用します。"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: ../src/connection-editor/ce-page-proxy.ui.h:5
 msgid "PAC URL:"
 msgstr "PAC URL:"
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:6
+msgid "PAC script:"
+msgstr "PAC スクリプト:"
+
 #: ../src/connection-editor/ce-page-proxy.ui.h:7
 msgid "URL from where the PAC script is to be obtained."
 msgstr "PAC スクリプトの取得先となる URL。"
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
-msgstr "PAC スクリプト:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
 msgid "Import script from a file…"
 msgstr "ファイルからスクリプトをインポート..."
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:9
+msgid "Method:"
+msgstr "方式:"
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:19
 msgid "Ad_vanced…"
@@ -2176,23 +2408,14 @@
 msgstr "このポートのマッピング先となるキューの ID。"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
-msgstr "ポート優先度(_P):"
+msgid "Active-Backup runner options"
+msgstr "Active-Backup ランナーオプション"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
-msgstr "ポート付箋(_S)"
+msgid "_Port priority:"
+msgstr "ポート優先度(_P):"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:82
-msgid ""
-"Validate received ARP packets on active ports. If this is not checked, all "
-"incoming ARP packets will be considered as a good reply."
-msgstr ""
-"アクティブなポートで受信した ARP パケットを検証します。これを確認しない場合"
-"は、すべての着信 ARP パケットは正常な返信とみなされます。"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:44
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
@@ -2200,23 +2423,36 @@
 msgstr ""
 "値は正の数(ミリ秒単位)。notify-peer パケットのバーストの間隔を指定します。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
 msgid "Port priority. The higher number means higher priority."
-msgstr "ポート優先度。より数字が大きいものの優先度が高くなります。"
+msgstr "ポート優先度。数字が大きい方が優先度が高くなります。"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port _sticky"
+msgstr "ポート付箋(_S)"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:15
-msgid "Active-Backup runner options"
-msgstr "Active-Backup ランナーオプション"
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
+msgstr ""
+"アクティブなポートで受信した ARP パケットを検証します。これを確認しないと、着"
+"信 ARP パケットがすべて正常な返信とみなされます。"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:16
+msgid "LACP runner options"
+msgstr "LACP ランナーオプション"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
 msgid "_LACP port priority:"
 msgstr "LACP ポート優先度(_L):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
 msgid "LACP port _key:"
 msgstr "LACP ポートキー(_K):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
 #: ../src/connection-editor/ce-page-team.ui.h:43
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
@@ -2225,31 +2461,27 @@
 "ポートの有効化または無効化後に送信された、マルチキャストグループ再参加リクエ"
 "ストのバースト数。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
-"LACP 標準に準拠したポート優先度。より数字が小さいものの優先度が高くなります。"
+"LACP 標準に準拠したポート優先度。数字が小さい方が優先度が高くなります。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
 #: ../src/connection-editor/ce-page-team.ui.h:45
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
 msgstr ""
-"値は正の数(ミリ秒単位)。マルチキャストグループ再参加リクエストのバーストの間"
-"隔を指定します。"
+"値は正の数 (ミリ秒単位) です。マルチキャストグループ再参加リクエストのバース"
+"トの間隔を指定します。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
-msgstr "LACP 標準に準拠したポートキー。同じキーのポートの統合のみが可能です。"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
-msgid "LACP runner options"
-msgstr "LACP ランナーオプション"
+msgstr "LACP 標準に準拠したポートキー。同じキーのポートだけが統合できます。"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:24
 #: ../src/connection-editor/ce-page-team.ui.h:70
@@ -2297,8 +2529,8 @@
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
 msgstr ""
-"不在着信となった返信の最大数。この数値を超えるとリンクがダウンとして報告され"
-"ます。"
+"不在着信となった返信の最大数。この数値を超えるとリンクがダウンしていると報告"
+"されます。"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:33
 #: ../src/connection-editor/ce-page-team.ui.h:79
@@ -2306,8 +2538,8 @@
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
 msgstr ""
-"IP アドレスに変換されるホスト名。これは ARP リクエストでソースアドレスとして"
-"記入されます。"
+"IP アドレスに変換されるホスト名。この名前は、ソースアドレスとして ARP リクエ"
+"ストに記入されます。"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:34
 #: ../src/connection-editor/ce-page-team.ui.h:80
@@ -2315,18 +2547,18 @@
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
 msgstr ""
-"IP アドレスに変換されるホスト名で、リクエストに宛先アドレスとして記入されま"
+"IP アドレスに変換されるホスト名で、宛先アドレスとしてリクエストに記入されま"
 "す。"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:35
 #: ../src/connection-editor/ce-page-team.ui.h:81
 msgid "Ignore invalid packets from _active ports"
-msgstr "_active ポートからの無効なパケットを無視"
+msgstr "アクティブなポートからの無効なパケットを無視(_A)"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:36
 #: ../src/connection-editor/ce-page-team.ui.h:83
 msgid "Ignore invalid packets from i_nactive ports"
-msgstr "i_nactive ポートからの無効なパケットを無視"
+msgstr "アクティブでないポートからの無効なパケットを無視(_N)"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:37
 #: ../src/connection-editor/ce-page-team.ui.h:84
@@ -2334,8 +2566,8 @@
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
 msgstr ""
-"アクティブでないポートで受信した ARP パケットを検証します。これを確認しない場"
-"合は、すべての着信 ARP パケットは正常な返信とみなされます。"
+"アクティブでないポートで受信した ARP パケットを検証します。これを確認しない"
+"と、着信 ARP パケットはすべて正常な返信とみなされます。"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:38
 #: ../src/connection-editor/ce-page-team.ui.h:85
@@ -2387,7 +2619,7 @@
 #: ../src/connection-editor/ce-page-team-port.ui.h:46
 #: ../src/connection-editor/ce-page-team.ui.h:93
 msgid "Im_port team configuration from a file…"
-msgstr "ファイルから Team 設定をインポートする(_P)..."
+msgstr "ファイルからチーム設定をインポートする(_P)..."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:47
 #: ../src/connection-editor/ce-page-team.ui.h:94
@@ -2421,7 +2653,7 @@
 
 #: ../src/connection-editor/ce-page-team.ui.h:6
 msgid "From the team device"
-msgstr "team デバイスから"
+msgstr "チームデバイスから"
 
 #: ../src/connection-editor/ce-page-team.ui.h:7
 msgid "From the active port"
@@ -2429,11 +2661,11 @@
 
 #: ../src/connection-editor/ce-page-team.ui.h:8
 msgid "From active to team device"
-msgstr "アクティブから team デバイスへ"
+msgstr "アクティブからチームデバイスへ"
 
 #: ../src/connection-editor/ce-page-team.ui.h:12
 msgid "_Teamed connections:"
-msgstr "Team 接続(_T):"
+msgstr "チーム接続(_T):"
 
 #: ../src/connection-editor/ce-page-team.ui.h:23
 msgid "Load balance"
@@ -2444,14 +2676,14 @@
 msgstr "LACP"
 
 #: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/connection-helpers.c:105
 #: ../src/connection-editor/page-ethernet.c:351
 #: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/connection-helpers.c:120
 #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
 #: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
@@ -2506,7 +2738,7 @@
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
 msgstr ""
-"新規 team デバイスのハードウェアアドレス。通常の MAC アドレス形式が使用できま"
+"新規チームデバイスのハードウェアアドレス。通常の MAC アドレス形式が使用できま"
 "す。"
 
 #: ../src/connection-editor/ce-page-team.ui.h:49
@@ -2526,8 +2758,8 @@
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
 msgstr ""
-"team のライフタイム中に team デバイスおよびポートデバイスのハードウェアアドレ"
-"スを設定する方法についてのポリシーを定義します。"
+"チームのライフタイム中に、チームデバイスおよびポートデバイスのハードウェアア"
+"ドレスを設定する方法に関するポリシーを定義します。"
 
 #: ../src/connection-editor/ce-page-team.ui.h:53
 msgid "Send LACPDU frames _periodically"
@@ -2539,8 +2771,7 @@
 "If not, it acts as “speak when spoken to”."
 msgstr ""
 "これにチェックを入れると、設定済みリンクとともに LACPDU フレームが定期的に送"
-"信されます。チェックを入れない場合は、「通信があった場合に応答」の動作になり"
-"ます。"
+"信されます。チェックを入れない場合は、「通信があった場合に応答」します。"
 
 #: ../src/connection-editor/ce-page-team.ui.h:55
 msgid "Send a LACPDU frame _every second"
@@ -2554,7 +2785,7 @@
 msgstr ""
 "このオプションは、リンクパートナーに LACPDU パケットを転送を依頼するレートを"
 "指定します。これにチェックを入れると、パケットは毎秒送信されます。チェックを"
-"入れない場合は、30秒ごとに送信されます。"
+"入れない場合は、30 秒ごとに送信されます。"
 
 #: ../src/connection-editor/ce-page-team.ui.h:57
 msgid "_System priority:"
@@ -2582,7 +2813,7 @@
 
 #: ../src/connection-editor/ce-page-team.ui.h:62
 msgid "This selects the policy of how the aggregators will be selected."
-msgstr "アグリゲーターを選択する方法についてのポリシーを指定します。"
+msgstr "アグリゲーターを選択する方法に関するポリシーを指定します。"
 
 #: ../src/connection-editor/ce-page-team.ui.h:63
 msgid ""
@@ -2627,7 +2858,7 @@
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
 msgid "Cloned MAC _address:"
-msgstr "クローンした MAC アドレス(_A):"
+msgstr "クローンの MAC アドレス(_A):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
@@ -2665,7 +2896,7 @@
 
 #: ../src/connection-editor/ce-page-wifi-security.ui.h:1
 msgid "S_ecurity:"
-msgstr "セキュリティ(_E):"
+msgstr "セキュリティー(_E):"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
@@ -2719,6 +2950,7 @@
 msgid "SS_ID:"
 msgstr "SSID(_I):"
 
+#: ../src/connection-editor/ce-polkit.c:63
 #: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "アクションを実行する polkit 権限がありません"
@@ -2776,75 +3008,80 @@
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
-"ほとんどの場合、プロバイダーの PPP サーバーはすべての認証方法をサポートしてい"
-"ます。接続が失敗する場合は、一部の認証方法を無効にしてみてください。"
+"通常、プロバイダーの PPP サーバーはすべての認証方法をサポートしています。接続"
+"が失敗する場合は、認証方法を一部無効にしてみてください。"
 
-#: ../src/connection-editor/connection-helpers.c:105
+#: ../src/connection-editor/connection-helpers.c:106
 #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
+#: ../src/connection-editor/connection-helpers.c:114
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
-
 #: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-dsl.c:201
+msgid "DSL/PPPoE"
+msgstr "DSL/PPPoE"
+
+#: ../src/connection-editor/connection-helpers.c:116
 #: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:117
 #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Team"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-bridge.c:212
+#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/page-bridge.c:233
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "ブリッジ"
 
-#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/connection-helpers.c:121
 #: ../src/connection-editor/page-ip-tunnel.c:176
 msgid "IP tunnel"
 msgstr "IP トンネル"
 
 #: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
+#: ../src/connection-editor/page-macsec.c:190
+msgid "MACsec"
+msgstr "MACsec"
+
+#: ../src/connection-editor/connection-helpers.c:124
+#: ../src/connection-editor/connection-helpers.c:398
 #: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:205
+#: ../src/connection-editor/connection-helpers.c:207
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
 "Error: no VPN service type."
 msgstr ""
-"VPN プラグインは VPN 接続の正常なインポートに失敗しました\n"
+"VPN プラグインは、VPN 接続の正常なインポートに失敗しました\n"
 "\n"
 "エラー: VPN サービスタイプがありません。"
 
-#: ../src/connection-editor/connection-helpers.c:217
+#: ../src/connection-editor/connection-helpers.c:219
 msgid "Cannot import VPN connection"
 msgstr "VPN 接続をインポートできません"
 
-#: ../src/connection-editor/connection-helpers.c:219
+#: ../src/connection-editor/connection-helpers.c:221
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2852,59 +3089,65 @@
 "\n"
 "Error: %s."
 msgstr ""
-"ファイル '%s' は読み込めなかったか、または認識される VPN 接続情報がありませ"
-"ん\n"
+"ファイル '%s' が読み込めなかったか、認識される VPN 接続情報がありません\n"
 "\n"
 "エラー: %s"
 
-#: ../src/connection-editor/connection-helpers.c:220
+#: ../src/connection-editor/connection-helpers.c:222
 msgid "unknown error"
 msgstr "不明なエラー"
 
-#: ../src/connection-editor/connection-helpers.c:303
+#: ../src/connection-editor/connection-helpers.c:305
 #: ../src/connection-editor/page-proxy.c:118
 #: ../src/connection-editor/page-team.c:341
 #: ../src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "インポートするファイルを選択する"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: ../src/connection-editor/connection-helpers.c:309
+#: ../src/connection-editor/page-proxy.c:122
+#: ../src/connection-editor/page-team.c:345
+#: ../src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr "開く(_O)"
+
+#: ../src/connection-editor/connection-helpers.c:340
 msgid "Hardware"
 msgstr "ハードウェア"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: ../src/connection-editor/connection-helpers.c:367
 msgid "Virtual"
 msgstr "仮想"
 
-#: ../src/connection-editor/connection-helpers.c:514
 #: ../src/connection-editor/connection-helpers.c:516
+#: ../src/connection-editor/connection-helpers.c:518
 msgid "Import a saved VPN configuration…"
 msgstr "保存した VPN 設定をインポートする..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: ../src/connection-editor/connection-helpers.c:548
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
-"接続エディターのダイアログは不明なエラーのために初期化できませんでした。"
+"接続エディターのダイアログは、不明なエラーのため初期化できませんでした。"
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: ../src/connection-editor/connection-helpers.c:557
 msgid "Could not create new connection"
 msgstr "新しい接続を作成できませんでした"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: ../src/connection-editor/connection-helpers.c:720
 msgid "Connection delete failed"
 msgstr "接続の削除に失敗しました"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: ../src/connection-editor/connection-helpers.c:768
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
-msgstr "本当に 接続 %s を削除したいのですか ?"
+msgstr "接続 %s を削除してもよろしいですか?"
 
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "アドレス"
 
@@ -2916,7 +3159,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
@@ -2926,70 +3169,72 @@
 msgstr "メトリック"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "プレフィックス"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: ../src/connection-editor/nm-connection-editor.c:109
 #, c-format
 msgid "Editing %s"
 msgstr "%s の編集"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: ../src/connection-editor/nm-connection-editor.c:113
 msgid "Editing un-named connection"
 msgstr "無名の接続を編集"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: ../src/connection-editor/nm-connection-editor.c:133
 msgid "Missing connection name"
 msgstr "接続名がみつかりません"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: ../src/connection-editor/nm-connection-editor.c:353
 msgid "Editor initializing…"
 msgstr "エディターの初期化中..."
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: ../src/connection-editor/nm-connection-editor.c:360
+#: ../src/connection-editor/nm-connection-list.c:443
 msgid "Connection cannot be modified"
 msgstr "接続を変更できません"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: ../src/connection-editor/nm-connection-editor.c:375
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "無効な設定 %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: ../src/connection-editor/nm-connection-editor.c:451
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
-"接続エディターは必要ないくつかのリソースをみつけられませんでした (.ui ファイ"
-"ルがみつかりませんでした)。"
+"接続エディターは、必要なリソースをいくつか見つけられませんでした (.ui ファイ"
+"ルが見つかりませんでした)。"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/nm-connection-editor.c:579
 msgid "Save any changes made to this connection."
-msgstr "この接続に対しての変更をすべて保存します。"
+msgstr "この接続に対する変更をすべて保存します。"
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: ../src/connection-editor/nm-connection-editor.c:580
 msgid "Authenticate to save this connection for all users of this machine."
-msgstr "このマシンのすべてのユーザー用接続の保存を認証する。"
+msgstr ""
+"このマシンのすべてのユーザーに対して、この接続を保存するために認証する。"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not create connection"
 msgstr "新しい接続を作成できませんでした"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not edit connection"
 msgstr "接続を編集できませんでした"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: ../src/connection-editor/nm-connection-editor.c:598
 msgid "Unknown error creating connection editor dialog."
 msgstr "接続エディターダイアログの作成中に不明なエラーです。"
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: ../src/connection-editor/nm-connection-editor.c:739
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -2997,23 +3242,19 @@
 "警告: この接続には、エディターがサポートしていないプロパティーが含まれていま"
 "す。保存後するとこれらは消去されます。"
 
-#: ../src/connection-editor/nm-connection-editor.c:758
+#: ../src/connection-editor/nm-connection-editor.c:759
 msgid "Error initializing editor"
 msgstr "エディターの初期化中にエラーです"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: ../src/connection-editor/nm-connection-editor.c:1157
 msgid "Connection add failed"
 msgstr "接続の追加に失敗しました"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr "閉じる(_C)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Fix"
 msgstr "修正"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3021,137 +3262,153 @@
 "セキュリティーラベルにより、ファイルを証明書の認証に使用できない場合がありま"
 "す。"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "接続名(_N):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "_Export…"
 msgstr "エクスポート(_E)..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
 msgid "File Relabel"
 msgstr "ファイルの再ラベル付け"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "_Relabel"
 msgstr "再ラベル付け(_R)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
-"以下のファイルは証明書の認証向けにラベル付けされていません。ラベルを修正しま"
-"すか?"
+"以下のファイルは、証明書の認証向けにラベル付けされていません。ラベルを修正し"
+"ますか?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
 msgid "Relabel"
 msgstr "再ラベル付け"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
 msgid "Filename"
 msgstr "ファイル名"
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: ../src/connection-editor/nm-connection-list.c:151
 msgid "never"
 msgstr "未接続"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:173
 msgid "now"
 msgstr "接続中"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: ../src/connection-editor/nm-connection-list.c:180
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分前"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: ../src/connection-editor/nm-connection-list.c:184
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 時間前"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:196
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 日前"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: ../src/connection-editor/nm-connection-list.c:202
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ヶ月前"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: ../src/connection-editor/nm-connection-list.c:206
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年前"
 
-#: ../src/connection-editor/nm-connection-list.c:635
+#: ../src/connection-editor/nm-connection-list.c:445
+msgid "Connection cannot be deleted"
+msgstr "接続を削除できません"
+
+#: ../src/connection-editor/nm-connection-list.c:448
+msgid "Select a connection to edit"
+msgstr "編集する接続を選択"
+
+#: ../src/connection-editor/nm-connection-list.c:450
+msgid "Select a connection to delete"
+msgstr "削除する接続を選択"
+
+#: ../src/connection-editor/nm-connection-list.c:785
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
 msgid "Name"
 msgstr "名前"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: ../src/connection-editor/nm-connection-list.c:798
 msgid "Last Used"
 msgstr "前回の使用"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: ../src/connection-editor/nm-connection-list.c:836
 msgid "Edit the selected connection"
 msgstr "選択した接続を編集する"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: ../src/connection-editor/nm-connection-list.c:837
 msgid "Authenticate to edit the selected connection"
 msgstr "選択した接続の編集を認証する"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: ../src/connection-editor/nm-connection-list.c:842
 msgid "Delete the selected connection"
 msgstr "選択した接続を削除する"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: ../src/connection-editor/nm-connection-list.c:843
 msgid "Authenticate to delete the selected connection"
 msgstr "選択した接続の削除を認証する"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:1048
+#: ../src/connection-editor/nm-connection-list.c:1051
 msgid "Error creating connection"
 msgstr "接続の作成中にエラー"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:1049
 msgid "No VPN plugins are installed."
 msgstr "VPN プラグインがインストールされていません"
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:1052
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "接続 '%s' の作成方法がわかりません"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: ../src/connection-editor/nm-connection-list.c:1085
 msgid "Error editing connection"
-msgstr "接続を編集しようとしてエラー"
+msgstr "接続の編集エラー"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: ../src/connection-editor/nm-connection-list.c:1086
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
-msgstr "UUID '%s' の接続がみつかりませんでした"
+msgstr "UUID '%s' の接続が見つかりませんでした"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: ../src/connection-editor/nm-connection-list.ui.h:2
+msgid "Add a new connection"
+msgstr "新規接続を追加"
+
+#: ../src/connection-editor/page-8021x-security.c:116
 msgid "802.1X Security"
-msgstr "802.1X セキュリティ"
+msgstr "802.1X セキュリティー"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: ../src/connection-editor/page-8021x-security.c:118
 msgid "Could not load 802.1X Security user interface."
-msgstr "802.1X セキュリティユーザーインターフェースを読み込めません。"
+msgstr "802.1X セキュリティーユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: ../src/connection-editor/page-8021x-security.c:132
 msgid "Use 802.1_X security for this connection"
-msgstr "この接続に 802.1X セキュリティを使用する(_X)"
+msgstr "この接続に 802.1X セキュリティーを使用する(_X)"
 
 #: ../src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
@@ -3193,18 +3450,18 @@
 
 #: ../src/connection-editor/page-bond.c:568
 msgid "primary"
-msgstr "プライマリ"
+msgstr "プライマリー"
 
 #: ../src/connection-editor/page-bond.c:623
 #, c-format
 msgid "Bond connection %d"
-msgstr "bond 接続 %d"
+msgstr "ボンド接続 %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:236
 msgid "Could not load bridge user interface."
 msgstr "ブリッジユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-bridge.c:317
+#: ../src/connection-editor/page-bridge.c:352
 #, c-format
 msgid "Bridge connection %d"
 msgstr "ブリッジ接続 %d"
@@ -3228,11 +3485,15 @@
 msgid "Could not load DCB user interface."
 msgstr "DCB ユーザーインターフェースをロードできませんでした。"
 
-#: ../src/connection-editor/page-dsl.c:129
+#: ../src/connection-editor/page-dsl.c:203
 msgid "Could not load DSL user interface."
 msgstr "DSL ユーザーインターフェースをロードできませんでした。"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: ../src/connection-editor/page-dsl.c:298
+msgid "missing parent interface"
+msgstr "不明の親インターフェース"
+
+#: ../src/connection-editor/page-dsl.c:343
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 接続 %d"
@@ -3257,13 +3518,13 @@
 
 #: ../src/connection-editor/page-ethernet.c:515
 msgid "Ethernet device"
-msgstr "イーサネットデバイス"
+msgstr "Ethernet デバイス"
 
 #: ../src/connection-editor/page-ethernet.c:519
 #: ../src/connection-editor/page-vlan.c:742
 #: ../src/connection-editor/page-wifi.c:574
 msgid "cloned MAC"
-msgstr "クローンした MAC"
+msgstr "クローン MAC"
 
 #: ../src/connection-editor/page-ethernet.c:523
 msgid "Wake-on-LAN password"
@@ -3272,7 +3533,7 @@
 #: ../src/connection-editor/page-ethernet.c:563
 #, c-format
 msgid "Ethernet connection %d"
-msgstr "イーサネット接続 %d"
+msgstr "Ethernet 接続 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
 #: ../src/connection-editor/page-general.c:54
@@ -3287,10 +3548,9 @@
 "zone, selecting it results in the use of the default zone set in the "
 "firewall. Only usable if firewalld is active."
 msgstr ""
-"このゾーンは接続の信頼レベルを定義します。デフォルトは通常のゾーンではなく、"
-"デフォルトを選択した場合はファイアウォールでセットされているデフォルトのゾー"
-"ンを利用することになります。これは firewalld がアクティブの場合にのみ有意で"
-"す。"
+"このゾーンは接続の信頼レベルを定義します。デフォルトを選択した場合は、通常の"
+"ゾーンではなく、ファイアウォールでセットされているデフォルトのゾーンを利用す"
+"ることになります。これは firewalld がアクティブの場合にのみ有意です。"
 
 #: ../src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
@@ -3331,27 +3591,27 @@
 msgstr "IP トンネル接続 %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "自動 (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "自動 (VPN) アドレス専用"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "自動、アドレスのみ"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "自動 (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "自動 (PPPoE) アドレス専用"
 
@@ -3364,17 +3624,17 @@
 msgstr "自動 (DHCP) アドレス専用"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "ローカルへのリンク専用"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "追加の DNS サーバー(_V):"
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "追加の検索ドメイン(_E):"
 
@@ -3411,43 +3671,52 @@
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4 DNS サーバー '%s' が無効"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "自動、DHCP のみ"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s 用の IPv6 ルートを編集"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "IPv6 のセッティング"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6 アドレス '%s' が無効"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6 プレフィックス “%s” が無効"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6 ゲートウェイ '%s' が無効"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6 DNS サーバー '%s' が無効"
 
+#: ../src/connection-editor/page-macsec.c:192
+msgid "Could not load MACsec user interface."
+msgstr "MACsec ユーザーインターフェースを読み込めませんでした。"
+
+#: ../src/connection-editor/page-macsec.c:331
+#, c-format
+msgid "MACSEC connection %d"
+msgstr "MACSEC 接続 %d"
+
 #: ../src/connection-editor/page-master.c:247
 #: ../src/connection-editor/page-master.c:258
 msgid "Duplicate slaves"
@@ -3456,7 +3725,7 @@
 #: ../src/connection-editor/page-master.c:248
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
-msgstr "スレーブ '%s' と '%s' は両方ともデバイス '%s' へ適用されます。"
+msgstr "スレーブ '%s' と '%s' は、両方ともデバイス '%s' へ適用されます。"
 
 #: ../src/connection-editor/page-master.c:259
 #, c-format
@@ -3507,38 +3776,34 @@
 "私のプロバイダーは CDMA ベースの技術 (例えば、1xRTT, EVDO)を使用します(_D)"
 
 #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: ../src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
 #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: ../src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
 #: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: ../src/wireless-security/eap-method-ttls.c:287
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: ../src/wireless-security/eap-method-fast.c:282
+#: ../src/wireless-security/eap-method-peap.c:299
+#: ../src/wireless-security/eap-method-ttls.c:317
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: ../src/wireless-security/eap-method-ttls.c:302
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3562,36 +3827,36 @@
 
 #: ../src/connection-editor/page-proxy.c:215
 msgid "Proxy"
-msgstr "プロキシ"
+msgstr "プロキシー"
 
 #: ../src/connection-editor/page-proxy.c:217
 msgid "Could not load proxy user interface."
-msgstr "プロキシユーザーインターフェースを読み込めません。"
+msgstr "プロキシーユーザーインターフェースを読み込めません。"
 
 #: ../src/connection-editor/page-team.c:361
 #: ../src/connection-editor/page-team-port.c:223
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "エラー: ファイルに有効な JSON 設定がありません。"
 
-#: ../src/connection-editor/page-team.c:1156
+#: ../src/connection-editor/page-team.c:1034
 msgid "Could not load team user interface."
-msgstr "Team ユーザーインターフェースを読み込めません。"
+msgstr "チームユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-team.c:1253
+#: ../src/connection-editor/page-team.c:1131
 #, c-format
 msgid "Team connection %d"
-msgstr "Team 接続 %d"
+msgstr "チーム接続 %d"
 
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: ../src/connection-editor/page-team-port.c:655
 msgid "Team Port"
-msgstr "Team ポート"
+msgstr "チームポート"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: ../src/connection-editor/page-team-port.c:657
 msgid "Could not load team port user interface."
-msgstr "Team ポートのユーザーインターフェースを読み込めません。"
+msgstr "チームポートのユーザーインターフェースを読み込めません。"
 
 #. Translators: the first %s is a device name (eg, "em1"), the
 #. * second is a connection name (eg, "Auto Ethernet").
@@ -3696,51 +3961,51 @@
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 接続 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
+#: ../src/connection-editor/page-wifi-security.c:358
 #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit キー (HEX または ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
+#: ../src/connection-editor/page-wifi-security.c:368
 #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit パスフレーズ"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: ../src/connection-editor/page-wifi-security.c:394
 msgid "Dynamic WEP (802.1X)"
 msgstr "動的 WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
+#: ../src/connection-editor/page-wifi-security.c:407
 #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 # そういう仕様の名前なので訳すべきでない。
-#: ../src/connection-editor/page-wifi-security.c:418
+#: ../src/connection-editor/page-wifi-security.c:420
 #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: ../src/connection-editor/page-wifi-security.c:463
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
-"Wi-Fi セキュリティユーザーインターフェースを読み込めません。Wi-Fi 設定があり"
-"ません。"
+"Wi-Fi セキュリティーユーザーインターフェースを読み込めません。Wi-Fi 設定があ"
+"りません。"
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: ../src/connection-editor/page-wifi-security.c:474
 msgid "Wi-Fi Security"
-msgstr "Wi-Fi セキュリティ"
+msgstr "Wi-Fi セキュリティー"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: ../src/connection-editor/page-wifi-security.c:476
 msgid "Could not load Wi-Fi security user interface."
-msgstr "Wi-Fi セキュリティユーザーインターフェースを読み込めません。"
+msgstr "Wi-Fi セキュリティーユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-wifi-security.c:558
+#: ../src/connection-editor/page-wifi-security.c:560
 #, c-format
 msgid "missing SSID"
-msgstr "見つからない SSID"
+msgstr "不明な SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:564
+#: ../src/connection-editor/page-wifi-security.c:566
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Ad-Hoc モードとのセキュリティーの互換性がありません"
@@ -3770,7 +4035,7 @@
 "\n"
 "Error: %s."
 msgstr ""
-"VPN 接続 '%s' は %s にエクスポートできませんでした。\n"
+"VPN 接続 '%s' は、%s にエクスポートできませんでした。\n"
 "\n"
 "エラー: %s"
 
@@ -3790,34 +4055,38 @@
 msgid "Connection Information"
 msgstr "接続情報"
 
+#: ../src/info.ui.h:2
+msgid "_Close"
+msgstr "閉じる(_C)"
+
 #: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "有効なネットワーク接続"
 
 #: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
 msgid "No certificate set"
 msgstr "証明書セットがありません"
 
 #: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
 msgid "No key set"
 msgstr "キーセットがありません"
 
 #: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "%s 証明書のキーを選択する"
 
 #: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
 #, c-format
 msgid "%s private _key:"
 msgstr "%s プライベートキー(_K):"
 
 #: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
 #, c-format
 msgid "%s key _password:"
 msgstr "%s キーパスワード(_P):"
@@ -3828,7 +4097,7 @@
 msgstr "%s 証明書を選択する"
 
 #: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
 msgid "%s _certificate:"
 msgstr "%s 証明書(_C):"
@@ -3837,8 +4106,7 @@
 #: ../src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"ご使用のモバイルブロードバンド接続は以下のセッティングで設定されています:"
+msgstr "ご使用のモバイルブロードバンド接続は、以下のように設定されています。"
 
 #. Device
 #: ../src/libnma/nma-mobile-wizard.c:205
@@ -3987,8 +4255,8 @@
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr ""
-"このアシスタントはユーザーが簡単に携帯 (3G) ネットワークへのモバイルブロード"
-"バンド接続ができるように手伝います。"
+"このアシスタントを使用すると、携帯 (3G) ネットワークへのモバイルブロードバン"
+"ド接続が簡単にできます。"
 
 #: ../src/libnma/nma-mobile-wizard.c:1360
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1361
@@ -4030,45 +4298,45 @@
 msgid "New Mobile Broadband Connection"
 msgstr "新規のモバイルブロードバンド接続"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: ../src/libnma/nma-cert-chooser-button.c:165
 msgid "(None)"
 msgstr "(なし)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: ../src/libnma/nma-cert-chooser-button.c:173
 #, c-format
 msgid "Key in %s"
 msgstr "%s 内のキー"
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: ../src/libnma/nma-cert-chooser-button.c:174
 #, c-format
 msgid "Certificate in %s"
 msgstr "%s 内の 証明書"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
+#: ../src/libnma/nma-cert-chooser-button.c:193
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(不明)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: ../src/libnma/nma-cert-chooser-button.c:215
+#: ../src/libnma/nma-cert-chooser-button.c:245
 msgid "Select"
 msgstr "選択"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: ../src/libnma/nma-cert-chooser-button.c:216
+#: ../src/libnma/nma-cert-chooser-button.c:246
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: ../src/libnma/nma-cert-chooser-button.c:472
 msgid "Select from file…"
 msgstr "ファイルから選択…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "%s  証明書を選択する"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s certificate _password:"
 msgstr "%s 証明書のパスワード(_P):"
@@ -4121,15 +4389,15 @@
 #: ../src/libnma/nma-vpn-password-dialog.c:99
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
-msgstr "セカンダリパスワード(_S):"
+msgstr "セカンダリーパスワード(_S):"
 
 #: ../src/libnma/nma-vpn-password-dialog.c:102
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "第 3 のパスワード(_T):"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: ../src/libnma/nma-vpn-password-dialog.c:238
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "パスワードを表示(_O)"
 
@@ -4142,7 +4410,7 @@
 "Either a 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-"
+"パスワードが見つからない、もしくは接続が無効です。無効の場合は、まず nm-"
 "connection-editor で接続を編集する必要があります。"
 
 #: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
@@ -4158,55 +4426,56 @@
 msgid "Dynamic WEP (802.1x)"
 msgstr "動的 WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "作成(_R)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
-"Wi-Fi ネットワーク '%s' にアクセスするにはパスワードか暗号化キーが必要です。"
+"Wi-Fi ネットワーク '%s' にアクセスするには、パスワードか暗号化キーが必要で"
+"す。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi ネットワークの認証が必要です"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi ネットワークでは認証が要求されます"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "新しい Wi-Fi ネットワークを作成"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "新規 Wi-Fi ネットワーク"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
-msgstr "作成したい Wi-Fi ネットワークの名前を入力してください。"
+msgstr "作成する Wi-Fi ネットワークの名前を入力してください。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "非表示 Wi-Fi ネットワークに接続する"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "非表示 Wi-Fi ネットワーク"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
-"接続したい Wi-Fi ネットワークの名前とセキュリティ詳細を入力してください。"
+"接続する Wi-Fi ネットワークの名前とセキュリティー詳細を入力してください。"
 
 #: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
 msgid "Wi-Fi _security:"
-msgstr "Wi-Fi セキュリティ(_S):"
+msgstr "Wi-Fi セキュリティー(_S):"
 
 #: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "C_onnection:"
@@ -4257,7 +4526,7 @@
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"このプログラムは NetworkManager (https://wiki.gnome.org/Projects/"
+"このプログラムは、NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/) のコンポーネントです。"
 
 #: ../src/main.c:45
@@ -4265,8 +4534,8 @@
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
-"コマンドラインでの利用は意図されていませんが、その代わりに GNOME デスクトップ"
-"環境で実行します。"
+"コマンドラインでの利用は意図されていません。代わりに GNOME デスクトップ環境で"
+"実行します。"
 
 #: ../src/mb-menu-item.c:52
 msgid "EVDO"
@@ -4350,25 +4619,25 @@
 msgid "Roaming network"
 msgstr "ローミングネットワーク"
 
-#: ../src/mobile-helpers.c:331
+#: ../src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
-msgstr "'%s' 上の SIM カード '%s' の PIN コード"
+msgstr "SIM カード '%s' の PIN コード ('%s' に搭載)"
 
-#: ../src/mobile-helpers.c:464
+#: ../src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN コードが必要です"
 
-#: ../src/mobile-helpers.c:472
+#: ../src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "モバイルブロードバンドデバイスには PIN コードが必要です"
 
-#: ../src/mobile-helpers.c:622
+#: ../src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "モバイルブロードバンド接続 '%s' はアクティブです: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: ../src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "ローミング"
 
@@ -4378,11 +4647,11 @@
 msgid "%s connection"
 msgstr "%s 接続"
 
-#: ../src/utils/utils.c:563
+#: ../src/utils/utils.c:565
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "PEM 証明書 (*.pem、*.crt、*.cer)"
 
-#: ../src/utils/utils.c:575
+#: ../src/utils/utils.c:577
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER か、PEM、 PKCS#12 のプライベートキー (*.der, *.pem, *.p12, *.key)"
 
@@ -4390,38 +4659,33 @@
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "802.1X セキュリティーで未定義のエラー (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr "ファイルが選択されていません"
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr "ファイル '%s' は存在しません"
+#: ../src/wireless-security/eap-method.c:365
+msgid "no CA certificate selected"
+msgstr "CA 証明書が選択されていません"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
-msgstr "eap-method ファイルの検証中に原因不明のエラー"
+#: ../src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
+msgstr "選択された CA 証明書ファイルは存在しません"
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: ../src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC ファイルがありません"
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: ../src/wireless-security/eap-method-fast.c:267
+#: ../src/wireless-security/eap-method-peap.c:329
+#: ../src/wireless-security/eap-method-ttls.c:379
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:405
 msgid "Choose a PAC file"
 msgstr "PAC ファイルを選択"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:412
 msgid "PAC files (*.pac)"
 msgstr "PAC ファイル (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: ../src/wireless-security/eap-method-fast.c:416
 msgid "All files"
 msgstr "すべてのファイル"
 
@@ -4439,7 +4703,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:4
 #: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "Anony_mous identity:"
 msgstr "匿名の識別子(_M):"
 
@@ -4449,7 +4713,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:6
 #: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
 msgid "_Inner authentication:"
 msgstr "内部認証(_I):"
 
@@ -4466,26 +4730,12 @@
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP パスワードがありません"
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr "EAP-PEAP CA 証明書が無効です: %s"
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr "EAP-PEAP CA 証明書が無効です: 証明書が指定されていません"
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: ../src/wireless-security/eap-method-peap.c:314
+#: ../src/wireless-security/eap-method-ttls.c:364
 #: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-msgid "Choose a Certificate Authority certificate"
-msgstr "証明機関 (CA) 証明書を選択"
-
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "バージョン 0"
@@ -4495,20 +4745,27 @@
 msgstr "バージョン 1"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "CA 証明書(_A):"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
 #: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
 msgid "No CA certificate is _required"
 msgstr "CA 証明書は必要ありません(_R)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:6
 msgid "PEAP _version:"
 msgstr "PEAP バージョン(_V):"
 
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "Suffix of the server certificate name."
+msgstr "サーバー証明書名のサフィックス"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Domain:"
+msgstr "ドメイン(_D):"
+
 #: ../src/wireless-security/eap-method-simple.c:75
 msgid "missing EAP username"
 msgstr "EAP ユーザー名がありません"
@@ -4521,48 +4778,31 @@
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS アイデンティティーがありません"
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: ../src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "ユーザー証明書が選択されていません"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: ../src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "選択されたユーザー証明書ファイルは存在しません"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "キーが選択されていません"
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: ../src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "選択されたキーファイルは存在しません"
 
-#: ../src/wireless-security/eap-method-tls.c:314
-msgid "no CA certificate selected"
-msgstr "CA 証明書が選択されていません"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr "選択された CA 証明書ファイルは存在しません"
-
 # とりあえずこのように訳しておくが "Identity" のままの方が適切かもしれない。
 # (WPA-EAP Identity 認証方式: ユーザ ID とパスワードの組で認証)
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "アイデンティティー(_D):"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr "EAP-TTLS CA 証明書が無効です: %s"
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr "EAP-TTLS CA 証明書が無効です: 証明書がしてされていません"
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "MSCHAPv2 (no EAP)"
-msgstr "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2 (非 EAP)"
 
 #: ../src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
@@ -4596,26 +4836,26 @@
 
 #: ../src/wireless-security/ws-leap.c:63
 msgid "missing leap-username"
-msgstr "leap-username がみつかりません"
+msgstr "leap-username が見つかりません"
 
 #: ../src/wireless-security/ws-leap.c:74
 msgid "missing leap-password"
-msgstr "leap-password がみつかりません"
+msgstr "leap-password が見つかりません"
 
 #: ../src/wireless-security/ws-wep-key.c:107
 msgid "missing wep-key"
-msgstr "wep-key がみつかりません"
+msgstr "wep-key が見つかりません"
 
 #: ../src/wireless-security/ws-wep-key.c:116
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
-msgstr "無効な wep-key: %zu の長さのキーには 16 進数しか使用できません"
+msgstr "無効な wep-key: %zu の長さのキーには、16 進数しか使用できません"
 
 #: ../src/wireless-security/ws-wep-key.c:124
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
-msgstr "無効な wep-key: %zu の長さのキーには ascii 文字しか使用できません"
+msgstr "無効な wep-key: %zu の長さのキーには、ascii 文字しか使用できません"
 
 #: ../src/wireless-security/ws-wep-key.c:130
 #, c-format
@@ -4635,17 +4875,17 @@
 msgstr "無効な wep-key: パスフレーズは 64 文字未満にする必要があります。"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (デフォルト)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Open System"
 msgstr "オープンシステム"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Shared Key"
 msgstr "共有鍵"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "1 (Default)"
+msgstr "1 (デフォルト)"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key:"
 msgstr "キー(_K):"
diff -Nru network-manager-applet-1.8.4/po/ko.po network-manager-applet-1.8.10/po/ko.po
--- network-manager-applet-1.8.4/po/ko.po	2017-05-10 10:44:54.000000000 +0000
+++ network-manager-applet-1.8.10/po/ko.po	2017-12-19 11:44:30.000000000 +0000
@@ -17,22 +17,23 @@
 #  - VPN은 "가상 사설망"으로 풀어서 번역
 #  - bond는 "본딩"으로 번역 (여러 네트워크를 묶어서 사용)
 #  - bridged network는 "브릿지 네트워크"로 번역
-#
+# lrintel , 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-applet\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
-"PO-Revision-Date: 2014-09-06 18:12+0900\n"
-"Last-Translator: Changwoo Ryu \n"
+"POT-Creation-Date: 2017-12-12 11:18+0100\n"
+"PO-Revision-Date: 2017-11-07 06:44+0000\n"
+"Last-Translator: Copied by Zanata \n"
 "Language-Team: GNOME Korea \n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Zanata 4.3.2\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
 msgstr "네트워크"
 
@@ -41,7 +42,7 @@
 msgstr "네트워크 연결을 관리합니다"
 
 #: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: ../src/connection-editor/nm-connection-list.ui.h:1
 msgid "Network Connections"
 msgstr "네트워크 연결"
 
@@ -153,55 +154,68 @@
 msgid "The NetworkManager Developers"
 msgstr "네트워크 관리 애플릿"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
 
-#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X 인증"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1
+#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
+#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
 #: ../src/connection-editor/ce-new-connection.ui.h:1
 #: ../src/connection-editor/ce-page-dcb.ui.h:17
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/connection-editor/connection-helpers.c:308
+#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/page-bluetooth.c:311
+#: ../src/connection-editor/page-mobile.c:543
+#: ../src/connection-editor/page-proxy.c:121
+#: ../src/connection-editor/page-team.c:344
+#: ../src/connection-editor/page-team-port.c:206
+#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
+#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/libnma/nma-vpn-password-dialog.c:209
+#: ../src/libnma/nma-wifi-dialog.c:1066
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "연결(_O)"
 
@@ -218,38 +232,38 @@
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: ../src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "연결 추가/활성화하는 데 실패"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "알 수 없는 오류"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "연결에 실패"
 
-#: ../src/applet.c:435
+#: ../src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "장치 연결 끊는 데 실패"
 
-#: ../src/applet.c:440
+#: ../src/applet.c:451
 msgid "Disconnect failure"
 msgstr "연결 끊는 데 실패"
 
-#: ../src/applet.c:470
+#: ../src/applet.c:481
 msgid "Connection activation failed"
 msgstr "연결 활성화 실패"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "다시 보지 않기"
 
-#: ../src/applet.c:883
+#: ../src/applet.c:899
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -259,7 +273,7 @@
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 네트워크 연결이 중단되었습니다."
 
-#: ../src/applet.c:885
+#: ../src/applet.c:901
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -269,7 +283,7 @@
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 네트워크 연결이 중단되었습니다."
 
-#: ../src/applet.c:887
+#: ../src/applet.c:903
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -279,7 +293,7 @@
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 예기치 못하게 중단"
 "되었습니다."
 
-#: ../src/applet.c:889
+#: ../src/applet.c:905
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -290,7 +304,7 @@
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 잘못된 설정을 반환"
 "했습니다."
 
-#: ../src/applet.c:891
+#: ../src/applet.c:907
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -299,7 +313,7 @@
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 연결 시도가 제한 시간을 초과했습니다."
 
-#: ../src/applet.c:893
+#: ../src/applet.c:909
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -309,7 +323,7 @@
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 제 시간에 시작하"
 "지 못했습니다."
 
-#: ../src/applet.c:895
+#: ../src/applet.c:911
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -319,7 +333,7 @@
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스를 시작하는데 실패했"
 "습니다."
 
-#: ../src/applet.c:897
+#: ../src/applet.c:913
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -328,7 +342,7 @@
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 올바른 가상 사설망 비밀정보가 없습니다."
 
-#: ../src/applet.c:899
+#: ../src/applet.c:915
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -337,7 +351,7 @@
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 비밀 정보가 잘못되었습니다."
 
-#: ../src/applet.c:904
+#: ../src/applet.c:920
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -346,7 +360,7 @@
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다."
 
-#: ../src/applet.c:931
+#: ../src/applet.c:947
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -357,19 +371,19 @@
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: ../src/applet.c:949
 msgid "VPN connection has been successfully established.\n"
 msgstr "가상 사설망에 성공적으로 연결했습니다.\n"
 
-#: ../src/applet.c:935
+#: ../src/applet.c:951
 msgid "VPN Login Message"
 msgstr "가상 사설망 로그인 메시지"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: ../src/applet.c:959 ../src/applet.c:999
 msgid "VPN Connection Failed"
 msgstr "가상 사설망 연결 실패"
 
-#: ../src/applet.c:987
+#: ../src/applet.c:1003
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -383,7 +397,7 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: ../src/applet.c:1006
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -396,148 +410,148 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: ../src/applet.c:1295
 msgid "device not ready (firmware missing)"
 msgstr "장치가 준비되지 않음(펌웨어 없음)"
 
-#: ../src/applet.c:1281
+#: ../src/applet.c:1297
 msgid "device not ready"
 msgstr "장치가 준비되지 않음"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "연결 끊김"
 
-#: ../src/applet.c:1307
+#: ../src/applet.c:1323
 msgid "Disconnect"
 msgstr "연결 끊김"
 
-#: ../src/applet.c:1321
+#: ../src/applet.c:1337
 msgid "device not managed"
 msgstr "장치가 관리되지 않음"
 
-#: ../src/applet.c:1394
+#: ../src/applet.c:1410
 msgid "No network devices available"
 msgstr "네트워크 장치를 찾을 수 없습니다"
 
-#: ../src/applet.c:1448
+#: ../src/applet.c:1464
 msgid "_VPN Connections"
 msgstr "가상 사설망 연결(_V)"
 
-#: ../src/applet.c:1492
+#: ../src/applet.c:1508
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "가상 사설망 설정(_C)..."
 
-#: ../src/applet.c:1495
+#: ../src/applet.c:1511
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "가상 사설망 연결(_V)"
 
-#: ../src/applet.c:1601
+#: ../src/applet.c:1617
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "네트워크 관리가 실행 중이 아닙니다..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: ../src/applet.c:1622 ../src/applet.c:2687
 msgid "Networking disabled"
 msgstr "네트워크를 사용할 수 없습니다"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: ../src/applet.c:1832
 msgid "Enable _Networking"
 msgstr "네트워크 사용(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: ../src/applet.c:1841
 msgid "Enable _Wi-Fi"
 msgstr "와이파이 사용(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: ../src/applet.c:1850
 msgid "Enable _Mobile Broadband"
 msgstr "모바일 광대역 사용(_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: ../src/applet.c:1862
 msgid "Enable N_otifications"
 msgstr "통지기능 사용(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: ../src/applet.c:1874
 msgid "Connection _Information"
 msgstr "연결 정보(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: ../src/applet.c:1882
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "연결 편집..."
 
-#: ../src/applet.c:1880
+#: ../src/applet.c:1896
 msgid "_About"
 msgstr "정보(_A)"
 
-#: ../src/applet.c:2191
+#: ../src/applet.c:2207
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "'%s'에 연결되었습니다."
 
-#: ../src/applet.c:2231
+#: ../src/applet.c:2247
 msgid "Disconnected"
 msgstr "연결 끊김"
 
-#: ../src/applet.c:2232
+#: ../src/applet.c:2248
 msgid "The network connection has been disconnected."
 msgstr "네트워크 연결이 끊겼습니다."
 
-#: ../src/applet.c:2534
+#: ../src/applet.c:2550
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "네트워크 연결 '%s' 준비 중..."
 
-#: ../src/applet.c:2537
+#: ../src/applet.c:2553
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "네트워크 연결 '%s'에는 사용자 인증이 필요합니다..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s'에 네트워크 주소 요청중..."
 
-#: ../src/applet.c:2543
+#: ../src/applet.c:2559
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "'%s' 네트워크 연결 사용 중"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2632
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "가상 사설망 연결 '%s' 시작 중..."
 
-#: ../src/applet.c:2619
+#: ../src/applet.c:2635
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "가상 사설망 연결 '%s'에는 사용자 인증이 필요합니다..."
 
-#: ../src/applet.c:2622
+#: ../src/applet.c:2638
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s'에 가상 사설망 주소 요청 중..."
 
-#: ../src/applet.c:2625
+#: ../src/applet.c:2641
 #, fuzzy, c-format
 msgid "VPN connection active"
 msgstr "가상 사설망 연결 '%s' 사용 중"
 
-#: ../src/applet.c:2675
+#: ../src/applet.c:2691
 msgid "No network connection"
 msgstr "네트워크 연결 없음"
 
-#: ../src/applet.c:3276
+#: ../src/applet.c:3292
 msgid "NetworkManager Applet"
 msgstr "네트워크 관리 애플릿"
 
@@ -555,47 +569,47 @@
 msgid "Sending unlock code…"
 msgstr "언락 코드를 보내는 중..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "모바일 광대역(%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/applet-device-broadband.c:739
+#: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "모바일 광대역"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "사용 가능"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "새 모바일 광대역 연결"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "연결됨"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "모바일 광대역 네트워크에 연결되었습니다."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "모바일 광대역 네트워크."
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "홈 네트워크에 등록되었습니다."
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "로밍 네트워크에 등록되었습니다."
 
@@ -603,22 +617,22 @@
 msgid "You are now connected to the mobile broadband network."
 msgstr "모바일 광대역 네트워크에 연결되었습니다."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "모바일 광대역 연결 '%s' 준비 중..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "모바일 광대역 연결 '%s' 설정 중..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "모바일 광대역 연결 '%s'에는 사용자 인증이 필요합니다..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "모바일 광대역 연결 '%s' 사용 중"
@@ -678,6 +692,18 @@
 msgid "DSL authentication"
 msgstr "DSL 인증"
 
+#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/page-bluetooth.c:313
+#: ../src/connection-editor/page-mobile.c:545
+#: ../src/libnma/nma-vpn-password-dialog.c:210
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
 #: ../src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
@@ -692,7 +718,7 @@
 msgid "(none)"
 msgstr "(없음)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "새로운 연결을 추가하는데 실패"
 
@@ -700,77 +726,77 @@
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "와이파이 네트워크(%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "와이파이 네트워크(%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "와이파이 네트워크"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "와이파이를 사용하지 않습니다"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "와이파이가 하드웨어 스위치를 통해 사용하지 않습니다"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "다른 네트워크"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "와이파이 네트워크가 사용 가능합니다"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "네트워크 메뉴에서 와이파이 네트워크에 연결할 수 있습니다"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "와이파이 네트워크 '%s'에 연결되었습니다."
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "와이파이 네트워크 '%s' 연결 준비 중..."
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "와이파이 네트워크 '%s' 연결 설정 중..."
 
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "와이파이 네트워크 연결 '%s'에 사용자 인증이 필요합니다..."
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s'에 대한 와이파이 네트워크 주소 요청 중..."
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "와이파이 네트워크 연결 '%s' 사용 중: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "와이파이 네트워크 연결 '%s' 사용 중"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "연결 활성화하는 데 실패"
 
@@ -778,195 +804,195 @@
 msgid "Error displaying connection information:"
 msgstr "연결 정보 보이기 오류:"
 
-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
 #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: ../src/applet-dialogs.c:75
 msgid "Dynamic WEP"
 msgstr "동적 WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:231
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: ../src/applet-dialogs.c:152
 #, fuzzy
 msgid "More addresses"
 msgstr "주소"
 
-#: ../src/applet-dialogs.c:226
+#: ../src/applet-dialogs.c:227
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
+#: ../src/connection-editor/page-wifi-security.c:332
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "없음"
 
-#: ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:261
 #, c-format
 msgid "%s (default)"
 msgstr "%s (기본값)"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "알 수 없음"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
 msgctxt "Address"
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
 msgid "IP Address:"
 msgstr "IP 주소:"
 
-#: ../src/applet-dialogs.c:369
+#: ../src/applet-dialogs.c:370
 msgid "Broadcast Address:"
 msgstr "브로드캐스트 주소:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: ../src/applet-dialogs.c:382
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:383
 msgid "Subnet Mask:"
 msgstr "서브넷 마스크:"
 
-#: ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:493
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "이더넷(%s)"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:496
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 와이파이(%s)"
 
-#: ../src/applet-dialogs.c:502
+#: ../src/applet-dialogs.c:503
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: ../src/applet-dialogs.c:505
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
 #: ../src/connection-editor/ce-page-team-port.ui.h:23
 #: ../src/connection-editor/ce-page-team.ui.h:48
 #: ../src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "일반"
 
-#: ../src/applet-dialogs.c:516
+#: ../src/applet-dialogs.c:517
 msgid "Interface:"
 msgstr "인터페이스:"
 
-#: ../src/applet-dialogs.c:536
+#: ../src/applet-dialogs.c:537
 msgid "Hardware Address:"
 msgstr "하드웨어 주소:"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:551
 msgid "Driver:"
 msgstr "드라이버:"
 
-#: ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:586
 msgid "Speed:"
 msgstr "속도:"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:601
 msgid "Security:"
 msgstr "보안:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
 #: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
 msgid "Default Route:"
 msgstr "기본 경로:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
 #: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
 msgid "Ignored"
 msgstr "무시함"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:816
 msgid "VPN Type:"
 msgstr "가상 사설망 형식:"
 
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:823
 msgid "VPN Gateway:"
 msgstr "가상 사설망 게이트웨이:"
 
-#: ../src/applet-dialogs.c:828
+#: ../src/applet-dialogs.c:829
 msgid "VPN Username:"
 msgstr "가상 사설망 사용자 이름:"
 
-#: ../src/applet-dialogs.c:834
+#: ../src/applet-dialogs.c:835
 msgid "VPN Banner:"
 msgstr "가상 사설망 추방자:"
 
-#: ../src/applet-dialogs.c:840
+#: ../src/applet-dialogs.c:841
 msgid "Base Connection:"
 msgstr "기반 연결:"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "알 수 없음"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: ../src/applet-dialogs.c:958
 msgid "No valid active connections found!"
 msgstr "활성된 연결을 찾을 수 없습니다!"
 
-#: ../src/applet-dialogs.c:985
-#, fuzzy
+#: ../src/applet-dialogs.c:1007
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc.\n"
-"and many other community contributors and translators"
 
-#: ../src/applet-dialogs.c:988
+#: ../src/applet-dialogs.c:1010
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "네트워크 장치와 연결을 관리하는 알림 영역 애플릿."
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1012
 msgid "NetworkManager Website"
 msgstr "네트워크 관리 웹사이트"
 
-#: ../src/applet-dialogs.c:1001
+#: ../src/applet-dialogs.c:1016
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1026
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -974,33 +1000,33 @@
 "네트워크 관리 애플릿이 필요한 리소스를 찾을 수 없습니다. (.ui 파일이 없습니"
 "다.)"
 
-#: ../src/applet-dialogs.c:1006
+#: ../src/applet-dialogs.c:1031
 msgid "Missing resources"
 msgstr "빠진 자료"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1057
 msgid "Mobile broadband network password"
 msgstr "모바일 광대역 네트워크 암호"
 
-#: ../src/applet-dialogs.c:1040
+#: ../src/applet-dialogs.c:1066
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'%s'에 연결하려면 암호가 필요합니다."
 
-#: ../src/applet-dialogs.c:1055
+#: ../src/applet-dialogs.c:1081
 msgid "Password:"
 msgstr "암호:"
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1363
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN 잠금해제가 필요합니다"
 
-#: ../src/applet-dialogs.c:1338
+#: ../src/applet-dialogs.c:1364
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN 잠금해제가 필요합니다"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1366
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1008,25 +1034,25 @@
 msgstr "'%s' 모바일 광대역 장치를 사용하려면 SIM PIN 코드가 필요합니다."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1368
 msgid "PIN code:"
 msgstr "PIN 코드:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1372
 msgid "Show PIN code"
 msgstr "PIN 코드 표시"
 
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1374
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK 잠금 해제가 필요합니다"
 
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1375
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK 잠금 해제가 필요합니다"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: ../src/applet-dialogs.c:1377
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1034,30 +1060,37 @@
 msgstr "'%s' 모바일 광대역 장치를 사용하려면 SIM PUK 코드가 필요합니다."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1379
 msgid "PUK code:"
 msgstr "PUK 코드:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: ../src/applet-dialogs.c:1382
 msgid "New PIN code:"
 msgstr "새 PIN 코드:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: ../src/applet-dialogs.c:1384
 msgid "Re-enter new PIN code:"
 msgstr "새 PIN 코드 다시 입력:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: ../src/applet-dialogs.c:1389
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK 코드 표시"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: ../src/applet-vpn-request.c:201
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "연결 정보"
+
+#: ../src/applet-vpn-request.c:251
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "연결 활성화하는 데 실패"
+
+#: ../src/applet-vpn-request.c:259
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
@@ -1076,21 +1109,21 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
 msgstr ""
 
-#. Delete
 #: ../src/connection-editor/ce-ip4-routes.ui.h:5
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/nm-connection-list.c:711
+#: ../src/connection-editor/connection-helpers.c:772
+#: ../src/connection-editor/nm-connection-list.ui.h:4
 msgid "_Delete"
 msgstr "삭제(_D)"
 
@@ -1179,11 +1212,10 @@
 msgid "M_ode:"
 msgstr "모드(_O):"
 
-#. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: ../src/connection-editor/nm-connection-list.ui.h:5
 msgid "_Edit"
 msgstr "편집(_E)"
 
@@ -1238,7 +1270,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 #: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
@@ -1247,7 +1279,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-infiniband.ui.h:7
 #: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
@@ -1280,26 +1312,72 @@
 msgstr "최초 통신 시간(_H):"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "s"
 msgstr "초"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "네트워크 사용(_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:14
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "STP(Spanning Tree Protocol) 사용(_S)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:15
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:16
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:17
 msgid "_Max age:"
 msgstr "최대 기간(_M):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:18
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:19
 msgid "_Aging time:"
 msgstr "유지 시간(_A):"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:20
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:21
+msgid "Group _forward mask:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:22
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
 #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "자동"
@@ -1561,10 +1639,20 @@
 msgstr "사용자 이름(_U):"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
 msgid "_Service:"
 msgstr "서비스(_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:5
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 #: ../src/wireless-security/ws-leap.ui.h:3
@@ -1572,7 +1660,11 @@
 msgid "Sho_w password"
 msgstr "암호 표시(_W)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-dsl.ui.h:6
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:7
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
 #: ../src/libnma/nma-vpn-password-dialog.c:97
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
@@ -1583,13 +1675,29 @@
 msgid "_Password:"
 msgstr "암호(_P):"
 
+#: ../src/connection-editor/ce-page-dsl.ui.h:8
+msgid "PPP _interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:9
+msgid "P_arent interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:10
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:11
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "자동"
@@ -1635,7 +1743,7 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "무시"
 
@@ -1643,7 +1751,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "수동"
 
@@ -1652,7 +1760,7 @@
 msgstr "포트(_P):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
 #, fuzzy
 msgid "_Device:"
@@ -1804,20 +1912,20 @@
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "전송 모드(_T):"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
 msgid "Datagram"
 msgstr "데이터그램"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
 msgid "Connected"
 msgstr "연결"
 
+#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+msgid "_Transport mode:"
+msgstr "전송 모드(_T):"
+
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
 msgid "IPIP"
 msgstr ""
@@ -1855,40 +1963,39 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#, fuzzy
-msgid "Device name"
-msgstr "장치 이름 + 번호"
+#: ../src/connection-editor/ce-page-macsec.ui.h:6
+msgid "Device name:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#, fuzzy
-msgid "Parent device"
-msgstr "이더넷"
+#: ../src/connection-editor/ce-page-macsec.ui.h:8
+msgid "Parent device:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#, fuzzy
-msgid "Mode"
-msgstr "모드(_M):"
+#: ../src/connection-editor/ce-page-macsec.ui.h:16
+msgid "Mode:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP"
+msgid "Local IP:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP"
+msgid "Remote IP:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key"
+msgid "Input key:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key"
+msgid "Output key:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-#, fuzzy
-msgid "MTU"
-msgstr "MTU(_M):"
+msgid "MTU:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1903,12 +2010,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "다른 컴퓨터와 공유"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "방식(_M):"
 
@@ -1923,7 +2030,7 @@
 "할 수 있습니다. DHCP 클라이언트 ID를 사용하고 싶다면, 여기 입력하십시오."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1936,16 +2043,16 @@
 msgstr "D_HCP 클라이언트 ID:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "검색 도메인(_E):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "DNS 서버(_V):"
 
@@ -1970,11 +2077,12 @@
 "설정에 성공시 연결을 마무리합니다."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "라우팅(_R)…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-macsec.ui.h:3
 #: ../src/connection-editor/page-ip4.c:198
 msgid "Disabled"
 msgstr "사용안함"
@@ -1987,7 +2095,15 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "사용(임시 주소 선호)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Stable privacy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -1997,15 +2113,19 @@
 "메인 서버를 사용하려면 쉼표로 구분하십시오. 링크 로컬 주소는 자동으로 연결된 "
 "인터페이스로 취급합니다."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6 개인 보안 확장(_P):"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "이 연결이 되려면 IPv6 주소 부여 필요(_6)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2013,6 +2133,94 @@
 "IPv4 가능한 네트워크에 연결할 때, 이 연결이 IPv6 설정은 실패하고, IPv4 설정"
 "은 성공한 경우라도 연결을 마무리합니다."
 
+#: ../src/connection-editor/ce-page-macsec.ui.h:1
+msgid "PSK"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:2
+#: ../src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:4
+msgid "Check"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:5
+msgid "Strict"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:7
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:9
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:10
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:11
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:12
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:13
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:14
+msgid "CKN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:15
+msgid "CAK:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:17
+msgid "Keys:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:18
+msgid "Parameters:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:19
+msgid "Validation:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:20
+msgid "SCI port:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:21
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:22
+msgid "Encrypt"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:23
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:24
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:26
 msgid "Basic"
@@ -2100,41 +2308,41 @@
 msgstr "PPP 에코 패킷 보내기(_E)"
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "방식(_M):"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-team.ui.h:25
 #, fuzzy
 msgid "None"
 msgstr "없음"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: ../src/connection-editor/ce-page-proxy.ui.h:3
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: ../src/connection-editor/ce-page-proxy.ui.h:4
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: ../src/connection-editor/ce-page-proxy.ui.h:5
 msgid "PAC URL:"
 msgstr ""
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:6
+msgid "PAC script:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-proxy.ui.h:7
 msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "파일에서 팀 설정 가져오기(_I)..."
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#, fuzzy
+msgid "Method:"
+msgstr "방식(_M):"
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:19
 #, fuzzy
@@ -2182,76 +2390,76 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:10
+msgid "Active-Backup runner options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:11
 #, fuzzy
 msgid "_Port priority:"
 msgstr "우선 순위(_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
-msgstr ""
-
 #: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:82
-msgid ""
-"Validate received ARP packets on active ports. If this is not checked, all "
-"incoming ARP packets will be considered as a good reply."
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:44
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
 msgid "Port priority. The higher number means higher priority."
 msgstr ""
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port _sticky"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:15
-msgid "Active-Backup runner options"
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:16
+msgid "LACP runner options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
 #, fuzzy
 msgid "_LACP port priority:"
 msgstr "우선 순위(_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
 #, fuzzy
 msgid "LACP port _key:"
 msgstr "비밀키(_K):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
 #: ../src/connection-editor/ce-page-team.ui.h:43
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
 #: ../src/connection-editor/ce-page-team.ui.h:45
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
-msgid "LACP runner options"
-msgstr ""
-
 #: ../src/connection-editor/ce-page-team-port.ui.h:24
 #: ../src/connection-editor/ce-page-team.ui.h:70
 msgid "_Link watcher:"
@@ -2444,14 +2652,14 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/connection-helpers.c:105
 #: ../src/connection-editor/page-ethernet.c:351
 #: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "이더넷"
 
 #: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/connection-helpers.c:120
 #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
 #: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
@@ -2713,6 +2921,7 @@
 msgid "SS_ID:"
 msgstr "SSID(_I):"
 
+#: ../src/connection-editor/ce-polkit.c:63
 #: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
@@ -2770,58 +2979,63 @@
 "대부분의 경우 서비스 업체의 PPP 서버는 모든 인증 방법을 지원합니다. 만약 연결"
 "이 실패하면, 몇몇 방법을 사용하지 않아 보십시오."
 
-#: ../src/connection-editor/connection-helpers.c:105
+#: ../src/connection-editor/connection-helpers.c:106
 #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "와이파이"
 
-#: ../src/connection-editor/connection-helpers.c:113
+#: ../src/connection-editor/connection-helpers.c:114
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "블루투스"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
-
 #: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-dsl.c:201
+msgid "DSL/PPPoE"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
 #: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "인피니밴드"
 
-#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:117
 #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "본딩"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "팀"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-bridge.c:212
+#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/page-bridge.c:233
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "브릿지"
 
-#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/connection-helpers.c:121
 #: ../src/connection-editor/page-ip-tunnel.c:176
 msgid "IP tunnel"
 msgstr ""
 
 #: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
+#: ../src/connection-editor/page-macsec.c:190
+msgid "MACsec"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:124
+#: ../src/connection-editor/connection-helpers.c:398
 #: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "가상 사설망"
 
-#: ../src/connection-editor/connection-helpers.c:205
+#: ../src/connection-editor/connection-helpers.c:207
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2832,11 +3046,11 @@
 "\n"
 "오류: 가상 사설망 서비스 유형이 없음"
 
-#: ../src/connection-editor/connection-helpers.c:217
+#: ../src/connection-editor/connection-helpers.c:219
 msgid "Cannot import VPN connection"
 msgstr "가상 사설망 연결을 가져올 수 없음"
 
-#: ../src/connection-editor/connection-helpers.c:219
+#: ../src/connection-editor/connection-helpers.c:221
 #, fuzzy, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2849,47 +3063,54 @@
 "\n"
 "오류: %s."
 
-#: ../src/connection-editor/connection-helpers.c:220
+#: ../src/connection-editor/connection-helpers.c:222
 #, fuzzy
 msgid "unknown error"
 msgstr "알 수 없는 오류"
 
-#: ../src/connection-editor/connection-helpers.c:303
+#: ../src/connection-editor/connection-helpers.c:305
 #: ../src/connection-editor/page-proxy.c:118
 #: ../src/connection-editor/page-team.c:341
 #: ../src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "가져올 파일"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: ../src/connection-editor/connection-helpers.c:309
+#: ../src/connection-editor/page-proxy.c:122
+#: ../src/connection-editor/page-team.c:345
+#: ../src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:340
 msgid "Hardware"
 msgstr "하드웨어"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: ../src/connection-editor/connection-helpers.c:367
 msgid "Virtual"
 msgstr "가상"
 
-#: ../src/connection-editor/connection-helpers.c:514
 #: ../src/connection-editor/connection-helpers.c:516
+#: ../src/connection-editor/connection-helpers.c:518
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "저장한 가상 사설망 설정 가져오기..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: ../src/connection-editor/connection-helpers.c:548
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "연결 에디터 창을 알려지지 않은 오류 때문에 열 수 없습니다."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: ../src/connection-editor/connection-helpers.c:557
 msgid "Could not create new connection"
 msgstr "새로운 연결을 만들 수 없음"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: ../src/connection-editor/connection-helpers.c:720
 msgid "Connection delete failed"
 msgstr "연결 제거가 실패했습니다"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: ../src/connection-editor/connection-helpers.c:768
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "%s 연결을 정말로 제거하시겠습니까?"
@@ -2897,7 +3118,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "주소"
 
@@ -2909,7 +3130,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "게이트웨이"
 
@@ -2919,228 +3140,241 @@
 msgstr "매트릭"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "접두어"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: ../src/connection-editor/nm-connection-editor.c:109
 #, c-format
 msgid "Editing %s"
 msgstr "%s 편집"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: ../src/connection-editor/nm-connection-editor.c:113
 msgid "Editing un-named connection"
 msgstr "이름 없는 연결을 편집"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: ../src/connection-editor/nm-connection-editor.c:133
 #, fuzzy
 msgid "Missing connection name"
 msgstr "연결 이름(_N):"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: ../src/connection-editor/nm-connection-editor.c:353
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "에디터 초기화 중 오류"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: ../src/connection-editor/nm-connection-editor.c:360
+#: ../src/connection-editor/nm-connection-list.c:443
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "연결을 추가하는 데 실패했습니다"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: ../src/connection-editor/nm-connection-editor.c:375
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: ../src/connection-editor/nm-connection-editor.c:451
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 "연결 편집 창에서 필요한 리소스를 찾을 수 없습니다. (.ui 파일이 없습니다.)"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "저장(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/nm-connection-editor.c:579
 msgid "Save any changes made to this connection."
 msgstr "이 연결에 대해 바뀐 사항을 저장합니다."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: ../src/connection-editor/nm-connection-editor.c:580
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "이 컴퓨터의 모든 사용자에게 이 연결을 적용하도록 인증합니다."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not create connection"
 msgstr "연결을 만들 수 없음"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not edit connection"
 msgstr "연결을 변경할 수 없음"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: ../src/connection-editor/nm-connection-editor.c:598
 msgid "Unknown error creating connection editor dialog."
 msgstr "연결 편집 대화 창 만들기에 알 수 없는 오류."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: ../src/connection-editor/nm-connection-editor.c:739
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:758
+#: ../src/connection-editor/nm-connection-editor.c:759
 msgid "Error initializing editor"
 msgstr "에디터 초기화 중 오류"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: ../src/connection-editor/nm-connection-editor.c:1157
 msgid "Connection add failed"
 msgstr "연결을 추가하는 데 실패했습니다"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "참이면 CA 인증서가 EAP 인증이 되었는지 경고를 하지 않습니다."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "연결 이름(_N):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 #, fuzzy
 msgid "_Export…"
 msgstr "내보내기(_E)..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: ../src/connection-editor/nm-connection-list.c:151
 msgid "never"
 msgstr "하지 않음"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:173
 msgid "now"
 msgstr "지금"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: ../src/connection-editor/nm-connection-list.c:180
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d분 전"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: ../src/connection-editor/nm-connection-list.c:184
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d시간 전"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:196
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d일 전"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: ../src/connection-editor/nm-connection-list.c:202
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d달 전"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: ../src/connection-editor/nm-connection-list.c:206
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d년 전"
 
-#: ../src/connection-editor/nm-connection-list.c:635
+#: ../src/connection-editor/nm-connection-list.c:445
+msgid "Connection cannot be deleted"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:448
+msgid "Select a connection to edit"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:450
+msgid "Select a connection to delete"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:785
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
 msgid "Name"
 msgstr "이름"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: ../src/connection-editor/nm-connection-list.c:798
 msgid "Last Used"
 msgstr "마지막 사용"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: ../src/connection-editor/nm-connection-list.c:836
 msgid "Edit the selected connection"
 msgstr "선택한 연결을 고칩니다"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: ../src/connection-editor/nm-connection-list.c:837
 msgid "Authenticate to edit the selected connection"
 msgstr "선택된 연결을 변경하도록 인증합니다"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: ../src/connection-editor/nm-connection-list.c:842
 msgid "Delete the selected connection"
 msgstr "선택한 연결 삭제"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: ../src/connection-editor/nm-connection-list.c:843
 msgid "Authenticate to delete the selected connection"
 msgstr "선택한 연결을 삭제하도록 인증"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:1048
+#: ../src/connection-editor/nm-connection-list.c:1051
 msgid "Error creating connection"
 msgstr "연결을 만드는데 오류"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:1049
 msgid "No VPN plugins are installed."
 msgstr "VPN 플러그인을 하나도 설치하지 않았습니다."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:1052
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "'%s' 연결을 만드는 방법을 알지 못합니다"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: ../src/connection-editor/nm-connection-list.c:1085
 msgid "Error editing connection"
 msgstr "연결을 편집하는데 오류"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: ../src/connection-editor/nm-connection-list.c:1086
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "UUID가 '%s'인 연결을 찾을 수 없습니다"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: ../src/connection-editor/nm-connection-list.ui.h:2
+msgid "Add a new connection"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:116
 msgid "802.1X Security"
 msgstr "802.1X 보안"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: ../src/connection-editor/page-8021x-security.c:118
 msgid "Could not load 802.1X Security user interface."
 msgstr "802.1X 보안 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: ../src/connection-editor/page-8021x-security.c:132
 msgid "Use 802.1_X security for this connection"
 msgstr "이 연결에 802.1X 보안을 사용(_X)"
 
@@ -3196,11 +3430,11 @@
 msgid "Bond connection %d"
 msgstr "본딩 네트워크 연결 %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:236
 msgid "Could not load bridge user interface."
 msgstr "브릿지 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: ../src/connection-editor/page-bridge.c:352
 #, c-format
 msgid "Bridge connection %d"
 msgstr "브릿지 네트워크 연결 %d"
@@ -3224,11 +3458,15 @@
 msgid "Could not load DCB user interface."
 msgstr "DCB 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: ../src/connection-editor/page-dsl.c:203
 msgid "Could not load DSL user interface."
 msgstr "DSL 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: ../src/connection-editor/page-dsl.c:298
+msgid "missing parent interface"
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:343
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 연결 %d"
@@ -3329,27 +3567,27 @@
 msgstr "이더넷 연결 %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "자동(가상 사설망)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "자동(가상 사설망), 주소만"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "주소만 자동"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "자동(PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "주소만 자동(PPPoE)"
 
@@ -3362,17 +3600,17 @@
 msgstr "주소만 자동(DHCP)"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "연결-로컬 연결만"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "추가 DNS 서버(_V):"
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "추가 검색 도메인(_E):"
 
@@ -3409,43 +3647,52 @@
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "자동, DHCP만 사용"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s의 IPv6 경로 편집"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "IPv6 설정"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
+#: ../src/connection-editor/page-macsec.c:192
+msgid "Could not load MACsec user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-macsec.c:331
+#, c-format
+msgid "MACSEC connection %d"
+msgstr ""
+
 #: ../src/connection-editor/page-master.c:247
 #: ../src/connection-editor/page-master.c:258
 msgid "Duplicate slaves"
@@ -3503,38 +3750,34 @@
 msgstr "통신사가 C_DMA 기반의 기술을 사용합니다(예: 1xRTT, EVDO)"
 
 #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: ../src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
 #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: ../src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
 #: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: ../src/wireless-security/eap-method-ttls.c:287
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: ../src/wireless-security/eap-method-fast.c:282
+#: ../src/wireless-security/eap-method-peap.c:299
+#: ../src/wireless-security/eap-method-ttls.c:317
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: ../src/wireless-security/eap-method-ttls.c:302
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3571,11 +3814,11 @@
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "오류: 파일에 올바른 JSON 설정이 들어 있지 않습니다"
 
-#: ../src/connection-editor/page-team.c:1156
+#: ../src/connection-editor/page-team.c:1034
 msgid "Could not load team user interface."
 msgstr "팀 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-team.c:1253
+#: ../src/connection-editor/page-team.c:1131
 #, c-format
 msgid "Team connection %d"
 msgstr "팀 연결 %d"
@@ -3583,11 +3826,11 @@
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: ../src/connection-editor/page-team-port.c:655
 msgid "Team Port"
 msgstr "팀 포트"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: ../src/connection-editor/page-team-port.c:657
 msgid "Could not load team port user interface."
 msgstr "팀 포트 사용자 인터페이스를 읽어들일 수 없습니다."
 
@@ -3698,50 +3941,50 @@
 msgid "Wi-Fi connection %d"
 msgstr "와이파이 연결 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
+#: ../src/connection-editor/page-wifi-security.c:358
 #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128비트 키(Hex 또는 ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
+#: ../src/connection-editor/page-wifi-security.c:368
 #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128비트 열쇠글"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: ../src/connection-editor/page-wifi-security.c:394
 msgid "Dynamic WEP (802.1X)"
 msgstr "동적 WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
+#: ../src/connection-editor/page-wifi-security.c:407
 #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "개인용 WPA 또는 WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:418
+#: ../src/connection-editor/page-wifi-security.c:420
 #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "기업용 WPA 또는 WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: ../src/connection-editor/page-wifi-security.c:463
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "와이파이 보안 사용자 인터페이스를 읽어들일 수 없습니다. 와이파이 설정이 없습"
 "니다."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: ../src/connection-editor/page-wifi-security.c:474
 msgid "Wi-Fi Security"
 msgstr "와이파이 보안"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: ../src/connection-editor/page-wifi-security.c:476
 msgid "Could not load Wi-Fi security user interface."
 msgstr "와이파이 보안 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-wifi-security.c:558
+#: ../src/connection-editor/page-wifi-security.c:560
 #, c-format
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
+#: ../src/connection-editor/page-wifi-security.c:566
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
@@ -3792,35 +4035,39 @@
 msgid "Connection Information"
 msgstr "연결 정보"
 
+#: ../src/info.ui.h:2
+msgid "_Close"
+msgstr ""
+
 #: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "사용 중인 네트워크 연결"
 
 #: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA 인증서 불필요(_R)"
 
 #: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
 msgid "No key set"
 msgstr ""
 
 #: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "개인 인증서 선택..."
 
 #: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
 #, fuzzy, c-format
 msgid "%s private _key:"
 msgstr "비밀키(_K):"
 
 #: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
 #, fuzzy, c-format
 msgid "%s key _password:"
 msgstr "비밀키 암호(_P):"
@@ -3831,7 +4078,7 @@
 msgstr "개인 인증서 선택..."
 
 #: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
 msgid "%s _certificate:"
 msgstr "사용자 인증서(_U):"
@@ -4037,47 +4284,47 @@
 msgid "New Mobile Broadband Connection"
 msgstr "새 모바일 광대역 연결"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: ../src/libnma/nma-cert-chooser-button.c:165
 #, fuzzy
 msgid "(None)"
 msgstr "(없음)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: ../src/libnma/nma-cert-chooser-button.c:173
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: ../src/libnma/nma-cert-chooser-button.c:174
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "CA 인증서(_A):"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
+#: ../src/libnma/nma-cert-chooser-button.c:193
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "알 수 없음"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: ../src/libnma/nma-cert-chooser-button.c:215
+#: ../src/libnma/nma-cert-chooser-button.c:245
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: ../src/libnma/nma-cert-chooser-button.c:216
+#: ../src/libnma/nma-cert-chooser-button.c:246
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: ../src/libnma/nma-cert-chooser-button.c:472
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "개인 인증서 선택..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
 msgid "%s certificate _password:"
 msgstr "사용자 인증서(_U):"
@@ -4144,8 +4391,8 @@
 msgid "_Tertiary Password:"
 msgstr "보조 암호(_S):"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: ../src/libnma/nma-vpn-password-dialog.c:238
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "암호 보이기(_O)"
 
@@ -4174,46 +4421,46 @@
 msgid "Dynamic WEP (802.1x)"
 msgstr "동적 WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "만들기(_R)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "와이파이 네트워크 '%s'에 연결하려면 암호 또는 암호화 키가 있어야 합니다."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "와이파이 네트워크 인증이 필요합니다"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "와이파이 네트워크에 인증이 필요합니다"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "새 와이파이 네트워크 만들기"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "새 와이파이 네트워크"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "연결하려는 와이파이 네트워크의 이름을 입력하십시오."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "감춰진 와이파이 네트워크에 연결"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "숨겨진 와이파이 네트워크"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4365,25 +4612,25 @@
 msgid "Roaming network"
 msgstr "로밍 네트워크"
 
-#: ../src/mobile-helpers.c:331
+#: ../src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "'%2$s'의 SIM 카드 '%1$s'에 대한 PIM 코드"
 
-#: ../src/mobile-helpers.c:464
+#: ../src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN 코드가 필요합니다"
 
-#: ../src/mobile-helpers.c:472
+#: ../src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN 코드가 모바일 광대역 장치를 위해 필요합니다"
 
-#: ../src/mobile-helpers.c:622
+#: ../src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "모바일 광대역 연결 '%s' 사용 중: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: ../src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "로밍"
 
@@ -4393,12 +4640,12 @@
 msgid "%s connection"
 msgstr "%s 연결"
 
-#: ../src/utils/utils.c:563
+#: ../src/utils/utils.c:565
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DEP 혹은 PEM 인증서(*.det, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: ../src/utils/utils.c:577
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, 또는 PKCS#12 비밀 키(*.der, *.pem, *.p12, *.key)"
 
@@ -4406,39 +4653,35 @@
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: ../src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA 인증서 불필요(_R)"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: ../src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: ../src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: ../src/wireless-security/eap-method-fast.c:267
+#: ../src/wireless-security/eap-method-peap.c:329
+#: ../src/wireless-security/eap-method-ttls.c:379
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:405
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC 파일 선택..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:412
 msgid "PAC files (*.pac)"
 msgstr "PAC 파일(*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: ../src/wireless-security/eap-method-fast.c:416
 msgid "All files"
 msgstr "모든 파일"
 
@@ -4456,7 +4699,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:4
 #: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "Anony_mous identity:"
 msgstr "익명 사용(_M):"
 
@@ -4466,7 +4709,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:6
 #: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
 msgid "_Inner authentication:"
 msgstr "내부 인증(_I):"
 
@@ -4482,27 +4725,12 @@
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: ../src/wireless-security/eap-method-peap.c:314
+#: ../src/wireless-security/eap-method-ttls.c:364
 #: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "인증 기관 인증서 선택..."
-
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "버전 0"
@@ -4512,20 +4740,27 @@
 msgstr "버전 1"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "CA 인증서(_A):"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
 #: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
 msgid "No CA certificate is _required"
 msgstr "CA 인증서 불필요(_R)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:6
 msgid "PEAP _version:"
 msgstr "PEAP 버전(_V):"
 
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Domain:"
+msgstr ""
+
 #: ../src/wireless-security/eap-method-simple.c:75
 msgid "missing EAP username"
 msgstr ""
@@ -4538,46 +4773,28 @@
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: ../src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA 인증서 불필요(_R)"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: ../src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: ../src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA 인증서 불필요(_R)"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "인증 정보(_D):"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: ../src/wireless-security/eap-method-ttls.c:333
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4652,17 +4869,17 @@
 msgstr ""
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (기본값)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Open System"
 msgstr "열린 시스템"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Shared Key"
 msgstr "공유 키"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "1 (Default)"
+msgstr "1 (기본값)"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key:"
 msgstr "키(_K):"
@@ -4689,378 +4906,3 @@
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "형식(_T):"
-
-#, fuzzy
-#~ msgid "NetworkManager for GNOME"
-#~ msgstr "네트워크 관리 애플릿"
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection '%s' disconnected because the VPN service stopped."
-#~ msgstr ""
-#~ "\n"
-#~ "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 중단되었습니다."
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection '%s' disconnected."
-#~ msgstr ""
-#~ "\n"
-#~ "'%s' 가상 사설망 연결이 끊어졌습니다."
-
-#~ msgid "_Disconnect VPN"
-#~ msgstr "가상 사설망 연결 끊기(_D)..."
-
-#~ msgid "New Mobile Broadband connection..."
-#~ msgstr "새 모바일 광대역 연결..."
-
-#~ msgid "_Connect to Hidden Wi-Fi Network..."
-#~ msgstr "숨겨진 와이파이 네트워크에 연결(_C)..."
-
-#~ msgid "Create _New Wi-Fi Network..."
-#~ msgstr "새 와이파이 네트워크 만들기(_N)..."
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "15"
-#~ msgstr "15"
-
-#~ msgid "Aut_onegotiate"
-#~ msgstr "자동 협상(_O)"
-
-#~ msgid "FirewallD is not running."
-#~ msgstr "FirewallD가 실행 중이 아닙니다."
-
-#~ msgid "New..."
-#~ msgstr "새로 만들기..."
-
-#, fuzzy
-#~ msgid "invalid EAP-TLS CA certificate: %s"
-#~ msgstr "CA 인증서(_A):"
-
-#~ msgid "Unencrypted private keys are insecure"
-#~ msgstr "암호화되지 않은 비밀 키는 안전하지 않습니다"
-
-#~ msgid ""
-#~ "The selected private key does not appear to be protected by a password.  "
-#~ "This could allow your security credentials to be compromised.  Please "
-#~ "select a password-protected private key.\n"
-#~ "\n"
-#~ "(You can password-protect your private key with openssl)"
-#~ msgstr ""
-#~ "선택한 비밀 키는 암호로 보호하지 않는 것으로 보입니다. 보안 정보가 침해당"
-#~ "할 수 있습니다. 암호로 보호하는 비밀 키를 선택하십시오.\n"
-#~ "\n"
-#~ "(openssl로 비밀 키를 보호할 수 있습니다)"
-
-#~ msgid "Choose your private key..."
-#~ msgstr "비밀키 선택..."
-
-#~ msgid "Enable WiMA_X Mobile Broadband"
-#~ msgstr "와이맥스 모바일 광대역 사용(_X)"
-
-#~ msgid "_Help"
-#~ msgstr "도움말(_H)"
-
-#~ msgid "You are now connected to the bonded network."
-#~ msgstr "본딩 네트워크에 연결되었습니다."
-
-#~ msgid "Preparing bond connection '%s'..."
-#~ msgstr "본딩 네트워크 연결 '%s' 준비 중..."
-
-#~ msgid "Configuring bond connection '%s'..."
-#~ msgstr "본딩 연결 '%s' 설정 중..."
-
-#~ msgid "User authentication required for bond connection '%s'..."
-#~ msgstr "본딩 연결 '%s'에는 사용자 인증이 필요합니다..."
-
-#~ msgid "Requesting address for '%s'..."
-#~ msgstr "'%s'에 주소 요청 중..."
-
-#~ msgid "Bond connection '%s' active"
-#~ msgstr "본딩 연결 '%s' 사용 중"
-
-#~ msgid "You are now connected to the bridged network."
-#~ msgstr "브릿지 네트워크에 연결되었습니다."
-
-#~ msgid "Preparing bridge connection '%s'..."
-#~ msgstr "브릿지 연결 '%s' 준비 중..."
-
-#~ msgid "Configuring bridge connection '%s'..."
-#~ msgstr "브릿지 연결 '%s' 설정 중..."
-
-#~ msgid "User authentication required for bridge connection '%s'..."
-#~ msgstr "브릿지 연결 '%s'에는 사용자 인증이 필요합니다..."
-
-#~ msgid "Bridge connection '%s' active"
-#~ msgstr "브릿지 연결 '%s' 사용 중"
-
-#~ msgid "New Mobile Broadband (CDMA) connection..."
-#~ msgstr "새 모바일 광대역(CDMA) 연결..."
-
-#~ msgid "You are now connected to the CDMA network."
-#~ msgstr "CDMA 네트워크에 연결되었습니다."
-
-#~ msgid "CDMA network."
-#~ msgstr "CDMA 네트워크."
-
-#~ msgid "New Mobile Broadband (GSM) connection..."
-#~ msgstr "새 모바일 광대역(GSM) 연결..."
-
-#~ msgid "You are now connected to the GSM network."
-#~ msgstr "GSM 네트워크에 연결되었습니다."
-
-#~ msgid "GSM network."
-#~ msgstr "GSM 네트워크."
-
-#~ msgid "Auto InfiniBand"
-#~ msgstr "자동 인피니밴드"
-
-#~ msgid "InfiniBand Networks (%s)"
-#~ msgstr "인피니밴드 네트워크(%s)"
-
-#~ msgid "InfiniBand Network (%s)"
-#~ msgstr "인피니밴드 네트워크(%s)"
-
-#~ msgid "InfiniBand Networks"
-#~ msgstr "인피니밴드 네트워크"
-
-#~ msgid "InfiniBand Network"
-#~ msgstr "인피니밴드 네트워크"
-
-#~ msgid "You are now connected to the InfiniBand network."
-#~ msgstr "인피니밴드 네트워크에 연결되었습니다."
-
-#~ msgid "Preparing InfiniBand connection '%s'..."
-#~ msgstr "인피니밴드 연결 '%s' 준비 중..."
-
-#~ msgid "Configuring InfiniBand connection '%s'..."
-#~ msgstr "인피니밴드 연결 '%s' 설정 중..."
-
-#~ msgid "User authentication required for InfiniBand connection '%s'..."
-#~ msgstr "인피니밴드 연결 '%s'에는 사용자 인증이 필요합니다..."
-
-#~ msgid "InfiniBand connection '%s' active"
-#~ msgstr "인피니밴드 연결 '%s' 사용 중"
-
-#~ msgid "You are now connected to the teamed network."
-#~ msgstr "팀 네트워크에 연결되었습니다."
-
-#~ msgid "Preparing team connection '%s'..."
-#~ msgstr "팀 연결 '%s' 준비 중..."
-
-#~ msgid "Configuring team connection '%s'..."
-#~ msgstr "팀 연결 '%s' 설정 중..."
-
-#~ msgid "User authentication required for team connection '%s'..."
-#~ msgstr "팀 연결 '%s'에는 사용자 인증이 필요합니다..."
-
-#~ msgid "Team connection '%s' active"
-#~ msgstr "팀 연결 '%s' 사용 중"
-
-#~ msgid "You are now connected to the VLAN."
-#~ msgstr "VLAN에 연결되었습니다."
-
-#~ msgid "Preparing VLAN connection '%s'..."
-#~ msgstr "VLAN 연결 '%s' 준비 중..."
-
-#~ msgid "Configuring VLAN connection '%s'..."
-#~ msgstr "VLAN '%s' 설정 중..."
-
-#~ msgid "User authentication required for VLAN connection '%s'..."
-#~ msgstr "VLAN 연결 '%s'에는 사용자 인증이 필요합니다..."
-
-#~ msgid "VLAN connection '%s' active"
-#~ msgstr "VLAN 연결 '%s' 사용 중"
-
-#~ msgid "WiMAX Mobile Broadband (%s)"
-#~ msgstr "와이맥스 모바일 광대역(%s)"
-
-#~ msgid "WiMAX Mobile Broadband"
-#~ msgstr "와이맥스 모바일 광대역"
-
-#~ msgid "WiMAX is disabled"
-#~ msgstr "와이맥스를 사용하지 않습니다"
-
-#~ msgid "WiMAX is disabled by hardware switch"
-#~ msgstr "와이맥스가 하드웨어 스위치를 통해 사용하지 않습니다"
-
-#~ msgid "You are now connected to the WiMAX network."
-#~ msgstr "와이맥스 네트워크에 연결되었습니다."
-
-#~ msgid "%d dB"
-#~ msgstr "%d dB"
-
-#~ msgctxt "WiMAX CINR"
-#~ msgid "unknown"
-#~ msgstr "알 수 없음"
-
-#~ msgctxt "WiMAX Base Station ID"
-#~ msgid "unknown"
-#~ msgstr "알 수 없음"
-
-#~ msgid "WiMAX (%s)"
-#~ msgstr "WiMAX (%s)"
-
-#~ msgid "CINR:"
-#~ msgstr "CINR:"
-
-#~ msgid "BSID:"
-#~ msgstr "BSID:"
-
-#~ msgid "_Device MAC address:"
-#~ msgstr "장치 MAC 주소(_D):"
-
-#~ msgid "Any"
-#~ msgstr "모두"
-
-#~ msgid "3G (UMTS/HSPA)"
-#~ msgstr "3G(UMTS/HSPA)"
-
-#~ msgid "2G (GPRS/EDGE)"
-#~ msgstr "2G(GPRS/EDGE)"
-
-#~ msgid "Prefer 3G (UMTS/HSPA)"
-#~ msgstr "3G 선호(UMTS/HSPA)"
-
-#~ msgid "Prefer 2G (GPRS/EDGE)"
-#~ msgstr "2G 선호(GPRS/EDGE)"
-
-#~ msgid "Prefer 4G (LTE)"
-#~ msgstr "4G 선호(LTE)"
-
-#~ msgid "Use only 4G (LTE)"
-#~ msgstr "4G만 사용(LTE)"
-
-#~ msgid "I_mport team configuration from a file..."
-#~ msgstr "파일에서 팀 설정 가져오기(_M)..."
-
-#~ msgid "Infrastructure"
-#~ msgstr "인프라스트럭처"
-
-#~ msgid "WiMAX"
-#~ msgstr "와이맥스"
-
-#~ msgid "Error saving connection"
-#~ msgstr "연결을 저장하는데 오류"
-
-#~ msgid "The property '%s' / '%s' is invalid: %d"
-#~ msgstr "속성 '%s' / '%s' 잘못됨: %d"
-
-#~ msgid "Automatic (PPP)"
-#~ msgstr "자동(PPP)"
-
-#~ msgid "Automatic (PPP) addresses only"
-#~ msgstr "주소만 자동(PPP)"
-
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "와이맥스 사용자 인터페이스를 읽어들일 수 없습니다."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "와이맥스 연결 %d"
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
-#~ "%s)."
-#~ msgstr "블루투스 설정이 불가능합니다. (D-Bus에 연결 실패: (%s) %s)"
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
-#~ "%s)."
-#~ msgstr ""
-#~ "블루투스 설정이 불가능합니다. (네트워크 관리를 찾을 수 없습니다: (%s) %s)"
-
-#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
-#~ msgstr "휴대 전화를 네트워크 장치로 사용(PAN/NAP)"
-
-#~ msgid "Access the Internet using your mobile phone (DUN)"
-#~ msgstr "휴대 전화를 사용해 인터넷에 연결(DUN)"
-
-#~ msgid "Error: %s"
-#~ msgstr "오류: %s"
-
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "DUN 연결을 만들 수 없습니다: %s"
-
-#~ msgid "Your phone is now ready to use!"
-#~ msgstr "휴대전화를 사용할 수 있습니다!"
-
-#~ msgid "Mobile wizard was canceled"
-#~ msgstr "모바일 마법사가 취소되었습니다"
-
-#~ msgid "Unknown phone device type (not GSM or CDMA)"
-#~ msgstr "알려지지 않은 휴대전화 유형(GSM이나 CDMA가 아님)"
-
-#~ msgid "unknown modem type."
-#~ msgstr "알 수 없는 모뎀 종류."
-
-#~ msgid "failed to connect to the phone."
-#~ msgstr "휴대전화에 연결하는 데 실패했습니다."
-
-#~ msgid "error getting bus connection"
-#~ msgstr "버스 연결을 가져오는데 오류"
-
-#~ msgid "unexpectedly disconnected from the phone."
-#~ msgstr "휴대전화 연결이 예기치 못하게 끊어졌습니다."
-
-#~ msgid "timed out detecting phone details."
-#~ msgstr "휴대전화 상세 정보를 감지하는 시간이 초과되었습니다."
-
-#~ msgid "Detecting phone configuration..."
-#~ msgstr "휴대전화 설정을 감지하는 중..."
-
-#~ msgid ""
-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-#~ "Networking connection."
-#~ msgstr ""
-#~ "기본 블루투스 어댑터에 전화접속 네트워크 연결을 설정하려면 사용 가능하도"
-#~ "록 설정해야 합니다."
-
-#~ msgid "Failed to create PAN connection: %s"
-#~ msgstr "PAN 연결을 만들 수 없습니다: %s"
-
-#~ msgid "%s Network"
-#~ msgstr "%s 네트워크"
-
-#~ msgid "Primary DNS:"
-#~ msgstr "기본 DNS:"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "보조 DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "세 번째 DNS:"
-
-#~ msgid "_Save..."
-#~ msgstr "저장(_S)..."
-
-#~ msgid "_Edit..."
-#~ msgstr "편집(_E)..."
-
-#~ msgid "_Delete..."
-#~ msgstr "삭제(_D)..."
diff -Nru network-manager-applet-1.8.4/po/meson.build network-manager-applet-1.8.10/po/meson.build
--- network-manager-applet-1.8.4/po/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/po/meson.build	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1 @@
+i18n.gettext(nma_name, preset: 'glib')
diff -Nru network-manager-applet-1.8.4/po/nl.po network-manager-applet-1.8.10/po/nl.po
--- network-manager-applet-1.8.4/po/nl.po	2017-05-10 10:44:54.000000000 +0000
+++ network-manager-applet-1.8.10/po/nl.po	2017-12-19 11:44:30.000000000 +0000
@@ -7,13 +7,14 @@
 # Tino Meinen , 2004–2011.
 # Rachid BM , 2012.
 # Reinout van Schouwen , 2013.
-# Hannie Dumoleyn , 2016.
+# Hannie Dumoleyn , 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
-"PO-Revision-Date: 2016-03-31 18:11+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Network"
+"Manager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2017-09-13 08:07+0000\n"
+"PO-Revision-Date: 2017-10-20 11:53+0100\n"
 "Last-Translator: Hannie Dumoleyn \n"
 "Language-Team: Dutch \n"
 "Language: nl\n"
@@ -21,11 +22,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 "X-Launchpad-Export-Date: 2012-05-18 08:04+0000\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
 msgstr "Netwerk"
 
@@ -35,7 +36,7 @@
 msgstr "Uw netwerkverbindingen beheren"
 
 #: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: ../src/connection-editor/nm-connection-list.ui.h:1
 msgid "Network Connections"
 msgstr "Netwerkverbindingen"
 
@@ -50,8 +51,8 @@
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
-"Stel dit in op ‘true’ in om geen meldingen te krijgen bij het verbinden met "
-"een netwerk."
+"Stel dit in op ‘true’ om geen meldingen te krijgen bij het verbinden met een"
+" netwerk."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
@@ -61,8 +62,8 @@
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
-"Stel dit in op ‘true’ om geen meldingen te krijgen bij het verbreken van een "
-"verbinding met een netwerk."
+"Stel dit in op ‘true’ om geen meldingen te krijgen bij het verbreken van een"
+" verbinding met een netwerk."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
 msgid "Disable VPN notifications"
@@ -140,84 +141,101 @@
 
 #: ../nm-connection-editor.appdata.xml.in.h:1
 msgid "NetworkManager"
-msgstr "NetworkManager"
+msgstr "Netwerkbeheer"
 
 # geen netwerk/netwerkverbinding
 #: ../nm-connection-editor.appdata.xml.in.h:2
-#, fuzzy
 msgid "NetworkManager connection editor"
-msgstr "Geen netwerkverbinding"
+msgstr "Netwerkbeheer verbindingseditor"
 
 #: ../nm-connection-editor.appdata.xml.in.h:3
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
-"NetworkManager is een systeemdienst voor het beheren en configureren van uw "
-"netwerkverbindingen en apparaten."
+"Netwerkbeheer is een systeemdienst voor het beheren en configureren van uw"
+" netwerkverbindingen en apparaten."
 
 #: ../nm-connection-editor.appdata.xml.in.h:4
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
-"Het programma nm-connection-editor werkt met NetworkManager om bestaande "
-"verbindingsprofielen voor NetworkManager aan te maken en te bewerken."
+"Het programma nm-connection-editor werkt met Netwerkbeheer om bestaande"
+" verbindingsprofielen voor Netwerkbeheer aan te maken en te bewerken."
 
 #: ../nm-connection-editor.appdata.xml.in.h:5
-#, fuzzy
 msgid "The NetworkManager Developers"
-msgstr "NetworkManager applet"
+msgstr "De Netwerkbeheer-ontwikkelaars"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-utils/nm-shared-utils.c:477
 #, c-format
 msgid "object class '%s' has no property named '%s'"
-msgstr ""
+msgstr "objectklasse ‘%s’ heeft geen eigenschap met de naam ‘%s’"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-utils/nm-shared-utils.c:484
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
-msgstr ""
+msgstr "eigenschap ‘%s’ van objectklasse ‘%s’ is niet beschrijfbaar"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-utils/nm-shared-utils.c:491
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
+"bouweigenschap ‘%s’ voor object ‘%s’ kan niet worden ingesteld na de bouw"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-utils/nm-shared-utils.c:499
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
+"‘%s::%s’ is geen geldige eigenschapnaam; ‘%s’ is niet van het subtype GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-utils/nm-shared-utils.c:508
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
+"instellen van eigenschap ‘%s’ type ‘%s’ van waarde van type ‘%s’ is niet"
+" mogelijk"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-utils/nm-shared-utils.c:519
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
+"waarde ‘%s’ van type ‘%s’ is ongeldig of buiten bereik voor eigenschap ‘%s’"
+" type ‘%s’"
 
-#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-authenticatie"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1
+#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
+#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
 #: ../src/connection-editor/ce-new-connection.ui.h:1
 #: ../src/connection-editor/ce-page-dcb.ui.h:17
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/connection-editor/connection-helpers.c:308
+#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/page-bluetooth.c:311
+#: ../src/connection-editor/page-mobile.c:543
+#: ../src/connection-editor/page-proxy.c:121
+#: ../src/connection-editor/page-team.c:344
+#: ../src/connection-editor/page-team-port.c:206
+#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
+#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/libnma/nma-vpn-password-dialog.c:209
+#: ../src/libnma/nma-wifi-dialog.c:1066
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: ../src/8021x.ui.h:3
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Verbinden"
 
@@ -233,133 +251,132 @@
 msgid "secure."
 msgstr "veilig."
 
-#: ../src/applet.c:381
+#: ../src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Toevoegen/activeren van de verbinding is mislukt"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Verbindingsfout"
 
-#: ../src/applet.c:435
+#: ../src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Verbreken van verbinding met apparaat is mislukt"
 
-#: ../src/applet.c:440
+#: ../src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Verbinding verbreken mislukt"
 
-#: ../src/applet.c:470
+#: ../src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Verbinding activeren mislukt"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
-#, fuzzy
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Dit bericht niet meer tonen"
 
-#: ../src/applet.c:883
-#, fuzzy, c-format
+#: ../src/applet.c:899
+#, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” disconnected because the network connection was "
 "interrupted."
 msgstr ""
 "\n"
-"De verbinding met het VPN-netwerk ‘%s’ is verbroken omdat de "
-"netwerkverbinding werd onderbroken."
+"De verbinding met het VPN-netwerk ‘%s’ is verbroken omdat de"
+" netwerkverbinding werd onderbroken."
 
-#: ../src/applet.c:885
-#, fuzzy, c-format
+#: ../src/applet.c:901
+#, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the network connection was "
 "interrupted."
 msgstr ""
 "\n"
-"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de netwerkverbinding "
-"werd onderbroken."
+"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de netwerkverbinding"
+" werd onderbroken."
 
-#: ../src/applet.c:887
-#, fuzzy, c-format
+#: ../src/applet.c:903
+#, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service stopped unexpectedly."
 msgstr ""
 "\n"
-"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de VPN-service "
-"onverwacht gestopt is."
+"De verbinding met het VPN-netwerk  ‘%s’ is mislukt omdat de VPN-service"
+" onverwacht gestopt is."
 
-#: ../src/applet.c:889
-#, fuzzy, c-format
+#: ../src/applet.c:905
+#, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service returned invalid "
 "configuration."
 msgstr ""
 "\n"
-"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de VPN-service een "
-"ongeldige configuratie teruggaf."
+"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de VPN-service een"
+" ongeldige configuratie teruggaf."
 
 # niet goed/onjuist
-#: ../src/applet.c:891
-#, fuzzy, c-format
+#: ../src/applet.c:907
+#, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the connection attempt timed out."
 msgstr ""
 "\n"
-"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de verbindingspoging "
-"de tijdslimiet heeft overschreden."
+"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de verbindingspoging"
+" de tijdslimiet heeft overschreden."
 
-#: ../src/applet.c:893
-#, fuzzy, c-format
+#: ../src/applet.c:909
+#, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service did not start in time."
 msgstr ""
 "\n"
-"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de VPN-service niet "
-"tijdig gestart werd."
+"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de VPN-service niet"
+" tijdig gestart werd."
 
-#: ../src/applet.c:895
-#, fuzzy, c-format
+#: ../src/applet.c:911
+#, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service failed to start."
 msgstr ""
 "\n"
-"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de VPN-service niet "
-"opgestart kon worden."
+"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de VPN-service niet"
+" opgestart kon worden."
 
-#: ../src/applet.c:897
-#, fuzzy, c-format
+#: ../src/applet.c:913
+#, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because there were no valid VPN secrets."
 msgstr ""
 "\n"
-"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat er geen geldige VPN-"
-"geheimen waren."
+"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat er geen geldige"
+" VPN-geheimen waren."
 
-#: ../src/applet.c:899
-#, fuzzy, c-format
+#: ../src/applet.c:915
+#, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because of invalid VPN secrets."
 msgstr ""
 "\n"
-"De verbinding met het VPN-netwerk ‘%s’ is mislukt vanwege ongeldige VPN-"
-"geheimen."
+"De verbinding met het VPN-netwerk ‘%s’ is mislukt vanwege ongeldige"
+" VPN-geheimen."
 
-#: ../src/applet.c:904
-#, fuzzy, c-format
+#: ../src/applet.c:920
+#, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed."
@@ -367,7 +384,7 @@
 "\n"
 "De VPN-verbinding met ‘%s’ is mislukt."
 
-#: ../src/applet.c:931
+#: ../src/applet.c:947
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -378,20 +395,20 @@
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: ../src/applet.c:949
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN-verbinding is met succes opgebouwd.\n"
 
-#: ../src/applet.c:935
+#: ../src/applet.c:951
 msgid "VPN Login Message"
 msgstr "VPN-aanmeldbericht"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: ../src/applet.c:959 ../src/applet.c:999
 msgid "VPN Connection Failed"
 msgstr "VPN-verbinding mislukt"
 
-#: ../src/applet.c:987
-#, fuzzy, c-format
+#: ../src/applet.c:1003
+#, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service failed to start.\n"
@@ -399,13 +416,13 @@
 "%s"
 msgstr ""
 "\n"
-"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de VPN-dienst niet "
-"opgestart kon worden.\n"
+"De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de VPN-dienst niet"
+" opgestart kon worden.\n"
 "\n"
 "%s"
 
-#: ../src/applet.c:990
-#, fuzzy, c-format
+#: ../src/applet.c:1006
+#, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed to start.\n"
@@ -417,161 +434,157 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: ../src/applet.c:1295
 msgid "device not ready (firmware missing)"
 msgstr "apparaat niet gereed (firmware ontbreekt)"
 
-#: ../src/applet.c:1281
+#: ../src/applet.c:1297
 msgid "device not ready"
 msgstr "apparaat niet gereed"
 
 # niet verbonden/verbinding verbroken
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "verbinding verbroken"
 
-#: ../src/applet.c:1307
+#: ../src/applet.c:1323
 msgid "Disconnect"
 msgstr "Verbinding verbreken"
 
-#: ../src/applet.c:1321
+#: ../src/applet.c:1337
 msgid "device not managed"
 msgstr "apparaat wordt niet beheerd"
 
 # Er zijn geen netwerkapparaten geconfigureerd/gevonden
-#: ../src/applet.c:1394
+#: ../src/applet.c:1410
 msgid "No network devices available"
 msgstr "Er zijn geen netwerkapparaten beschikbaar"
 
 # Netwerken
-#: ../src/applet.c:1448
+#: ../src/applet.c:1464
 msgid "_VPN Connections"
 msgstr "_VPN-verbindingen"
 
-#: ../src/applet.c:1492
-#, fuzzy
+#: ../src/applet.c:1508
 msgid "_Configure VPN…"
 msgstr "VPN _configureren…"
 
 # Netwerken
-#: ../src/applet.c:1495
-#, fuzzy
+#: ../src/applet.c:1511
 msgid "_Add a VPN connection…"
-msgstr "_VPN-verbindingen"
+msgstr "Een _VPN-verbinding toevoegen…"
 
-#: ../src/applet.c:1601
-#, fuzzy
+#: ../src/applet.c:1617
 msgid "NetworkManager is not running…"
 msgstr "Netwerkbeheer draait niet…"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: ../src/applet.c:1622 ../src/applet.c:2687
 msgid "Networking disabled"
 msgstr "Netwerken is uitgeschakeld"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: ../src/applet.c:1832
 msgid "Enable _Networking"
 msgstr "_Netwerk inschakelen"
 
 # Wireless gebruiken
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: ../src/applet.c:1841
 msgid "Enable _Wi-Fi"
 msgstr "_Wifi inschakelen"
 
 # gebruiken/aanzetten/inschakelen
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: ../src/applet.c:1850
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobiel breedband inschakelen"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: ../src/applet.c:1862
 msgid "Enable N_otifications"
 msgstr "_Meldingen aanzetten"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: ../src/applet.c:1874
 msgid "Connection _Information"
 msgstr "_Verbindingsinformatie"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
-#, fuzzy
+#: ../src/applet.c:1882
 msgid "Edit Connections…"
 msgstr "Verbindingen bewerken…"
 
-#: ../src/applet.c:1880
+#: ../src/applet.c:1896
 msgid "_About"
 msgstr "I_nfo"
 
 # met het netwerk %s/via het netwerk
-#: ../src/applet.c:2191
-#, fuzzy, c-format
+#: ../src/applet.c:2207
+#, c-format
 msgid "You are now connected to “%s”."
 msgstr "U bent nu verbonden met ‘%s’."
 
-#: ../src/applet.c:2231
+#: ../src/applet.c:2247
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
-#: ../src/applet.c:2232
+#: ../src/applet.c:2248
 msgid "The network connection has been disconnected."
 msgstr "De verbinding met het netwerk is verbroken."
 
-#: ../src/applet.c:2534
-#, fuzzy, c-format
+#: ../src/applet.c:2550
+#, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Netwerkverbinding ‘%s’ aan het voorbereiden…"
 
-#: ../src/applet.c:2537
-#, fuzzy, c-format
+#: ../src/applet.c:2553
+#, c-format
 msgid "User authentication required for network connection “%s”…"
-msgstr "Gebruikersauthenticatie vereist voor kabelnetwerkverbinding ‘%s’…"
+msgstr "Gebruikersauthenticatie vereist voor netwerkverbinding ‘%s’…"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
-#, fuzzy, c-format
+#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:607
+#, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Er wordt een netwerkadres aangevraagd voor ‘%s’…"
 
 # is actief/actief
-#: ../src/applet.c:2543
-#, fuzzy, c-format
+#: ../src/applet.c:2559
+#, c-format
 msgid "Network connection “%s” active"
-msgstr "Netwerkverbinding ‘%s’ actief"
+msgstr "Netwerkverbinding ‘%s’ is actief"
 
-#: ../src/applet.c:2616
-#, fuzzy, c-format
+#: ../src/applet.c:2632
+#, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Bezig met starten van VPN-verbinding ‘%s’…"
 
-#: ../src/applet.c:2619
-#, fuzzy, c-format
+#: ../src/applet.c:2635
+#, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Gebruikersauthenticatie vereist voor VPN-verbinding ‘%s’…"
 
-#: ../src/applet.c:2622
-#, fuzzy, c-format
+#: ../src/applet.c:2638
+#, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "VPN-adres aanvragen voor ‘%s’…"
 
 # actief/ingesteld/in werking
 # met/via
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: ../src/applet.c:2641
+#, c-format
 msgid "VPN connection active"
-msgstr "VPN-verbinding ‘%s’ actief"
+msgstr "VPN-verbinding is actief"
 
 # geen netwerk/netwerkverbinding
-#: ../src/applet.c:2675
+#: ../src/applet.c:2691
 msgid "No network connection"
 msgstr "Geen netwerkverbinding"
 
-#: ../src/applet.c:3276
+#: ../src/applet.c:3292
 msgid "NetworkManager Applet"
-msgstr "NetworkManager applet"
+msgstr "Netwerkbeheer-applet"
 
 #: ../src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
@@ -583,51 +596,49 @@
 
 #. Start the spinner to show the progress of the unlock
 #: ../src/applet-device-broadband.c:254
-#, fuzzy
 msgid "Sending unlock code…"
-msgstr "Ontgrendelingscode aan het verzenden…"
+msgstr "Ontgrendelingscode wordt verzonden…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobiel breedband (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/applet-device-broadband.c:739
+#: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobiel breedband"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Beschikbaar"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
-#, fuzzy
+#: ../src/applet-device-broadband.c:805
 msgid "New Mobile Broadband connection…"
-msgstr "Nieuwe mobiele breedbandverbinding"
+msgstr "Nieuwe mobiele breedbandverbinding…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Verbinding ingesteld"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "U bent nu verbonden met het mobielbreedbandnetwerk."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "Mobielbreedbandnetwerk."
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "U bent nu geregistreerd bij het thuisnetwerk."
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "U bent nu geregistreerd bij een netwerk voor roaming."
 
@@ -635,26 +646,26 @@
 msgid "You are now connected to the mobile broadband network."
 msgstr "U bent nu verbonden met het mobiele breedbandnetwerk."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
-#, fuzzy, c-format
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Mobiele breedbandverbinding ‘%s’ aan het voorbereiden…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
-#, fuzzy, c-format
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Mobiele breedbandverbinding ‘%s’ aan het instellen…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
-#, fuzzy, c-format
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Gebruikersauthenticatie vereist voor mobiele breedbandverbinding ‘%s’…"
 
 # actief/geactiveerd/in werking/ingesteld/in gebruik
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
-#, fuzzy, c-format
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#, c-format
 msgid "Mobile broadband connection “%s” active"
-msgstr "Mobiele breedbandverbinding ‘%s’ actief"
+msgstr "Mobiele breedbandverbinding ‘%s’ is actief"
 
 #: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
@@ -687,23 +698,23 @@
 msgstr "U bent nu verbonden met het bekabeld netwerk."
 
 #: ../src/applet-device-ethernet.c:161
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Kabelnetwerkverbinding ‘%s’ aan het voorbereiden…"
 
 #: ../src/applet-device-ethernet.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Kabelnetwerkverbinding ‘%s’ aan het instellen…"
 
 #: ../src/applet-device-ethernet.c:167
-#, fuzzy, c-format
+#, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Gebruikersauthenticatie vereist voor de kabelnetwerkverbinding ‘%s’…"
 
 # kabelnetwerkadres
 #: ../src/applet-device-ethernet.c:170
-#, fuzzy, c-format
+#, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Kabelnetwerkadres aanvragen voor ‘%s’…"
 
@@ -712,7 +723,7 @@
 # vaste netwerk/kabelnetwerkverbinding
 # verbinding via kabelnetwerk
 #: ../src/applet-device-ethernet.c:174
-#, fuzzy, c-format
+#, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Verbinding via kabelnetwerk ‘%s’ actief"
 
@@ -720,95 +731,105 @@
 msgid "DSL authentication"
 msgstr "DSL-authenticatie"
 
+#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/page-bluetooth.c:313
+#: ../src/connection-editor/page-mobile.c:545
+#: ../src/libnma/nma-vpn-password-dialog.c:210
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+msgid "_OK"
+msgstr "_Ok"
+
 #: ../src/applet-device-wifi.c:225
-#, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
-msgstr "Verbinden met verborgen wifi-netwerk"
+msgstr "_Verbinden met verborgen wifi-netwerk…"
 
 #: ../src/applet-device-wifi.c:276
-#, fuzzy
 msgid "Create _New Wi-Fi Network…"
-msgstr "Nieuw wifi-netwerk aanmaken"
+msgstr "_Nieuw wifi-netwerk aanmaken…"
 
 # niets/geen
 #: ../src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(geen)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Toevoegen van nieuwe verbinding mislukt"
 
 #: ../src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
-msgstr ""
+msgstr "Onvoldoende rechten."
 
 # vaste netwerk/kabelnetwerk
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wifi-netwerken (%s)"
 
 # vaste netwerk
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wifi-netwerk (%s)"
 
 # vaste netwerk
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "wifi-netwerk"
 msgstr[1] "Wifi-netwerken"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wifi is uitgeschakeld"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wifi is met de fysieke schakelaar uitgeschakeld"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Meer netwerken"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wifi-netwerken beschikbaar"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Gebruik het netwerkmenu om verbinding te maken met een wifi-netwerk"
 
-#: ../src/applet-device-wifi.c:1307
-#, fuzzy, c-format
+#: ../src/applet-device-wifi.c:1308
+#, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "U bent nu verbonden met het wifi-netwerk ‘%s’."
 
-#: ../src/applet-device-wifi.c:1342
-#, fuzzy, c-format
+#: ../src/applet-device-wifi.c:1343
+#, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Wifi-netwerkverbinding ‘%s’ aan het voorbereiden…"
 
-#: ../src/applet-device-wifi.c:1345
-#, fuzzy, c-format
+#: ../src/applet-device-wifi.c:1346
+#, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Wifi-netwerkverbinding ‘%s’ aan het instellen…"
 
-#: ../src/applet-device-wifi.c:1348
-#, fuzzy, c-format
+#: ../src/applet-device-wifi.c:1349
+#, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Gebruikersauthenticatie vereist voor wifi-netwerk ‘%s’…"
 
-#: ../src/applet-device-wifi.c:1351
-#, fuzzy, c-format
+#: ../src/applet-device-wifi.c:1352
+#, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Aanvragen van een adres voor wifi-netwerk ‘%s’…"
 
-#: ../src/applet-device-wifi.c:1362
-#, fuzzy, c-format
+#: ../src/applet-device-wifi.c:1363
+#, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Verbinding via wifi-netwerk ‘%s’ actief: %s (%d%%)"
 
@@ -816,12 +837,12 @@
 # netwerkverbinding via de kabel/netwerk/netwerkverbinding
 # vaste netwerk/kabelnetwerkverbinding
 # verbinding via kabelnetwerk
-#: ../src/applet-device-wifi.c:1366
-#, fuzzy, c-format
+#: ../src/applet-device-wifi.c:1367
+#, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Verbinding via wifi-netwerk ‘%s’ actief"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Activeren van verbinding mislukt"
 
@@ -829,311 +850,311 @@
 msgid "Error displaying connection information:"
 msgstr "Fout bij weergeven van verbindingsinformatie:"
 
-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
 #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: ../src/applet-dialogs.c:75
 msgid "Dynamic WEP"
 msgstr "Dynamisch WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:231
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: ../src/applet-dialogs.c:152
 msgid "More addresses"
 msgstr "Meer adressen"
 
-#: ../src/applet-dialogs.c:226
+#: ../src/applet-dialogs.c:227
 msgid "WEP"
 msgstr "WEP"
 
 # zonder/geen
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
+#: ../src/connection-editor/page-wifi-security.c:332
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Geen"
 
-#: ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:261
 #, c-format
 msgid "%s (default)"
 msgstr "%s (standaard)"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 # niet bekend/onbekend
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Onbekend"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
 msgid "IP Address:"
 msgstr "IP-adres:"
 
-#: ../src/applet-dialogs.c:369
+#: ../src/applet-dialogs.c:370
 msgid "Broadcast Address:"
 msgstr "Broadcast-adres:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: ../src/applet-dialogs.c:382
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:383
 msgid "Subnet Mask:"
 msgstr "Subnetmasker:"
 
-#: ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:493
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:496
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: ../src/applet-dialogs.c:503
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: ../src/applet-dialogs.c:505
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
 #: ../src/connection-editor/ce-page-team-port.ui.h:23
 #: ../src/connection-editor/ce-page-team.ui.h:48
 #: ../src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Algemeen"
 
-#: ../src/applet-dialogs.c:516
+#: ../src/applet-dialogs.c:517
 msgid "Interface:"
 msgstr "Apparaat:"
 
-#: ../src/applet-dialogs.c:536
+#: ../src/applet-dialogs.c:537
 msgid "Hardware Address:"
 msgstr "Hardware-adres:"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:551
 msgid "Driver:"
 msgstr "Stuurprogramma:"
 
-#: ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:586
 msgid "Speed:"
 msgstr "Snelheid:"
 
 # Bedoeld wordt beveiliging van het draadloos netwerk.
 # niet dat de beveiling draadloos is.
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:601
 msgid "Security:"
 msgstr "Beveiliging:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
 #: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
 msgid "Default Route:"
 msgstr "Standaardroute:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
 #: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
 # niet gebruikt/genegeerd
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
 msgid "Ignored"
 msgstr "Genegeerd"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:816
 msgid "VPN Type:"
 msgstr "VPN-type:"
 
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:823
 msgid "VPN Gateway:"
 msgstr "VPN-gateway:"
 
-#: ../src/applet-dialogs.c:828
+#: ../src/applet-dialogs.c:829
 msgid "VPN Username:"
 msgstr "VPN-gebruikersnaam:"
 
-#: ../src/applet-dialogs.c:834
+#: ../src/applet-dialogs.c:835
 msgid "VPN Banner:"
 msgstr "VPN-banier:"
 
-#: ../src/applet-dialogs.c:840
+#: ../src/applet-dialogs.c:841
 msgid "Base Connection:"
 msgstr "Basisverbinding:"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Onbekend"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: ../src/applet-dialogs.c:958
 msgid "No valid active connections found!"
 msgstr "Geen geldige actieve verbindingen gevonden!"
 
-#: ../src/applet-dialogs.c:985
+#: ../src/applet-dialogs.c:1007
+#| msgid ""
+#| "Copyright © 2004-2014 Red Hat, Inc.\n"
+#| "Copyright © 2005-2008 Novell, Inc.\n"
+#| "and many other community contributors and translators"
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "en vele bijdragen van vertalers en anderen uit de gemeenschap"
 
-#: ../src/applet-dialogs.c:988
+#: ../src/applet-dialogs.c:1010
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Een toepassing in het mededelingengebied voor het beheren van uw "
 "netwerkapparaten en -verbindingen."
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1012
 msgid "NetworkManager Website"
-msgstr "NetworkManager website"
+msgstr "Website Netwerkbeheer"
+
+#: ../src/applet-dialogs.c:1016
+msgid "translator-credits"
+msgstr "vertalers"
 
-#: ../src/applet-dialogs.c:1001
+#: ../src/applet-dialogs.c:1026
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr ""
-"Het Netwerkbeheerapplet kon bepaalde vereiste bronnen niet vinden (het .ui-"
-"bestand is niet gevonden)."
+"Het Netwerkbeheerapplet kon bepaalde vereiste bronnen niet vinden (het"
+" .ui-bestand is niet gevonden)."
 
-#: ../src/applet-dialogs.c:1006
+#: ../src/applet-dialogs.c:1031
 msgid "Missing resources"
 msgstr "Ontbrekende bronnen"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1057
 msgid "Mobile broadband network password"
 msgstr "Wachtwoord voor het mobiele breedbandnetwerk"
 
 # om een verbinding te maken met/voor het verbinden met
-#: ../src/applet-dialogs.c:1040
-#, fuzzy, c-format
+#: ../src/applet-dialogs.c:1066
+#, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Er is een wachtwoord nodig om een verbinding te maken met ‘%s’."
 
-#: ../src/applet-dialogs.c:1055
+#: ../src/applet-dialogs.c:1081
 msgid "Password:"
 msgstr "Wachtwoord:"
 
 # nodig/gevraagd/vereist
 # geen letterlijke vertaling van unlock
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1363
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN-code vereist"
 
-#: ../src/applet-dialogs.c:1338
+#: ../src/applet-dialogs.c:1364
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN-code vereist"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
-#, fuzzy, c-format
+#: ../src/applet-dialogs.c:1366
+#, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
 "used."
 msgstr ""
-"Het mobiele breedbandapparaat ‘%s’ vereist een pincode voor de SIM voordat "
-"het gebruikt kan worden."
+"Het mobiele breedbandapparaat ‘%s’ vereist een pincode voor de SIM voordat"
+" het gebruikt kan worden."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1368
 msgid "PIN code:"
 msgstr "PIN-code:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1372
 msgid "Show PIN code"
 msgstr "PIN-code tonen"
 
 # gevraagd/vereist
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1374
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK-code vereist"
 
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1375
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK-code vereist"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
-#, fuzzy, c-format
+#: ../src/applet-dialogs.c:1377
+#, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
 "used."
 msgstr ""
-"Het mobiele breedbandapparaat ‘%s’ vereist een SIM PUK-code voordat het "
-"gebruikt kan worden."
+"Het mobiele breedbandapparaat ‘%s’ vereist een SIM PUK-code voordat het"
+" gebruikt kan worden."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1379
 msgid "PUK code:"
 msgstr "PUK-code:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: ../src/applet-dialogs.c:1382
 msgid "New PIN code:"
 msgstr "Nieuwe PIN-code:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: ../src/applet-dialogs.c:1384
 msgid "Re-enter new PIN code:"
 msgstr "Voer nieuwe PIN-code nogmaals in:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: ../src/applet-dialogs.c:1389
 msgid "Show PIN/PUK codes"
 msgstr "PUK-/pincodes weergeven"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
-msgstr "_Ok"
-
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
 #: ../src/connection-editor/ce-page.h:114
-#, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr ""
-"IP-adressen identificeren uw computer op het netwerk. Klik op de knop "
-"“Toevoegen” om een IP-adres toe te voegen."
+"IP-adressen identificeren uw computer op het netwerk. Klik op de knop"
+" ‘Toevoegen’ om een IP-adres toe te voegen."
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:4
 #: ../src/connection-editor/ce-ip6-routes.ui.h:4
@@ -1142,11 +1163,10 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
 #: ../src/connection-editor/ce-page-ip6.ui.h:10
 #: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
 msgstr "_Toevoegen"
 
-#. Delete
 #: ../src/connection-editor/ce-ip4-routes.ui.h:5
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
@@ -1154,7 +1174,8 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
 #: ../src/connection-editor/ce-page-ip6.ui.h:11
 #: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/nm-connection-list.c:711
+#: ../src/connection-editor/connection-helpers.c:772
+#: ../src/connection-editor/nm-connection-list.ui.h:4
 msgid "_Delete"
 msgstr "_Verwijderen"
 
@@ -1178,9 +1199,8 @@
 "standaardnetwerkverbinding gebruikt worden."
 
 #: ../src/connection-editor/ce-new-connection.ui.h:2
-#, fuzzy
 msgid "C_reate…"
-msgstr "Aanmaken…"
+msgstr "_Aanmaken…"
 
 # Kies een VPN-verbindingstype
 #: ../src/connection-editor/ce-new-connection.ui.h:3
@@ -1207,7 +1227,7 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:2
 #: ../src/connection-editor/ce-page-team.ui.h:22
 msgid "Active backup"
-msgstr "Actieve achtervang"
+msgstr "Actieve backup"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:3
 msgid "XOR"
@@ -1247,11 +1267,10 @@
 msgid "M_ode:"
 msgstr "M_odus:"
 
-#. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: ../src/connection-editor/nm-connection-list.ui.h:5
 msgid "_Edit"
 msgstr "Be_werken"
 
@@ -1307,7 +1326,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 #: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
@@ -1316,7 +1335,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-infiniband.ui.h:7
 #: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
@@ -1344,30 +1363,88 @@
 msgid "_Forward delay:"
 msgstr "Vertraging _doorsturen:"
 
+# Hello Time is the interval between periodic transmissions of Configuration Messages by Designated Ports. - Hannie
 #: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
-msgstr "_Hello-tijd:"
+msgstr "_Hello time:"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "STP forwarding delay, in seconds"
+msgstr "STP-doorstuurvertraging, in seconden"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "STP hello time, in seconds"
+msgstr "STP-‘hello time’, in seconden"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "Enable I_GMP snooping"
 msgstr "I_GMP-snooping inschakelen"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+"Controleert of IGMP-snooping ingeschakeld is voor deze bridge. Merk op dat,"
+" wanneer snooping automatisch werd uitgeschakeld vanwege hash-botsingen, het"
+" systeem mogelijk weigert de functie in te schakelen totdat er geen botsingen"
+" meer zijn."
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:14
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_STP (Spanning Tree Protocol) inschakelen"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:15
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+"Controleert of Spanning Tree Protocol (STP) is ingeschakeld voor deze bridge"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:16
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+"STP-prioriteit voor deze bridge. Lagere waarden zijn ‘beter’; de bridge met"
+" de laagste prioriteit zal tot root-bridge worden gekozen."
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:17
 msgid "_Max age:"
 msgstr "_Max. leeftijd:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:18
+msgid "STP maximum message age, in seconds"
+msgstr "STP maximum berichtenleeftijd, in seconden"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:19
 msgid "_Aging time:"
 msgstr "Ver_ouderingstijd:"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:20
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr "Verouderingstijd MAC-adres bekabeld netwerk, in seconden"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:21
+msgid "Group _forward mask:"
+msgstr "Masker groeps_doorsturen:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:22
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+"Een masker van 16 bits, waarbij elke bit overeenkomt met een door te sturen"
+" groepsadres in het bereik van 01:80:C2:00:00:00 tot 01:80:C2:00:00:0F. De"
+" bits 0, 1 of 2 mogen niet voorkomen in het masker omdat ze gebruikt worden"
+" voor STP, MAC-pauzeframes en LACP."
+
 #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatisch"
@@ -1387,32 +1464,30 @@
 
 #: ../src/connection-editor/ce-page.c:294
 msgid "Preserve"
-msgstr ""
+msgstr "Behouden"
 
 #: ../src/connection-editor/ce-page.c:295
 msgid "Permanent"
-msgstr ""
+msgstr "Permanent"
 
 #: ../src/connection-editor/ce-page.c:296
 msgid "Random"
-msgstr ""
+msgstr "Willekeurig"
 
 # Wireless gebruiken
 #: ../src/connection-editor/ce-page.c:297
-#, fuzzy
 msgid "Stable"
-msgstr "Inschakelen"
+msgstr "Stabiel"
 
 #: ../src/connection-editor/ce-page.c:301
-#, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
 "network device this connection is activated on. This feature is known as MAC "
 "cloning or spoofing. Example: 00:11:22:33:44:55"
 msgstr ""
-"Het ingevoerde MAC-adres zal gebruikt worden als het hardware-adres voor het "
-"netwerkapparaat waarop deze verbinding is geactiveerd. Dit wordt “MAC "
-"cloning” of “spoofing” genoemd. Voorbeeld: 00:11:22:33:44:55"
+"Het ingevoerde MAC-adres zal gebruikt worden als het hardware-adres voor het"
+" netwerkapparaat waarop deze verbinding is geactiveerd. Dit wordt ‘MAC"
+" cloning’ of ‘spoofing’ genoemd. Voorbeeld: 00:11:22:33:44:55"
 
 #: ../src/connection-editor/ce-page.c:341
 msgid "MAC address"
@@ -1433,28 +1508,27 @@
 msgstr "Ongeldige %s (%s)"
 
 #: ../src/connection-editor/ce-page.c:388
-#, fuzzy, c-format
+#, c-format
 msgid "invalid interface-name for %s (%s): "
-msgstr "ongeldige interfacenaam for %s (%s)"
+msgstr "ongeldige interfacenaam for %s (%s): "
 
 #: ../src/connection-editor/ce-page.c:392
-#, fuzzy, c-format
+#, c-format
 msgid "invalid interface-name (%s): "
-msgstr "ongeldige interfacenaam (%s)"
+msgstr "ongeldige interfacenaam (%s): "
 
 #: ../src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
-msgstr ""
+msgstr "apparaatnaam kan niet worden ontleed"
 
 #: ../src/connection-editor/ce-page.c:589
-#, fuzzy
 msgid "invalid hardware address"
-msgstr "Hardware-adres:"
+msgstr "ongeldig hardware-adres"
 
 #: ../src/connection-editor/ce-page.c:611
-#, fuzzy, c-format
+#, c-format
 msgid "invalid %s (%s): "
-msgstr "Ongeldige %s (%s)"
+msgstr "ongeldige %s (%s): "
 
 #: ../src/connection-editor/ce-page.c:612
 #: ../src/connection-editor/ce-page.c:617
@@ -1462,9 +1536,9 @@
 msgstr "apparaat"
 
 #: ../src/connection-editor/ce-page.c:616
-#, fuzzy, c-format
+#, c-format
 msgid "invalid %s (%s) "
-msgstr "Ongeldige %s (%s)"
+msgstr "ongeldige %s (%s) "
 
 # technische term
 #: ../src/connection-editor/ce-page.c:725
@@ -1472,9 +1546,8 @@
 msgstr "Kon verbindingsgeheimen niet bijwerken vanwege een onbekende fout."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:1
-#, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
-msgstr "Data Center Bridging (DCB) gebruiken voor deze verbinding"
+msgstr "Data Center Bridging (DCB) _gebruiken voor deze verbinding"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:2
 msgid "FCoE"
@@ -1514,7 +1587,6 @@
 msgstr "Prioriteit"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:11
-#, fuzzy
 msgid "Options…"
 msgstr "Opties…"
 
@@ -1601,13 +1673,13 @@
 msgstr "Voer ID van prioriteitsgroep in voor elke gebruikersprioriteit."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
-"Voer het percentage van de toegestane koppelingsbandbreedte in die elke "
-"prioriteitsgroep mag gebruiken. Het totaal van alle groepen moet 100% zijn."
+"Voer het percentage van de toegestane koppelingsbandbreedte in die elke"
+" prioriteitsgroep mag gebruiken. Het totaal van alle groepen moet 100% zijn."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid ""
@@ -1634,12 +1706,24 @@
 msgid "_Username:"
 msgstr "_Gebruikersnaam:"
 
-# dienst/service
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "Username used to authenticate with the PPPoE service."
+msgstr "Gebruikersnaam voor aanmelding bij de PPPoE-dienst."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+"Alleen sessies starten met toegangsconcentratoren die de opgegeven dienst"
+" leveren. Voor de meeste aanbieders zou dit leeg gelaten moeten worden."
+
+# dienst/service
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
 msgid "_Service:"
 msgstr "_Service:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:5
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 #: ../src/wireless-security/ws-leap.ui.h:3
@@ -1647,7 +1731,11 @@
 msgid "Sho_w password"
 msgstr "Wachtwoord _tonen"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-dsl.ui.h:6
+msgid "Password used to authenticate with the PPPoE service."
+msgstr "Wachtwoord voor aanmelding bij de PPPoE-dienst."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:7
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
 #: ../src/libnma/nma-vpn-password-dialog.c:97
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
@@ -1658,10 +1746,29 @@
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
+#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#| msgid "_Parent interface:"
+msgid "PPP _interface:"
+msgstr "PPP i_nterface:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#| msgid "_Parent interface:"
+msgid "P_arent interface:"
+msgstr "_Bovenliggende interface:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:10
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+"Een willekeurige naam om toe te wijzen aan de nieuw gemaakte PPP-interface."
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:11
+msgid "The interface on which the PPP connection will be established."
+msgstr "De interface waarop de PPP-verbinding tot stand zal worden gebracht."
+
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
 #: ../src/connection-editor/page-ip6.c:136
@@ -1703,11 +1810,11 @@
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:10
 msgid "Half"
-msgstr ""
+msgstr "Half"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:11
 msgid "Full"
-msgstr ""
+msgstr "Volledig"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
 #: ../src/connection-editor/page-ip6.c:149
@@ -1728,7 +1835,7 @@
 
 # dienst/service
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
 msgid "_Device:"
 msgstr "_Apparaat:"
@@ -1785,9 +1892,10 @@
 "Wake-on-LAN wachtwoord (een Ethernet MAC). Het is alleen geldig voor magic-"
 "pakketten."
 
+# Geen idee wat dit is, dus laat ik het onvertaald - Hannie
 #: ../src/connection-editor/ce-page-ethernet.ui.h:30
 msgid "Lin_k negotiation:"
-msgstr ""
+msgstr "Lin_k negotiation:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:31
 msgid ""
@@ -1795,6 +1903,10 @@
 "will be forced without checking the device compatibility. If unsure, leave "
 "here “Ignore” or pick “Automatic”."
 msgstr ""
+"Device link negotiation. Als er gekozen is voor ‘Handmatig’, dan zullen de"
+" waarden ‘Speed’ en ‘Duplex’ gebruikt worden zonder de compatibiliteit van"
+" het apparaat te controleren. Laat hier bij twijfel ‘Negeren’ staan of kies"
+" ‘Automatisch’."
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:32
 msgid "_Speed:"
@@ -1806,11 +1918,13 @@
 "“Automatic” options are not selected. Before specifying a speed value be "
 "sure your device supports it."
 msgstr ""
+"Snelheidswaarde voor static link negotiation. Alleen nodig wanneer de opties"
+" ‘Negeren’ en ‘Automatisch’ niet geselecteerd zijn. Controleer eerst of uw"
+" apparaat dit ondersteunt, voordat u een snelheidswaarde opgeeft."
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:34
-#, fuzzy
 msgid "Duple_x:"
-msgstr "Volledig duple_x"
+msgstr "Duple_x:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:35
 msgid ""
@@ -1818,6 +1932,9 @@
 "“Automatic” options are not selected. Before specifying a duplex mode be "
 "sure your device supports it."
 msgstr ""
+"Duplexwaarde voor static link negotiation. Alleen nodig wanneer de opties"
+" ‘Negeren’ en ‘Automatisch’ niet geselecteerd zijn. Controleer eerst of uw"
+" apparaat dit ondersteunt, voordat u een duplexwaarde opgeeft."
 
 #: ../src/connection-editor/ce-page-general.ui.h:1
 msgid "Automatically connect to _VPN when using this connection"
@@ -1832,9 +1949,8 @@
 msgstr "Au_tomatisch verbinden met dit netwerk wanneer het beschikbaar is"
 
 #: ../src/connection-editor/ce-page-general.ui.h:4
-#, fuzzy
 msgid "Connection _priority for auto-activation:"
-msgstr "_Verbindingsinformatie"
+msgstr "_Verbindingsprioriteit voor auto-activatie:"
 
 #: ../src/connection-editor/ce-page-general.ui.h:5
 msgid ""
@@ -1842,19 +1958,22 @@
 "numbers are preferred when selecting profiles for automatic activation. "
 "Default value is 0."
 msgstr ""
+"Verbindingsprioriteit voor automatische activering. Verbindingen met hoger"
+" getallen krijgen de voorkeur bij het kiezen van  profielen voor automatische"
+" activering. De standaardwaarde is 0."
 
 #: ../src/connection-editor/ce-page-general.ui.h:6
 msgid "Firewall _zone:"
 msgstr "Firewall_zone:"
 
 #: ../src/connection-editor/ce-page.h:111
-#, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add static IP address to be configured in addition to the automatic ones."
 msgstr ""
-"IP-adressen identificeren uw computer op het netwerk. Klik op de knop "
-"“Toevoegen” om een IP-adres toe te voegen."
+"IP-adressen identificeren uw computer op het netwerk. Klik op de knop"
+" ’Toevoegen’ om een statisch IP-adres toe te voegen dat naast de automatische"
+" adressen moet worden ingesteld."
 
 #: ../src/connection-editor/ce-page.h:116
 msgid ""
@@ -1863,12 +1982,15 @@
 "an IP address. If no address is provided, range will be determined "
 "automatically."
 msgstr ""
+"Het IP-adres identificeert uw computer op het netwerk en bepaalt het"
+" adressenbereik dat aan andere computers wordt gegeven. Klik op de knop"
+" ’Toevoegen’ om een IP-adres toe te voegen. Als er geen adres wordt opgegeven"
+" zullen de adressen automatisch bepaald worden."
 
 # enkel/alleen
 #: ../src/connection-editor/ce-page.h:121
-#, fuzzy
 msgid "Additional static addresses"
-msgstr "Automatisch, alleen adressen"
+msgstr "Extra statische adressen"
 
 #: ../src/connection-editor/ce-page.h:122
 msgid "Addresses"
@@ -1876,93 +1998,95 @@
 
 #: ../src/connection-editor/ce-page.h:123
 msgid "Address (optional)"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "_Transportmodus:"
+msgstr "Adres (optioneel)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
 msgid "Connected"
 msgstr "Verbonden"
 
+#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+msgid "_Transport mode:"
+msgstr "_Transportmodus:"
+
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
 msgid "IPIP"
-msgstr ""
+msgstr "IPIP"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
 msgid "GRE"
-msgstr ""
+msgstr "GRE"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
 msgid "SIT"
-msgstr ""
+msgstr "SIT"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
 msgid "ISATAP"
-msgstr ""
+msgstr "ISATAP"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
 msgid "VTI"
-msgstr ""
+msgstr "VTI"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
 msgid "IP6IP6"
-msgstr ""
+msgstr "IP6IP6"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
 msgid "IPIP6"
-msgstr ""
+msgstr "IPIP6"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
 msgid "IP6GRE"
-msgstr ""
+msgstr "IP6GRE"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
 msgid "VTI6"
-msgstr ""
+msgstr "VTI6"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#, fuzzy
-msgid "Device name"
-msgstr "Apparaatnaam + nummer"
+#: ../src/connection-editor/ce-page-macsec.ui.h:6
+msgid "Device name:"
+msgstr "Apparaatnaam:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#, fuzzy
-msgid "Parent device"
-msgstr "Ethernet-apparaat"
+#: ../src/connection-editor/ce-page-macsec.ui.h:8
+msgid "Parent device:"
+msgstr "Bovenliggend apparaat:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#, fuzzy
-msgid "Mode"
-msgstr "M_odus:"
+#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#| msgid "M_ode:"
+msgid "Mode:"
+msgstr "Modus:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP"
-msgstr ""
+msgid "Local IP:"
+msgstr "Lokale IP:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP"
-msgstr ""
+msgid "Remote IP:"
+msgstr "Externe IP:"
 
+# Ik weet niet wat hiermee bedoeld wordt. - Hannie
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key"
-msgstr ""
+msgid "Input key:"
+msgstr "Input key:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key"
-msgstr ""
+msgid "Output key:"
+msgstr "Output key:"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-#, fuzzy
-msgid "MTU"
-msgstr "_MTU:"
+#| msgid "_MTU:"
+msgid "MTU:"
+msgstr "MTU:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1988,13 +2112,12 @@
 
 # client identifier, technische term
 #: ../src/connection-editor/ce-page-ip4.ui.h:9
-#, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
 "enter it here."
 msgstr ""
-"De “DHCP client identifier” geeft de netwerkbeheerder de mogelijkheid om een "
+"De ‘DHCP client identifier’ geeft de netwerkbeheerder de mogelijkheid om een "
 "aangepaste configuratie voor uw computer te maken. Indien u een DHCP client "
 "identifier gebruiken wilt, voer deze dan hier in."
 
@@ -2053,6 +2176,7 @@
 msgstr "_Routes…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-macsec.ui.h:3
 #: ../src/connection-editor/page-ip4.c:198
 msgid "Disabled"
 msgstr "Uitgeschakeld"
@@ -2092,6 +2216,104 @@
 "om de verbinding te voltooien wanneer IPv6-configuratie mislukt maar IPv4-"
 "configuratie wel lukt."
 
+#: ../src/connection-editor/ce-page-macsec.ui.h:1
+msgid "PSK"
+msgstr "PSK"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:2
+#: ../src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:4
+msgid "Check"
+msgstr "Controleren"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#| msgid "Metric"
+msgid "Strict"
+msgstr "Nauwkeurig"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:7
+msgid "The name of the MACsec device."
+msgstr "De naam van het MACsec-apparaat."
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:9
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+"De naam van de bovenliggende interface of verbindings-UUID van waaruit deze"
+" MACSEC-interface aangemaakt moet worden."
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:10
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+"De naam van de bovenliggende interface of verbindings-UUID van waaruit deze"
+" MACsec-interface aangemaakt moet worden"
+
+# Lastig te vertalen, dus laat ik het even zo. - Hannie
+#: ../src/connection-editor/ce-page-macsec.ui.h:11
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr " The pre-shared Connectivity-association Key Name"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:12
+msgid "The pre-shared Connectivity Association Key"
+msgstr "The pre-shared Connectivity Association Key"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:13
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+"Specificeert hoe de CAK (Connectivity Association Key) voor MKA (MACsec Key"
+" Agreement) verkregen wordt. Vul voor de EAP-modus de parameters in op de"
+" 802.1X-beveiligingspagina."
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:14
+msgid "CKN:"
+msgstr "CKN:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:15
+msgid "CAK:"
+msgstr "CAK:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:17
+msgid "Keys:"
+msgstr "Sleutels:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:18
+msgid "Parameters:"
+msgstr "Parameters:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:19
+msgid "Validation:"
+msgstr "Validatie:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#| msgid "_Import"
+msgid "SCI port:"
+msgstr "SCI-poort:"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:21
+msgid "Specifies the validation mode for incoming frames"
+msgstr "Specificeert de validatiemodus voor inkomende frames"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:22
+msgid "Encrypt"
+msgstr "Versleutelen"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:23
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr "Of het verzonden verkeer versleuteld moet zijn"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:24
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr "Het poortcomponent van de SCI (Secure Channel Identifier)"
+
 # simple/eenvoudig/kort
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:26
@@ -2115,7 +2337,6 @@
 msgstr "N_etwerk ID:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:8
-#, fuzzy
 msgid "Change…"
 msgstr "Wijzigen…"
 
@@ -2179,78 +2400,73 @@
 msgid "Send PPP _echo packets"
 msgstr "PPP-_echopakketten versturen"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Methode:"
-
 # zonder/geen
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
+#: ../src/connection-editor/ce-page-proxy.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:25
-#, fuzzy
 msgid "None"
 msgstr "Geen"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: ../src/connection-editor/ce-page-proxy.ui.h:3
 msgid "For browser only"
-msgstr ""
+msgstr "Alleen voor webbrowser"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: ../src/connection-editor/ce-page-proxy.ui.h:4
 msgid "Use this proxy configuration for only browser clients/schemes."
-msgstr ""
+msgstr "Gebruik deze proxyconfiguratie voor alleen browserclients/-schema's."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: ../src/connection-editor/ce-page-proxy.ui.h:5
 msgid "PAC URL:"
-msgstr ""
+msgstr "PAC URL:"
+
+#: ../src/connection-editor/ce-page-proxy.ui.h:6
+msgid "PAC script:"
+msgstr "PAC-script:"
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:7
 msgid "URL from where the PAC script is to be obtained."
-msgstr ""
+msgstr "URL vanwaar het PAC-script moet worden verkregen."
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
-msgstr ""
+msgid "Import script from a file…"
+msgstr "Import script from a file…"
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:9
-#, fuzzy
-msgid "Import script from a file…"
-msgstr "Een opgeslagen team-configuratie i_mporteren…"
+msgid "Method:"
+msgstr "Methode:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:19
-#, fuzzy
 msgid "Ad_vanced…"
-msgstr "Geavanceerd"
+msgstr "Ge_avanceerd…"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:2
 msgid "Set by master"
-msgstr ""
+msgstr "Instellen door master"
 
 # vaste netwerk
 #: ../src/connection-editor/ce-page-team-port.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:9
-#, fuzzy
 msgid "Ethernet port state"
-msgstr "Bekabelde netwerken"
+msgstr "Poortstatus bekabeld netwerk"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:4
 #: ../src/connection-editor/ce-page-team.ui.h:10
 msgid "ARP (IPv4)"
-msgstr ""
+msgstr "ARP (IPv4)"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:5
 #: ../src/connection-editor/ce-page-team.ui.h:11
 msgid "NDP (IPv6)"
-msgstr ""
+msgstr "NDP (IPv6)"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:6
 #: ../src/connection-editor/ce-page-team.ui.h:37
 msgid "Team Advanced Options"
-msgstr ""
+msgstr "Geavanceerde opties voor team"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:7
 msgid "_Queue ID:"
-msgstr ""
+msgstr "_Wachtrij-id:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:8
 #: ../src/connection-editor/ce-page-team.ui.h:42
@@ -2258,125 +2474,133 @@
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
 msgstr ""
+"Aantal bursts van ongevraagde NA's en gratis ARP-pakketten, verstuurd nadat"
+" de poort in- of uitgeschakeld is."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:9
 msgid "ID of queue which this port should be mapped to."
-msgstr ""
+msgstr "ID van de wachtrij waar deze map naar wordt verwezen."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Prioriteit:"
+msgid "Active-Backup runner options"
+msgstr "Opties Active-Backup runner"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
-msgstr ""
+msgid "_Port priority:"
+msgstr "_Poortprioriteit:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:82
-msgid ""
-"Validate received ARP packets on active ports. If this is not checked, all "
-"incoming ARP packets will be considered as a good reply."
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:44
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
 msgstr ""
+"De waarde is een positief getal in milliseconden. Het specificeert een"
+" interval tussen bursts van ‘notify-peer’-pakketten."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
 msgid "Port priority. The higher number means higher priority."
-msgstr ""
+msgstr "Poortprioriteit. Een hoger getal betekent een hogere prioriteit."
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port _sticky"
+msgstr "Port _sticky"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:15
-msgid "Active-Backup runner options"
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
 msgstr ""
+"Ontvangen ARP-pakketten op actieve poorten valideren. Als dit niet is"
+" aangevinkt, zullen alle binnenkomende ARP-pakketten beschouwd worden als een"
+" goed antwoord."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:16
-#, fuzzy
-msgid "_LACP port priority:"
-msgstr "_Prioriteit:"
+msgid "LACP runner options"
+msgstr "Opties LACP-runner"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:17
-#, fuzzy
-msgid "LACP port _key:"
-msgstr "_Privésleutel:"
+msgid "_LACP port priority:"
+msgstr "Prioriteit _LACP-poort:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:18
+msgid "LACP port _key:"
+msgstr "Sleutel  _LACP-poort:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
 #: ../src/connection-editor/ce-page-team.ui.h:43
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
 msgstr ""
+"Aantal bursts van ‘multicast group rejoin’ verzoeken, verstuurd nadat de"
+" poort in- of uitgeschakeld is."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
+"Poortprioriteit volgens de LACP-standaard. Een lager getal betekent hogere"
+" prioriteit."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
 #: ../src/connection-editor/ce-page-team.ui.h:45
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
 msgstr ""
+"De waarde is een positief getal in milliseconden. Het specificeert een"
+" interval tussen bursts van ‘multicast group rejoin’-verzoeken."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
 msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
-msgid "LACP runner options"
-msgstr ""
+"Poortsleutel volgens de LACP-standaard. Alleen poorten met dezelfde sleutel"
+" kunnen worden bijeengebracht."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:24
 #: ../src/connection-editor/ce-page-team.ui.h:70
 msgid "_Link watcher:"
-msgstr ""
+msgstr "_Link watcher:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:25
 #: ../src/connection-editor/ce-page-team.ui.h:71
-#, fuzzy
 msgid "_Up delay:"
-msgstr "Vertraging verbinding a_ctiveren:"
+msgstr "_Up-vertraging"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:26
 #: ../src/connection-editor/ce-page-team.ui.h:72
-#, fuzzy
 msgid "_Down delay:"
-msgstr "Vertraging verbinding _neerleggen:"
+msgstr "_Down-vertraging:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:27
 #: ../src/connection-editor/ce-page-team.ui.h:73
-#, fuzzy
 msgid "Send _interval:"
-msgstr "_Bovenliggende interface:"
+msgstr "_Interval versturen:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:28
 #: ../src/connection-editor/ce-page-team.ui.h:74
 msgid "Delay _before first send:"
-msgstr ""
+msgstr "Vertraging _vóór de eerste verzending:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:29
 #: ../src/connection-editor/ce-page-team.ui.h:75
 msgid "_Maximum missed replies:"
-msgstr ""
+msgstr "_Maximum aantal gemiste antwoorden:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:30
 #: ../src/connection-editor/ce-page-team.ui.h:76
 msgid "_Source host:"
-msgstr ""
+msgstr "_Bronhost:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:31
 #: ../src/connection-editor/ce-page-team.ui.h:77
-#, fuzzy
 msgid "_Target host:"
-msgstr "ARP-_doelen:"
+msgstr "_Doelhost"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:32
 #: ../src/connection-editor/ce-page-team.ui.h:78
@@ -2384,6 +2608,8 @@
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
 msgstr ""
+"Maximum aantal gemiste antwoorden. Als dit aantal overschreden wordt, dan zal"
+" de link als ‘down’ worden aangemerkt."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:33
 #: ../src/connection-editor/ce-page-team.ui.h:79
@@ -2391,6 +2617,8 @@
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
 msgstr ""
+"Hostnaam die moet worden omgezet naar IP-adres dat als bronadres opgegeven"
+" zal worden in ARP-verzoek."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:34
 #: ../src/connection-editor/ce-page-team.ui.h:80
@@ -2398,16 +2626,18 @@
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
 msgstr ""
+"Hostnaam die moet worden omgezet naar IP-adres dat als doeladres opgegeven"
+" zal worden in ARP-verzoek."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:35
 #: ../src/connection-editor/ce-page-team.ui.h:81
 msgid "Ignore invalid packets from _active ports"
-msgstr ""
+msgstr "Ongeldige pakketten van _actieve poorten negeren"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:36
 #: ../src/connection-editor/ce-page-team.ui.h:83
 msgid "Ignore invalid packets from i_nactive ports"
-msgstr ""
+msgstr "Ongeldige pakketten van i_nactieve poorten negeren"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:37
 #: ../src/connection-editor/ce-page-team.ui.h:84
@@ -2415,11 +2645,14 @@
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
 msgstr ""
+"Ontvangen ARP-pakketten op inactieve poorten valideren. Als dit niet is"
+" aangevinkt, dan zullen alle binnenkomende ARP-pakketten beschouwd worden als"
+" geldig antwoord."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:38
 #: ../src/connection-editor/ce-page-team.ui.h:85
 msgid "S_end on inactive ports"
-msgstr ""
+msgstr "_Verzenden op inactieve poorten"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:39
 #: ../src/connection-editor/ce-page-team.ui.h:86
@@ -2427,91 +2660,93 @@
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
 msgstr ""
+"Standaard worden ARP-verzoeken alleen op actieve poorten verzonden. Met deze"
+" optie kan er zelfs op inactieve poorten verzonden worden."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:40
 #: ../src/connection-editor/ce-page-team.ui.h:87
 msgid ""
 "The delay between the link coming up and the runner being notified about it."
 msgstr ""
+"De vertraging tussen de komende link en het melden hiervan aan de ‘runner’."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:41
 #: ../src/connection-editor/ce-page-team.ui.h:88
 msgid ""
 "The delay between the link going down and the runner being notified about it."
 msgstr ""
+"De vertraging tussen de omlaag gebrachte link en het melden hiervan aan de"
+" ‘runner’."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:42
 #: ../src/connection-editor/ce-page-team.ui.h:89
 msgid "The interval between requests being sent."
-msgstr ""
+msgstr "De interval tussen verzoeken die verzonden worden."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:43
 #: ../src/connection-editor/ce-page-team.ui.h:90
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr ""
+"De vertraging tussen ‘link watch initialization’ en het eerste verzoek dat"
+" verzonden wordt."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:44
 #: ../src/connection-editor/ce-page-team.ui.h:91
 msgid "The link watcher to be used."
-msgstr ""
+msgstr "De te gebruiken link watcher."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:45
 #: ../src/connection-editor/ce-page-team.ui.h:92
 msgid "Link Watcher"
-msgstr ""
+msgstr "Link Watcher"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:46
 #: ../src/connection-editor/ce-page-team.ui.h:93
-#, fuzzy
 msgid "Im_port team configuration from a file…"
-msgstr "Een opgeslagen team-configuratie importeren…"
+msgstr "Team-configuratie i_mporteren uit bestand…"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:47
 #: ../src/connection-editor/ce-page-team.ui.h:94
-#, fuzzy
 msgid "Edit _JSON configuration:"
-msgstr "_JSON config:"
+msgstr "_JSON-configuratie bewerken:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:48
 #: ../src/connection-editor/ce-page-team.ui.h:95
 msgid "Raw Configuration"
-msgstr ""
+msgstr "Ruwe configuratie"
 
 #: ../src/connection-editor/ce-page-team.ui.h:1
 msgid "Highest priority"
-msgstr ""
+msgstr "Hoogste prioriteit"
 
 #: ../src/connection-editor/ce-page-team.ui.h:2
 msgid "Highest priority (stable)"
-msgstr ""
+msgstr "Hoogste prioriteit (stabiel)"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-#, fuzzy
 msgid "Bandwidth"
-msgstr "Groepsbandbreedte:"
+msgstr "Bandbreedte"
 
 #: ../src/connection-editor/ce-page-team.ui.h:4
 msgid "Highest number of ports"
-msgstr ""
+msgstr "Hoogste aantal poorten"
 
 #: ../src/connection-editor/ce-page-team.ui.h:5
-#, fuzzy
 msgid "Port priority"
-msgstr "Prioriteit"
+msgstr "Poortprioriteit"
 
 #: ../src/connection-editor/ce-page-team.ui.h:6
-#, fuzzy
 msgid "From the team device"
-msgstr "Ethernet-apparaat"
+msgstr "Van het teamapparaat"
 
 #: ../src/connection-editor/ce-page-team.ui.h:7
 msgid "From the active port"
-msgstr ""
+msgstr "Van de actieve poort"
 
 #: ../src/connection-editor/ce-page-team.ui.h:8
 msgid "From active to team device"
-msgstr ""
+msgstr "Van actief naar teamapparaat"
 
 #: ../src/connection-editor/ce-page-team.ui.h:12
 msgid "_Teamed connections:"
@@ -2519,111 +2754,113 @@
 
 #: ../src/connection-editor/ce-page-team.ui.h:23
 msgid "Load balance"
-msgstr ""
+msgstr "Loadbalancing"
 
 #: ../src/connection-editor/ce-page-team.ui.h:24
 msgid "LACP"
-msgstr ""
+msgstr "LACP"
 
 #: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/connection-helpers.c:105
 #: ../src/connection-editor/page-ethernet.c:351
 #: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/connection-helpers.c:120
 #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
 #: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
 #: ../src/connection-editor/ce-page-team.ui.h:31
-#, fuzzy
 msgid "IP"
-msgstr "FIP"
+msgstr "IP"
 
 #: ../src/connection-editor/ce-page-team.ui.h:32
 msgid "Any L3 protocol"
-msgstr ""
+msgstr "Elk L3-protocol"
 
 #: ../src/connection-editor/ce-page-team.ui.h:33
-#, fuzzy
 msgid "TCP"
-msgstr "GTC"
+msgstr "TCP"
 
 #: ../src/connection-editor/ce-page-team.ui.h:34
 msgid "UDP"
-msgstr ""
+msgstr "UDP"
 
 #: ../src/connection-editor/ce-page-team.ui.h:35
 msgid "SCTP"
-msgstr ""
+msgstr "SCTP"
 
 #: ../src/connection-editor/ce-page-team.ui.h:36
 msgid "Any L4 protocol"
-msgstr ""
+msgstr "Elk L4-protocol"
 
 #: ../src/connection-editor/ce-page-team.ui.h:38
 msgid "_Peer notification count:"
-msgstr ""
+msgstr "_Peer notification count:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:39
 msgid "Peer _notification interval:"
-msgstr ""
+msgstr "Peer _notification interval:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:40
 msgid "_Multicast rejoin count:"
-msgstr ""
+msgstr "_Multicast rejoin count:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:41
 msgid "Multicast _rejoin interval:"
-msgstr ""
+msgstr "Multicast _rejoin interval:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:46
-#, fuzzy
 msgid "_Hardware Address:"
-msgstr "Hardware-adres:"
+msgstr "_Hardware-adres:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:47
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
 msgstr ""
+"Gewenst hardwareadres van het nieuwe teamapparaat. Doorgaans wordt het"
+" MAC-adres geaccepteerd."
 
 #: ../src/connection-editor/ce-page-team.ui.h:49
 msgid "_Runner:"
-msgstr ""
+msgstr "_Runner:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:50
-#, fuzzy
 msgid "_Hardware address policy:"
-msgstr "Hardware-adres:"
+msgstr "Beleid _hardware-adres:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:51
 msgid "Name of runner to be used."
-msgstr ""
+msgstr "Naam van te gebruiken runner."
 
 #: ../src/connection-editor/ce-page-team.ui.h:52
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
 msgstr ""
+"Dit bepaalt het beleid van hoe het hardwareadres van het teamapparaat en de"
+" poortapparaten ingesteld moeten worden gedurende de teamlevensduur."
 
 #: ../src/connection-editor/ce-page-team.ui.h:53
 msgid "Send LACPDU frames _periodically"
-msgstr ""
+msgstr "_Periodiek LACPDU-frames verzenden"
 
 #: ../src/connection-editor/ce-page-team.ui.h:54
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
 msgstr ""
+"Indien aangevinkt worden LACPDU-frames periodiek langs de geconfigureerde"
+" links verzonden. Zo niet, dan fungeert het als ‘spreek wanneer aangesproken’."
 
 #: ../src/connection-editor/ce-page-team.ui.h:55
 msgid "Send a LACPDU frame _every second"
-msgstr ""
+msgstr "_Elke seconde een LACPDU-frame verzenden"
 
 #: ../src/connection-editor/ce-page-team.ui.h:56
 msgid ""
@@ -2631,67 +2868,73 @@
 "LACPDU packets. If checked, packets will be sent once per second. Otherwise "
 "they will be sent every 30 seconds."
 msgstr ""
+"Optie specificeert de snelheid waarmee onze link partner gevraagd wordt"
+" LACPDU-pakketten over te brengen. Indien aangevinkt zullen pakketten een"
+" keer per seconde verzonden worden. Anders worden ze elke 30 seconden"
+" verzonden."
 
 #: ../src/connection-editor/ce-page-team.ui.h:57
-#, fuzzy
 msgid "_System priority:"
-msgstr "_Prioriteit:"
+msgstr "_Systeemprioriteit:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:58
 msgid "_Minimum ports:"
-msgstr ""
+msgstr "_Minimum aantal poorten:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:59
 msgid "_Aggregator selection policy:"
-msgstr ""
+msgstr "_Aggregator selection policy:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:60
 msgid "System priority, value can be 0 – 65535."
-msgstr ""
+msgstr "Systeemprioriteit, waarde kan 0 – 65535 zijn."
 
 #: ../src/connection-editor/ce-page-team.ui.h:61
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
 msgstr ""
+"Specificeert het minimum aantal poorten dat actief moet zijn alvorens de"
+" carrier in de masterinterface te doen gelden; waarde kan 1 – 255 zijn."
 
 #: ../src/connection-editor/ce-page-team.ui.h:62
 msgid "This selects the policy of how the aggregators will be selected."
-msgstr ""
+msgstr "Dit selecteert het beleid hoe de aggregators gekozen zullen worden."
 
 #: ../src/connection-editor/ce-page-team.ui.h:63
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
 msgstr ""
+"Lijst met fragmenttypes (tekenreeksen) die gebruikt moeten worden voor pakket"
+" Tx hashberekening."
 
 #: ../src/connection-editor/ce-page-team.ui.h:64
 msgid "_Fields for transmission hash"
-msgstr ""
+msgstr "_Velden voor transmissiehash"
 
 #: ../src/connection-editor/ce-page-team.ui.h:65
 msgid "In tenths of a second. Periodic interval between rebalancing."
-msgstr ""
+msgstr "In tienden van seconden. Periodieke interval tussen ‘rebalancing’."
 
 #: ../src/connection-editor/ce-page-team.ui.h:66
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
+"Naam van actieve Tx-balancer. Actieve Tx-balancing is standaard uitgeschakeld."
 
 # signaalsterkte
 #: ../src/connection-editor/ce-page-team.ui.h:67
-#, fuzzy
 msgid "Transmission _balancing interval:"
-msgstr "Si_gnaalsterkte:"
+msgstr "Interval transmission _balancing:"
 
 # signaalsterkte
 #: ../src/connection-editor/ce-page-team.ui.h:68
-#, fuzzy
 msgid "_Transmission balancer:"
-msgstr "Si_gnaalsterkte:"
+msgstr "_Transmission balancer:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:69
 msgid "Runner"
-msgstr ""
+msgstr "Runner"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
@@ -2798,6 +3041,7 @@
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
+#: ../src/connection-editor/ce-polkit.c:63
 #: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Polkit-autorisatie om deze actie uit te voeren mislukt"
@@ -2849,7 +3093,6 @@
 msgstr "Microsoft Challenge Handshake Authentication Protocol version 2"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
-#, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -2858,59 +3101,64 @@
 "aanmeldingsmethodes ondersteunen. Wanneer er problemen zijn met verbinden "
 "kunt u proberen de ondersteuning voor bepaalde methodes uit te schakelen."
 
-#: ../src/connection-editor/connection-helpers.c:105
+#: ../src/connection-editor/connection-helpers.c:106
 #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wifi"
 
-#: ../src/connection-editor/connection-helpers.c:113
+#: ../src/connection-editor/connection-helpers.c:114
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
-
 #: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-dsl.c:201
+msgid "DSL/PPPoE"
+msgstr "DSL/PPPoE"
+
+#: ../src/connection-editor/connection-helpers.c:116
 #: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:117
 #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Gebundeld"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Team"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-bridge.c:212
+#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/page-bridge.c:233
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/connection-helpers.c:121
 #: ../src/connection-editor/page-ip-tunnel.c:176
 msgid "IP tunnel"
-msgstr ""
+msgstr "IP-tunnel"
 
 #: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
+#: ../src/connection-editor/page-macsec.c:190
+msgid "MACsec"
+msgstr "MACsec"
+
+#: ../src/connection-editor/connection-helpers.c:124
+#: ../src/connection-editor/connection-helpers.c:398
 #: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "VPN"
 
 # 'missing' is beter dat 'no'
-#: ../src/connection-editor/connection-helpers.c:205
+#: ../src/connection-editor/connection-helpers.c:207
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2921,64 +3169,70 @@
 "Foutmelding: type VPN-service ontbreekt."
 
 # Netwerken
-#: ../src/connection-editor/connection-helpers.c:217
+#: ../src/connection-editor/connection-helpers.c:219
 msgid "Cannot import VPN connection"
 msgstr "Kan VPN-verbinding niet importeren"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
+#: ../src/connection-editor/connection-helpers.c:221
+#, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
 "connection information\n"
 "\n"
 "Error: %s."
 msgstr ""
-"Het bestand ‘%s’ kon niet gelezen worden of het bevat geen erkende VPN-"
-"verbindingsinformatie\n"
+"Het bestand ‘%s’ kon niet gelezen worden of het bevat geen erkende"
+" VPN-verbindingsinformatie\n"
 "\n"
 "Foutmelding: %s."
 
-#: ../src/connection-editor/connection-helpers.c:220
+#: ../src/connection-editor/connection-helpers.c:222
 msgid "unknown error"
 msgstr "Onbekende fout"
 
-#: ../src/connection-editor/connection-helpers.c:303
+#: ../src/connection-editor/connection-helpers.c:305
 #: ../src/connection-editor/page-proxy.c:118
 #: ../src/connection-editor/page-team.c:341
 #: ../src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Bestand selecteren voor import"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: ../src/connection-editor/connection-helpers.c:309
+#: ../src/connection-editor/page-proxy.c:122
+#: ../src/connection-editor/page-team.c:345
+#: ../src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr "_Openen"
+
+#: ../src/connection-editor/connection-helpers.c:340
 msgid "Hardware"
 msgstr "Apparatuur"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: ../src/connection-editor/connection-helpers.c:367
 msgid "Virtual"
 msgstr "Virtueel"
 
-#: ../src/connection-editor/connection-helpers.c:514
 #: ../src/connection-editor/connection-helpers.c:516
-#, fuzzy
+#: ../src/connection-editor/connection-helpers.c:518
 msgid "Import a saved VPN configuration…"
 msgstr "Een opgeslagen VPN-configuratie importeren…"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: ../src/connection-editor/connection-helpers.c:548
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
-"De verbindingbewerker kon niet gestart worden vanwege een onbekende fout."
+"De verbindingseditor kon niet gestart worden vanwege een onbekende fout."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: ../src/connection-editor/connection-helpers.c:557
 msgid "Could not create new connection"
 msgstr "Kon geen nieuwe verbinding aanmaken"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: ../src/connection-editor/connection-helpers.c:720
 msgid "Connection delete failed"
 msgstr "Verbinding verwijderen is mislukt"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: ../src/connection-editor/connection-helpers.c:768
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Weet u zeker dat u de verbinding %s wilt verwijderen?"
@@ -3012,237 +3266,253 @@
 msgid "Prefix"
 msgstr "Voorvoegsel"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: ../src/connection-editor/nm-connection-editor.c:109
 #, c-format
 msgid "Editing %s"
 msgstr "Bezig met bewerken van %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: ../src/connection-editor/nm-connection-editor.c:113
 msgid "Editing un-named connection"
 msgstr "Naamloze verbinding bewerken"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: ../src/connection-editor/nm-connection-editor.c:133
 msgid "Missing connection name"
 msgstr "Naam van verbinding ontbreekt"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
-#, fuzzy
+#: ../src/connection-editor/nm-connection-editor.c:353
 msgid "Editor initializing…"
 msgstr "Editor initialiseren…"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: ../src/connection-editor/nm-connection-editor.c:360
+#: ../src/connection-editor/nm-connection-list.c:443
 msgid "Connection cannot be modified"
 msgstr "Verbinding kan n iet worden gewijzigd"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: ../src/connection-editor/nm-connection-editor.c:375
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Ongeldige instelling %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: ../src/connection-editor/nm-connection-editor.c:451
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
-"De verbindingbewerker kon bepaalde vereiste bronnen niet vinden (het .ui-"
-"bestand werd niet gevonden)."
+"De verbindingseditor kon bepaalde vereiste bronnen niet vinden (het"
+" .ui-bestand werd niet gevonden)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "Op_slaan"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/nm-connection-editor.c:579
 msgid "Save any changes made to this connection."
 msgstr "De wijzigingen opslaan die aan deze verbinding zijn aangebracht."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: ../src/connection-editor/nm-connection-editor.c:580
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Beheerwachtwoord invoeren om deze verbinding op te slaan voor alle "
 "gebruikers van deze computer."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not create connection"
 msgstr "Kon geen verbinding leggen"
 
 # geen netwerk/netwerkverbinding
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not edit connection"
 msgstr "Kon de verbinding niet bewerken"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: ../src/connection-editor/nm-connection-editor.c:598
 msgid "Unknown error creating connection editor dialog."
 msgstr "Onbekende fout bij aanmaken van het verbindingseditorvenster."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: ../src/connection-editor/nm-connection-editor.c:739
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
 msgstr ""
+"Waarschuwing: de verbinding bevat enkele eigenschappen die niet ondersteund"
+" worden door de editor. Ze zullen bij opslaan gewist worden."
 
-#: ../src/connection-editor/nm-connection-editor.c:758
+#: ../src/connection-editor/nm-connection-editor.c:759
 msgid "Error initializing editor"
 msgstr "Fout bij het initialiseren van de editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: ../src/connection-editor/nm-connection-editor.c:1157
 msgid "Connection add failed"
 msgstr "Verbinding toevoegen is mislukt"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr "_Sluiten"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Fix"
-msgstr ""
+msgstr "Repareren"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#, fuzzy
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
-"Stel dit in op ‘true’ om waarschuwingen over CA-certificaten in EAP-"
-"authenticatie te onderdrukken."
+"Het kan zijn dat beveiligingslabels voorkomen dat sommige bestanden gebruikt"
+" worden met certificaat-authenticatie."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "_Naam verbinding:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-#, fuzzy
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "_Export…"
 msgstr "_Exporteren…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
 msgid "File Relabel"
-msgstr ""
+msgstr "Bestand een nieuw label geven"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-#, fuzzy
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "_Relabel"
-msgstr "label"
+msgstr "_Nieuw label geven"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
+"De volgende bestanden zijn niet van een label voorzien voor gebruik met"
+" certificaatauthenticatie. Wilt u de labels aanpassen?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
-#, fuzzy
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
 msgid "Relabel"
-msgstr "label"
+msgstr "Nieuw label geven"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
 msgid "Filename"
-msgstr ""
+msgstr "Bestandsnaam"
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: ../src/connection-editor/nm-connection-list.c:151
 msgid "never"
 msgstr "nooit"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:173
 msgid "now"
 msgstr "nu"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: ../src/connection-editor/nm-connection-list.c:180
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuut geleden"
 msgstr[1] "%d minuten geleden"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: ../src/connection-editor/nm-connection-list.c:184
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d uur geleden"
 msgstr[1] "%d uur geleden"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:196
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag geleden"
 msgstr[1] "%d dagen geleden"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: ../src/connection-editor/nm-connection-list.c:202
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d maand geleden"
 msgstr[1] "%d maanden geleden"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: ../src/connection-editor/nm-connection-list.c:206
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d jaar geleden"
 msgstr[1] "%d jaar geleden"
 
-#: ../src/connection-editor/nm-connection-list.c:635
+#: ../src/connection-editor/nm-connection-list.c:445
+#| msgid "Connection cannot be modified"
+msgid "Connection cannot be deleted"
+msgstr "Verbinding kan niet worden verwijderd"
+
+#: ../src/connection-editor/nm-connection-list.c:448
+#| msgid "Team connection %d"
+msgid "Select a connection to edit"
+msgstr "Een te bewerken verbinding selecteren"
+
+#: ../src/connection-editor/nm-connection-list.c:450
+#| msgid "Team connection %d"
+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.h:2
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: ../src/connection-editor/nm-connection-list.c:798
 msgid "Last Used"
 msgstr "Laatst gebruikt"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: ../src/connection-editor/nm-connection-list.c:836
 msgid "Edit the selected connection"
 msgstr "De geselecteerde verbinding bewerken"
 
 # hier wordt bedoeld dat je het systeembeheerderswachtwoord invoert
-#: ../src/connection-editor/nm-connection-list.c:697
+#: ../src/connection-editor/nm-connection-list.c:837
 msgid "Authenticate to edit the selected connection"
 msgstr "Beheerwachtwoord invoeren om de geselecteerde verbinding te bewerken"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: ../src/connection-editor/nm-connection-list.c:842
 msgid "Delete the selected connection"
 msgstr "De geselecteerde verbinding verwijderen"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: ../src/connection-editor/nm-connection-list.c:843
 msgid "Authenticate to delete the selected connection"
 msgstr ""
 "Beheerwachtwoord invoeren om de geselecteerde verbinding te verwijderen"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:1048
+#: ../src/connection-editor/nm-connection-list.c:1051
 msgid "Error creating connection"
 msgstr "Fout bij het aanmaken van de verbinding"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:1049
 msgid "No VPN plugins are installed."
 msgstr "Er zijn geen invoegtoepassingen geïnstalleerd voor VPN."
 
-#: ../src/connection-editor/nm-connection-list.c:939
-#, fuzzy, c-format
+#: ../src/connection-editor/nm-connection-list.c:1052
+#, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Weet niet hoe ‘%s’-verbindingen aan te maken"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: ../src/connection-editor/nm-connection-list.c:1085
 msgid "Error editing connection"
 msgstr "Fout bij het bewerken van de verbinding"
 
-#: ../src/connection-editor/nm-connection-list.c:971
-#, fuzzy, c-format
+#: ../src/connection-editor/nm-connection-list.c:1086
+#, c-format
 msgid "Did not find a connection with UUID “%s”"
-msgstr "Kon geen verbinding met UUID ‘%s’ vinden"
+msgstr "Geen verbinding met UUID ‘%s’ gevonden"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+# Netwerken
+#: ../src/connection-editor/nm-connection-list.ui.h:2
+msgid "Add a new connection"
+msgstr "Een nieuwe verbindingen toevoegen"
+
+#: ../src/connection-editor/page-8021x-security.c:116
 msgid "802.1X Security"
 msgstr "802.1X-beveiliging"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: ../src/connection-editor/page-8021x-security.c:118
 msgid "Could not load 802.1X Security user interface."
 msgstr "Kon de gebruikersinterface voor 802.1X-beveiliging niet laden."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: ../src/connection-editor/page-8021x-security.c:132
 msgid "Use 802.1_X security for this connection"
 msgstr "Gebruik 802.1_X-beveiliging voor deze verbinding"
 
@@ -3295,11 +3565,11 @@
 msgid "Bond connection %d"
 msgstr "Bundelverbinding %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:236
 msgid "Could not load bridge user interface."
 msgstr "Kon de gebruikersinterface voor een bridge niet laden."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: ../src/connection-editor/page-bridge.c:352
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Bridgeverbinding %d"
@@ -3323,17 +3593,21 @@
 msgid "Could not load DCB user interface."
 msgstr "Kon de DCB-gebruikersinterface niet laden."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: ../src/connection-editor/page-dsl.c:203
 msgid "Could not load DSL user interface."
 msgstr "Kon de DSL-gebruikersschil niet laden."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: ../src/connection-editor/page-dsl.c:298
+#| msgid "_Parent interface:"
+msgid "missing parent interface"
+msgstr "geen bovenliggende interface"
+
+#: ../src/connection-editor/page-dsl.c:343
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-verbinding %d"
 
 #: ../src/connection-editor/page-ethernet.c:81
-#, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: “em1”, "
@@ -3341,11 +3615,10 @@
 msgstr ""
 "Deze optie verbindt deze verbinding aan het netwerkapparaat dat opgegeven is "
 "middels de interfacenaam of het vaste MAC-adres ervan of beide. Voorbeelden: "
-"\"em1\", \"3C:97:0E:42:1A:19\", \"em1 (3C:97:0E:42:1A:19)\""
+"‘em1’, ‘3C:97:0E:42:1A:19’, ‘em1 (3C:97:0E:42:1A:19)’"
 
 # niet gebruikt/genegeerd
 #: ../src/connection-editor/page-ethernet.c:262
-#, fuzzy
 msgid "ignored"
 msgstr "Genegeerd"
 
@@ -3394,7 +3667,6 @@
 msgstr "Kon de gebruikersinterface Algemeen niet laden."
 
 #: ../src/connection-editor/page-infiniband.c:57
-#, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: “ib0”, “80:00:00:48:"
@@ -3403,8 +3675,8 @@
 msgstr ""
 "Deze optie verbindt deze verbinding aan het netwerkapparaat dat opgegeven is "
 "middels de interfacenaam of het vaste MAC-adres ervan of beide. Voorbeelden: "
-"\"ib0\", \"80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65\", "
-"\"ib0 (80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)\""
+"‘ib0’, ‘80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65’, "
+"‘ib0 (80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)’"
 
 #: ../src/connection-editor/page-infiniband.c:151
 msgid "Could not load InfiniBand user interface."
@@ -3420,14 +3692,13 @@
 msgstr "InfiniBandverbinding %d"
 
 #: ../src/connection-editor/page-ip-tunnel.c:178
-#, fuzzy
 msgid "Could not load IP tunnel user interface."
-msgstr "Kon de IPv4-gebruikersschil niet laden."
+msgstr "Laden van de IPv4-gebruikersinterface is mislukt."
 
 #: ../src/connection-editor/page-ip-tunnel.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "IP tunnel connection %d"
-msgstr "Ethernetverbinding %d"
+msgstr "IP tunnelverbinding %d"
 
 #: ../src/connection-editor/page-ip4.c:127
 #: ../src/connection-editor/page-ip6.c:130
@@ -3493,24 +3764,24 @@
 msgstr "Kon de IPv4-gebruikersschil niet laden."
 
 #: ../src/connection-editor/page-ip4.c:1321
-#, fuzzy, c-format
+#, c-format
 msgid "IPv4 address “%s” invalid"
-msgstr "IPv4-adres ‘%s’ ongeldig"
+msgstr "IPv4-adres ‘%s’ is ongeldig"
 
 #: ../src/connection-editor/page-ip4.c:1329
-#, fuzzy, c-format
+#, c-format
 msgid "IPv4 address netmask “%s” invalid"
-msgstr "Netwerkmasker van IPv4-adres ‘%s’ ongeldig"
+msgstr "Netwerkmasker van IPv4-adres ‘%s’ is ongeldig"
 
 #: ../src/connection-editor/page-ip4.c:1338
-#, fuzzy, c-format
+#, c-format
 msgid "IPv4 gateway “%s” invalid"
-msgstr "IPv4-gateway ‘%s’ ongeldig"
+msgstr "IPv4-gateway ‘%s’ is ongeldig"
 
 #: ../src/connection-editor/page-ip4.c:1381
-#, fuzzy, c-format
+#, c-format
 msgid "IPv4 DNS server “%s” invalid"
-msgstr "IPv4 DNS-server ‘%s’ ongeldig"
+msgstr "IPv4 DNS-server ‘%s’ is ongeldig"
 
 #: ../src/connection-editor/page-ip6.c:173
 msgid "Automatic, DHCP only"
@@ -3530,24 +3801,35 @@
 msgstr "Kon de IPv6-gebruikersinterface niet laden."
 
 #: ../src/connection-editor/page-ip6.c:1277
-#, fuzzy, c-format
+#, c-format
 msgid "IPv6 address “%s” invalid"
-msgstr "IPv6-adres ‘%s’ ongeldig"
+msgstr "IPv6-adres ‘%s’ is ongeldig"
 
 #: ../src/connection-editor/page-ip6.c:1285
-#, fuzzy, c-format
+#, c-format
 msgid "IPv6 prefix “%s” invalid"
-msgstr "IPv6-prefix ‘%s’ ongeldig"
+msgstr "IPv6-prefix ‘%s’ is ongeldig"
 
 #: ../src/connection-editor/page-ip6.c:1294
-#, fuzzy, c-format
+#, c-format
 msgid "IPv6 gateway “%s” invalid"
-msgstr "IPv6-gateway ‘%s’ ongeldig"
+msgstr "IPv6-gateway ‘%s’ is ongeldig"
 
 #: ../src/connection-editor/page-ip6.c:1336
-#, fuzzy, c-format
+#, c-format
 msgid "IPv6 DNS server “%s” invalid"
-msgstr "IPv6 DNS-server ‘%s’ ongeldig"
+msgstr "IPv6 DNS-server ‘%s’ is ongeldig"
+
+#: ../src/connection-editor/page-macsec.c:192
+#| msgid "Could not load WiMAX user interface."
+msgid "Could not load MACsec user interface."
+msgstr "Laden van de gebruikersinterface voor MACsec-gebruiker is mislukt."
+
+#: ../src/connection-editor/page-macsec.c:331
+#, c-format
+#| msgid "WiMAX connection %d"
+msgid "MACSEC connection %d"
+msgstr "MACSEC-verbinding %d"
 
 #: ../src/connection-editor/page-master.c:247
 #: ../src/connection-editor/page-master.c:258
@@ -3555,18 +3837,18 @@
 msgstr "Duplicaat-slaves"
 
 #: ../src/connection-editor/page-master.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Slaves ‘%s’ en ‘%s’ gelden beide voor apparaat ‘%s’"
 
 #: ../src/connection-editor/page-master.c:259
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
-"Slaves ‘%s’ en ‘%s’ gelden voor verschillende virtuele poorten (‘%s’ en "
-"‘%s’) van hetzelfde fysieke apparaat."
+"Slaves ‘%s’ en ‘%s’ gelden voor verschillende virtuele poorten (‘%s’ en ‘%s’)"
+" van hetzelfde fysieke apparaat."
 
 #: ../src/connection-editor/page-master.c:385
 #, c-format
@@ -3588,13 +3870,12 @@
 msgstr "Selecteer verbindingstype voor mobiel breedband"
 
 #: ../src/connection-editor/page-mobile.c:567
-#, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr ""
-"Selecteer de technologie die uw mobiele breedbandprovider gebruikt. Vraag "
-"het uw provider wanneer u het niet zeker weet."
+"Selecteer de technologie die uw mobiele breedbandprovider gebruikt. Vraag het"
+" uw provider wanneer u het niet zeker weet."
 
 # GSM-gebaseerde/GSM-technologie
 #: ../src/connection-editor/page-mobile.c:572
@@ -3609,38 +3890,34 @@
 msgstr "Mijn provider gebruikt C_DMA-technologie (bijv. 1xRTT, EVDO)"
 
 #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: ../src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
 #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: ../src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
 #: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: ../src/wireless-security/eap-method-ttls.c:287
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: ../src/wireless-security/eap-method-fast.c:282
+#: ../src/wireless-security/eap-method-peap.c:299
+#: ../src/wireless-security/eap-method-ttls.c:317
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: ../src/wireless-security/eap-method-ttls.c:302
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3665,24 +3942,22 @@
 
 #: ../src/connection-editor/page-proxy.c:215
 msgid "Proxy"
-msgstr ""
+msgstr "Proxy"
 
 #: ../src/connection-editor/page-proxy.c:217
-#, fuzzy
 msgid "Could not load proxy user interface."
-msgstr "Kon de gebruikersinterface voor bundeling niet laden."
+msgstr "Laden van proxy-gebruikersinterface is mislukt."
 
 #: ../src/connection-editor/page-team.c:361
 #: ../src/connection-editor/page-team-port.c:223
-#, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Fout: bestand bevat geen geldige JSON-configuratie"
 
-#: ../src/connection-editor/page-team.c:1156
+#: ../src/connection-editor/page-team.c:1034
 msgid "Could not load team user interface."
 msgstr "Kon de team-gebruikersinterface niet laden."
 
-#: ../src/connection-editor/page-team.c:1253
+#: ../src/connection-editor/page-team.c:1131
 #, c-format
 msgid "Team connection %d"
 msgstr "Team-verbinding %d"
@@ -3690,11 +3965,11 @@
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: ../src/connection-editor/page-team-port.c:655
 msgid "Team Port"
 msgstr "Teampoort"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: ../src/connection-editor/page-team-port.c:657
 msgid "Could not load team port user interface."
 msgstr "Kon de gebruikersinterface voor een teampoort niet laden."
 
@@ -3702,13 +3977,13 @@
 #. * second is a connection name (eg, "Auto Ethernet").
 #.
 #: ../src/connection-editor/page-vlan.c:415
-#, fuzzy, c-format
+#, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (via ‘%s’)"
 
 # geen netwerk/netwerkverbinding
 #: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#, c-format
 msgid "New connection…"
 msgstr "Nieuwe verbinding…"
 
@@ -3730,19 +4005,18 @@
 msgstr "Kon de VPN-gebruikersinterface niet laden."
 
 #: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
+#, c-format
 msgid "Could not find VPN plugin for “%s”."
-msgstr "Kon de VPN-plugin voor ‘%s’ niet vinden."
+msgstr "VPN-plugin voor ‘%s’ niet gevonden."
 
 #: ../src/connection-editor/page-vpn.c:122
-#, fuzzy, c-format
+#, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
-msgstr "Kon de VPN-plugin voor ‘%s’ niet vinden."
+msgstr "Laden van de VPN-plugin-editor voor ‘%s’ (%s) is mislukt."
 
 #: ../src/connection-editor/page-vpn.c:123
-#, fuzzy
 msgid "unknown failure"
-msgstr "Verbindingsfout"
+msgstr "Onbekende fout"
 
 #: ../src/connection-editor/page-vpn.c:205
 #, c-format
@@ -3755,35 +4029,33 @@
 msgstr "Een VPN-verbindingstype kiezen"
 
 #: ../src/connection-editor/page-vpn.c:212
-#, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
 "of VPN connection you wish to create does not appear in the list, you may "
 "not have the correct VPN plugin installed."
 msgstr ""
-"Selecteer het type VPN dat u voor de nieuwe verbinding gebruiken wilt. "
+"Selecteer het type VPN dat u voor de nieuwe verbinding wilt gebruiken. "
 "Wanneer het gewenste type VPN-verbinding niet in de lijst voorkomt is de "
 "juiste VPN-plugin mogelijk niet geïnstalleerd."
 
 #: ../src/connection-editor/page-wifi.c:77
-#, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
 "by the BSSID entered here. Example: 00:11:22:33:44:55"
 msgstr ""
-"Deze optie vergrendelt deze verbinding aan het wifi-toegangspunt (AP) "
+"Deze optie vergrendelt deze verbinding met het wifi-toegangspunt (AP) "
 "gespecificeerd door de hier ingevoerde BSSID. Voorbeeld: 00:11:22:33:44:55"
 
 #: ../src/connection-editor/page-wifi.c:88
-#, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: “wlan0”, "
 "“3C:97:0E:42:1A:19”, “wlan0 (3C:97:0E:42:1A:19)”"
 msgstr ""
-"Deze optie verbindt deze verbinding aan het netwerkapparaat dat opgegeven is "
+"Deze optie vergrendelt deze verbinding met het netwerkapparaat dat opgegeven"
+" is "
 "middels de interfacenaam of het vaste MAC-adres ervan of beide. Voorbeelden: "
-"\"wlan0\", \"3C:97:0E:42:1A:19\", \"wlan0 (3C:97:0E:42:1A:19)\""
+"‘wlan0’, ‘3C:97:0E:42:1A:19’, ‘wlan0 (3C:97:0E:42:1A:19)’"
 
 #: ../src/connection-editor/page-wifi.c:197
 #, c-format
@@ -3807,31 +4079,31 @@
 msgid "Wi-Fi connection %d"
 msgstr "Wifi-verbinding %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
+#: ../src/connection-editor/page-wifi-security.c:358
 #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit sleutel (Hex or ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
+#: ../src/connection-editor/page-wifi-security.c:368
 #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit wachtwoordzin"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: ../src/connection-editor/page-wifi-security.c:394
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamisch WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
+#: ../src/connection-editor/page-wifi-security.c:407
 #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 persoonlijk"
 
-#: ../src/connection-editor/page-wifi-security.c:418
+#: ../src/connection-editor/page-wifi-security.c:420
 #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 zakelijk"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: ../src/connection-editor/page-wifi-security.c:463
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Laden van gebruikersinterface voor beveiliging wifi-netwerk mislukt; wifi-"
@@ -3839,26 +4111,26 @@
 
 # Bedoeld wordt beveiliging van het draadloos netwerk.
 # niet dat de beveiling draadloos is.
-#: ../src/connection-editor/page-wifi-security.c:472
+#: ../src/connection-editor/page-wifi-security.c:474
 msgid "Wi-Fi Security"
 msgstr "Wifi-beveiliging"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: ../src/connection-editor/page-wifi-security.c:476
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Laden van gebruikersinterface voor wifi-beveiliging mislukt."
 
-#: ../src/connection-editor/page-wifi-security.c:558
+#: ../src/connection-editor/page-wifi-security.c:560
 #, c-format
 msgid "missing SSID"
 msgstr "Ontbrekende SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:564
+#: ../src/connection-editor/page-wifi-security.c:566
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Beveiliging niet compatibel met Ad-Hoc-modus"
 
 #: ../src/connection-editor/vpn-helpers.c:132
-#, fuzzy, c-format
+#, c-format
 msgid "A file named “%s” already exists."
 msgstr "Een bestand met de naam ‘%s’ bestaat al."
 
@@ -3877,7 +4149,7 @@
 msgstr "Kan VPN-verbinding niet exporteren"
 
 #: ../src/connection-editor/vpn-helpers.c:174
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
 "\n"
@@ -3888,7 +4160,6 @@
 "Foutmelding: %s."
 
 #: ../src/connection-editor/vpn-helpers.c:209
-#, fuzzy
 msgid "Export VPN connection…"
 msgstr "VPN-verbinding exporteren…"
 
@@ -3905,49 +4176,52 @@
 msgid "Connection Information"
 msgstr "Verbindingsinformatie"
 
+#: ../src/info.ui.h:2
+msgid "_Close"
+msgstr "_Sluiten"
+
 #: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Actieve netwerkverbindingen"
 
 #: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
-#, fuzzy
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
 msgid "No certificate set"
-msgstr "Geen CA-certificaat _vereist"
+msgstr "Geen certificaat ingesteld"
 
 #: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
 msgid "No key set"
-msgstr ""
+msgstr "Geen sleutel ingesteld"
 
 #: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
-#, fuzzy, c-format
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#, c-format
 msgid "Choose a key for %s Certificate"
-msgstr "CA-certificaat kiezen"
+msgstr "Kies een sleutel voor certificaat %s"
 
 #: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
-#, fuzzy, c-format
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
+#, c-format
 msgid "%s private _key:"
-msgstr "_Privésleutel:"
+msgstr "%s privé_sleutel:"
 
 #: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
-#, fuzzy, c-format
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#, c-format
 msgid "%s key _password:"
-msgstr "Privésleutel _wachtwoord:"
+msgstr "Wa _chtwoord %s sleutel:"
 
 #: ../src/libnma/nma-file-cert-chooser.c:258
-#, fuzzy, c-format
+#, c-format
 msgid "Choose %s Certificate"
-msgstr "CA-certificaat kiezen"
+msgstr "Kies een %s certificaat"
 
 #: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
-#, fuzzy, c-format
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#, c-format
 msgid "%s _certificate:"
-msgstr "_Gebruikerscertificaat:"
+msgstr "%s _certificaat:"
 
 #: ../src/libnma/nma-mobile-wizard.c:198
 #: ../src/libnm-gtk/nm-mobile-wizard.c:199
@@ -3978,7 +4252,6 @@
 
 #: ../src/libnma/nma-mobile-wizard.c:248
 #: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
 msgid ""
 "A connection will now be made to your mobile broadband provider using the "
 "settings you selected. If the connection fails or you cannot access network "
@@ -3986,11 +4259,10 @@
 "connection settings, choose “Network Connections” from the System → "
 "Preferences menu."
 msgstr ""
-"Er wordt nu een verbinding gemaakt met het mobiele breedbandnetwerk van uw "
-"mobiele internetaanbieder, 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."
+"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.c:261
 #: ../src/libnm-gtk/nm-mobile-wizard.c:262
@@ -4015,7 +4287,6 @@
 
 #: ../src/libnma/nma-mobile-wizard.c:500
 #: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -4037,7 +4308,6 @@
 
 #: ../src/libnma/nma-mobile-wizard.c:557
 #: ../src/libnm-gtk/nm-mobile-wizard.c:558
-#, fuzzy
 msgid "My plan is not listed…"
 msgstr "Mijn abonnement komt niet in de lijst voor…"
 
@@ -4053,7 +4323,6 @@
 
 #: ../src/libnma/nma-mobile-wizard.c:748
 #: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
 msgid "I can’t find my provider and I wish to enter it _manually:"
 msgstr "Ik kan mijn provider niet vinden en wil het hand_matig invoeren:"
 
@@ -4094,9 +4363,8 @@
 
 #: ../src/libnma/nma-mobile-wizard.c:1126
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
 msgid "Choose your Provider’s Country or Region"
-msgstr "Kies het land of regio van uw provider"
+msgstr "Kies het land of de regio van uw provider"
 
 #: ../src/libnma/nma-mobile-wizard.c:1183
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1184
@@ -4125,7 +4393,6 @@
 
 #: ../src/libnma/nma-mobile-wizard.c:1371
 #: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-#, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "De naam van uw breedband-provider"
 
@@ -4162,83 +4429,78 @@
 msgstr "Nieuwe mobiele breedbandverbinding"
 
 # niets/geen
-#: ../src/libnma/nma-cert-chooser-button.c:162
-#, fuzzy
+#: ../src/libnma/nma-cert-chooser-button.c:165
 msgid "(None)"
-msgstr "(geen)"
+msgstr "(Geen)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: ../src/libnma/nma-cert-chooser-button.c:173
 #, c-format
 msgid "Key in %s"
-msgstr ""
+msgstr "Sleutel in %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
-#, fuzzy, c-format
+#: ../src/libnma/nma-cert-chooser-button.c:174
+#, c-format
 msgid "Certificate in %s"
-msgstr "C_A-certificaat:"
+msgstr "Certificaat in %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
+#: ../src/libnma/nma-cert-chooser-button.c:193
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
-#, fuzzy
 msgid "(Unknown)"
-msgstr "Onbekend"
+msgstr "(Onbekend)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: ../src/libnma/nma-cert-chooser-button.c:215
+#: ../src/libnma/nma-cert-chooser-button.c:245
 msgid "Select"
-msgstr ""
+msgstr "Selecteren"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
-#, fuzzy
+#: ../src/libnma/nma-cert-chooser-button.c:216
+#: ../src/libnma/nma-cert-chooser-button.c:246
 msgid "Cancel"
-msgstr "_Annuleren"
+msgstr "Annuleren"
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: ../src/libnma/nma-cert-chooser-button.c:472
 msgid "Select from file…"
-msgstr ""
+msgstr "Uit bestand selecteren…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
-#, fuzzy, c-format
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#, c-format
 msgid "Choose a %s Certificate"
-msgstr "CA-certificaat kiezen"
+msgstr "Kies een %s certificaat"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
-#, fuzzy, c-format
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#, c-format
 msgid "%s certificate _password:"
-msgstr "_Gebruikerscertificaat:"
+msgstr "Wa_chtwoord %s certificaat:"
 
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
-msgstr ""
+msgstr "Fout bij het aanmelden: "
 
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
-#, fuzzy
 msgid "Error opening a session: "
-msgstr "Fout bij het bewerken van de verbinding"
+msgstr "Fout bij het openen van een sessie: "
 
 # openen/ontgrendelen
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
-#, fuzzy
 msgid "_Unlock token"
-msgstr "_Ontgrendelen"
+msgstr "Token _ontgrendelen"
 
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
 msgid "Issued By"
-msgstr ""
+msgstr "Uitgegeven door"
 
 #: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
-msgstr ""
+msgstr "%s PIN-code opgeven"
 
 #: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
 msgid "_Login"
-msgstr ""
+msgstr "_Aanmelden"
 
 #: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
 msgid "_Remember PIN"
-msgstr ""
+msgstr "PIN-code _onthouden"
 
 #: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
@@ -4267,8 +4529,8 @@
 msgid "_Tertiary Password:"
 msgstr "_Derde wachtwoord:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: ../src/libnma/nma-vpn-password-dialog.c:238
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "Wachtwoorden _tonen"
 
@@ -4286,7 +4548,7 @@
 
 #: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
-msgstr ""
+msgstr "Nieuw…"
 
 # zonder/geen
 #: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
@@ -4295,51 +4557,50 @@
 msgstr "Geen"
 
 #: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
-#, fuzzy
 msgid "Dynamic WEP (802.1x)"
-msgstr "Dynamisch WEP (802.1X)"
+msgstr "Dynamisch WEP (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Aanmaken"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
-#, fuzzy, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
-"Wachtwoorden of encryptiesleutels zijn vereist om toegang te krijgen tot het "
-"wifi-netwerk ‘%s’."
+"Wachtwoorden of encryptiesleutels zijn vereist om toegang te krijgen tot het"
+" wifi-netwerk ‘%s’."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Authenticatie wifi-netwerk vereist"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Het wifi-netwerk vereist authenticatie"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Nieuw wifi-netwerk aanmaken"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Nieuw wifi-netwerk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
 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:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Verbinden met verborgen wifi-netwerk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Verborgen wifi-netwerk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4403,8 +4664,8 @@
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"Dit programma is een onderdeel van Netwerkbeheer (https://wiki.gnome.org/"
-"Projects/NetworkManager/)."
+"Dit programma is een onderdeel van Netwerkbeheer"
+" (https://wiki.gnome.org/Projects/NetworkManager/)."
 
 #: ../src/main.c:45
 msgid ""
@@ -4499,25 +4760,25 @@
 msgid "Roaming network"
 msgstr "Netwerk voor roaming (gastgebruik)"
 
-#: ../src/mobile-helpers.c:331
-#, fuzzy, c-format
+#: ../src/mobile-helpers.c:330
+#, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Pincode voor SIM-kaart ‘%s’ op ‘%s’"
 
-#: ../src/mobile-helpers.c:464
+#: ../src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Pincode vereist"
 
-#: ../src/mobile-helpers.c:472
+#: ../src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "De pincode is nodig voor het mobiele breedbandapparaat"
 
-#: ../src/mobile-helpers.c:622
-#, fuzzy, c-format
+#: ../src/mobile-helpers.c:621
+#, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobiele breedbandverbinding ‘%s’ actief: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: ../src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "roaming"
 
@@ -4527,12 +4788,11 @@
 msgid "%s connection"
 msgstr "%s-verbinding"
 
-#: ../src/utils/utils.c:563
-#, fuzzy
+#: ../src/utils/utils.c:565
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
-msgstr "DER- of PEM-certificaten (*.der, *.pem, *.crt, *.cer)"
+msgstr "PEM-certificaten (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: ../src/utils/utils.c:577
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, of PKCS#12 private sleutels (*.der, *.pem, *.p12, *.key)"
 
@@ -4540,39 +4800,33 @@
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "Ongedefinieerde fout in 802.1X beveiliging (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: ../src/wireless-security/eap-method.c:365
+msgid "no CA certificate selected"
+msgstr "Geen CA-certificaat geselecteerd"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
-msgstr "ongespecificeerde fout bij het valideren van eap-method-bestand"
+#: ../src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
+msgstr "het geselecteerde CA-certificaatbestand bestaat niet"
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: ../src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "Ontbrekend EAP-FAST PAC-bestand"
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: ../src/wireless-security/eap-method-fast.c:267
+#: ../src/wireless-security/eap-method-peap.c:329
+#: ../src/wireless-security/eap-method-ttls.c:379
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
-#, fuzzy
+#: ../src/wireless-security/eap-method-fast.c:405
 msgid "Choose a PAC file"
-msgstr "Kies een PAC-bestand…"
+msgstr "Kies een PAC-bestand"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:412
 msgid "PAC files (*.pac)"
 msgstr "PAC-bestanden (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: ../src/wireless-security/eap-method-fast.c:416
 msgid "All files"
 msgstr "Alle bestanden"
 
@@ -4590,7 +4844,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:4
 #: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "Anony_mous identity:"
 msgstr "Anonie_me identiteit:"
 
@@ -4600,7 +4854,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:6
 #: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
 msgid "_Inner authentication:"
 msgstr "_Interne authenticatie:"
 
@@ -4616,27 +4870,12 @@
 msgid "missing EAP-LEAP password"
 msgstr "ontbrekend EAP-LEAP-wachtwoord"
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr "ongeldig EAP-PEAP CA-certificaat: %s"
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr "ongeldig EAP-PEAP CA-certificaat: geen certificaat opgegeven"
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: ../src/wireless-security/eap-method-peap.c:314
+#: ../src/wireless-security/eap-method-ttls.c:364
 #: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Kies een certificaat van een certificaatautoriteit…"
-
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "Versie 0"
@@ -4646,20 +4885,27 @@
 msgstr "Versie 1"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A-certificaat:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
 #: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
 msgid "No CA certificate is _required"
 msgstr "Geen CA-certificaat _vereist"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:6
 msgid "PEAP _version:"
 msgstr "PEAP _versie:"
 
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "Suffix of the server certificate name."
+msgstr "Suffix van de naam van het servercertificaat"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Domain:"
+msgstr "_Domein:"
+
 #: ../src/wireless-security/eap-method-simple.c:75
 msgid "missing EAP username"
 msgstr "ontbrekende EAP-gebruikersnaam"
@@ -4672,49 +4918,29 @@
 msgid "missing EAP-TLS identity"
 msgstr "ontbrekende EAP-TLS-identiteit"
 
-#: ../src/wireless-security/eap-method-tls.c:238
-#, fuzzy
+#: ../src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
-msgstr "Geen CA-certificaat _vereist"
+msgstr "Geen gebruikerscertificaat geselecteerd"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: ../src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
-msgstr ""
+msgstr "geselecteerd gebruikerscertificaatbestand bestaat niet"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
-msgstr ""
+msgstr "geen sleutel geselecteerd"
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: ../src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.c:314
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Geen CA-certificaat _vereist"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
+msgstr "geselecteerde sleutelbestand bestaat niet"
 
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "I_dentiteit:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr "ongeldig EAP-TTLS CA-certificaat: %s"
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr "ongeldig EAP-TTLS CA-certificaat: geen certificaat opgegeven"
-
-#: ../src/wireless-security/eap-method-ttls.c:306
-#, fuzzy
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "MSCHAPv2 (no EAP)"
-msgstr "MSCHAPv2"
+msgstr "MSCHAPv2 (geen EAP)"
 
 #: ../src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
@@ -4791,17 +5017,17 @@
 msgstr "ongeldige wep-sleutel: wachtwoordzin moet minder dan 64 tekens ziijn"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Standaard)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Open System"
 msgstr "Open systeem"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Shared Key"
 msgstr "Gedeelde sleutel"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "1 (Default)"
+msgstr "1 (Standaard)"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key:"
 msgstr "_Sleutel:"
@@ -4833,6 +5059,39 @@
 msgid "_Type:"
 msgstr "_Type:"
 
+#, fuzzy
+#~ msgid "Mode"
+#~ msgstr "M_odus:"
+
+#, fuzzy
+#~ msgid "MTU"
+#~ msgstr "_MTU:"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "unspecified error validating eap-method file"
+#~ msgstr "ongespecificeerde fout bij het valideren van eap-method-bestand"
+
+#~ msgid "invalid EAP-PEAP CA certificate: %s"
+#~ msgstr "ongeldig EAP-PEAP CA-certificaat: %s"
+
+#~ msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+#~ msgstr "ongeldig EAP-PEAP CA-certificaat: geen certificaat opgegeven"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Kies een certificaat van een certificaatautoriteit…"
+
+#~ msgid "C_A certificate:"
+#~ msgstr "C_A-certificaat:"
+
+#~ msgid "invalid EAP-TTLS CA certificate: %s"
+#~ msgstr "ongeldig EAP-TTLS CA-certificaat: %s"
+
+#~ msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+#~ msgstr "ongeldig EAP-TTLS CA-certificaat: geen certificaat opgegeven"
+
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Netwerkbeheerprogramma voor Gnome"
 
@@ -5059,12 +5318,6 @@
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "Automatisch, alleen PPP-adressen"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Kon de gebruikersinterface voor WiMAX niet laden."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX-verbinding %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5187,9 +5440,6 @@
 #~ msgid "Wireless connection %d"
 #~ msgstr "Draadloze verbinding %d"
 
-#~ msgid "_Import"
-#~ msgstr "I_mporteren"
-
 # automatisch verbinding maken
 # de _A wordt voor Annuleren gebruikt. de _U voor MT_U
 #~ msgid "Connect _automatically"
diff -Nru network-manager-applet-1.8.4/po/pl.po network-manager-applet-1.8.10/po/pl.po
--- network-manager-applet-1.8.4/po/pl.po	2017-09-11 12:38:13.000000000 +0000
+++ network-manager-applet-1.8.10/po/pl.po	2017-12-19 11:44:30.000000000 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-10 20:49+0200\n"
-"PO-Revision-Date: 2017-09-10 20:50+0200\n"
+"POT-Creation-Date: 2017-11-26 18:41+0100\n"
+"PO-Revision-Date: 2017-11-26 18:42+0100\n"
 "Last-Translator: Piotr Drąg \n"
 "Language-Team: Polish \n"
 "Language: pl\n"
@@ -155,17 +155,17 @@
 msgid "The NetworkManager Developers"
 msgstr "Programiści projektu NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:477
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "klasa obiektów „%s” nie ma właściwości o nazwie „%s”"
 
-#: ../shared/nm-utils/nm-shared-utils.c:484
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "właściwość „%s” klasy obiektów „%s” nie jest zapisywalna"
 
-#: ../shared/nm-utils/nm-shared-utils.c:491
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -173,19 +173,19 @@
 "właściwość konstruktu „%s” dla obiektu „%s” nie może zostać ustawiona po "
 "konstrukcji"
 
-#: ../shared/nm-utils/nm-shared-utils.c:499
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "„%s::%s” nie jest prawidłową nazwą właściwości, „%s” nie jest podtypem "
 "GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:508
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "nie można ustawić właściwości „%s” typu „%s” z wartości typu „%s”"
 
-#: ../shared/nm-utils/nm-shared-utils.c:519
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -243,12 +243,12 @@
 msgstr "Dodanie/aktywowanie połączenia się nie powiodło"
 
 #: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
 #: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Niepowodzenie połączenia"
 
@@ -264,7 +264,7 @@
 msgid "Connection activation failed"
 msgstr "Aktywacja połączenia się nie powiodła"
 
-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Bez wyświetlania tego komunikatu ponownie"
 
@@ -572,46 +572,46 @@
 msgid "Sending unlock code…"
 msgstr "Wysyłanie kodu odblokowania…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:507
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Komórkowe (%s)"
 
-#: ../src/applet-device-broadband.c:738
+#: ../src/applet-device-broadband.c:739
 #: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Komórkowe"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Dostępne"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 msgid "New Mobile Broadband connection…"
 msgstr "Nowe połączenie komórkowe…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Ustanowiono połączenie"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Połączono z siecią komórkową."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "Sieć komórkowa."
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "Zarejestrowano w sieci domowej."
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "Zarejestrowano w sieci roamingowej."
 
@@ -719,7 +719,7 @@
 msgid "(none)"
 msgstr "(brak)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Dodanie nowego połączenia się nie powiodło"
 
@@ -727,79 +727,79 @@
 msgid "Insufficient privileges."
 msgstr "Niewystarczające uprawnienia."
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Sieci Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Sieć Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Sieć Wi-Fi"
 msgstr[1] "Sieci Wi-Fi"
 msgstr[2] "Sieci Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi jest wyłączone"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi jest wyłączone przez przełącznik sprzętowy"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Więcej sieci"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Dostępne sieci Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Należy użyć menu sieci, aby połączyć z siecią Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Połączono z siecią Wi-Fi „%s”."
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Przygotowywanie połączenia sieciowego Wi-Fi „%s”…"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Konfigurowanie połączenia sieciowego Wi-Fi „%s”…"
 
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Wymagane uwierzytelnienie dla sieci Wi-Fi „%s”…"
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Żądanie adresu sieciowego Wi-Fi dla „%s”…"
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Nawiązano bezprzewodowe połączenie sieciowe Wi-Fi „%s”: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Nawiązano połączenie sieciowe Wi-Fi „%s”"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Aktywowanie połączenia się nie powiodło"
 
@@ -1091,6 +1091,22 @@
 msgid "Show PIN/PUK codes"
 msgstr "Wyświetlanie kodów PIN/PUK"
 
+#: ../src/applet-vpn-request.c:201
+msgid "Connection had no VPN setting"
+msgstr "Połączenie nie ma ustawienia VPN"
+
+#: ../src/applet-vpn-request.c:251
+#, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr ""
+"Zapisanie połączenia do interfejsu użytkownika VPN się nie powiodło: %s (%d)"
+
+#: ../src/applet-vpn-request.c:259
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
+"Zapisanie połączenia do interfejsu użytkownika VPN się nie powiodło: "
+"niepełny zapis"
+
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
 #: ../src/connection-editor/ce-page.h:114
@@ -1106,7 +1122,7 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
 #: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
@@ -1117,7 +1133,7 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
 #: ../src/connection-editor/connection-helpers.c:772
 #: ../src/connection-editor/nm-connection-list.ui.h:4
@@ -1715,7 +1731,7 @@
 #: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "Automatycznie"
@@ -1761,7 +1777,7 @@
 msgstr "Pełny"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "Ignorowanie"
 
@@ -1769,7 +1785,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "Ręczne"
 
@@ -2037,12 +2053,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "Współdzielone z innymi komputerami"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "_Metoda:"
 
@@ -2057,7 +2073,7 @@
 "miejscu."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2070,16 +2086,16 @@
 msgstr "Identyfikator klienta D_HCP:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "Dom_eny wyszukiwania:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "Serwery _DNS:"
 
@@ -2104,7 +2120,7 @@
 "połączenia, jeśli konfiguracja IPv4 się nie powiedzie, a IPv6 tak."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "_Trasy…"
 
@@ -2122,7 +2138,15 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "Włączone (preferowanie tymczasowego adresu)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr "EUI64"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Stable privacy"
+msgstr "Stabilna prywatność"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -2132,15 +2156,19 @@
 "podać wiele adresów, należy je rozdzielić przecinkami. Adresy Link-Local "
 "będą automatycznie dołączane do łączącego się interfejsu."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "_Rozszerzenia prywatności IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr "_Tryb tworzenia adresu IPv6:"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Wymaganie adresowania IPv_6 do ukończenia nawiązania tego połączenia"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -3155,7 +3183,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "Adres"
 
@@ -3167,7 +3195,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "Brama"
 
@@ -3178,7 +3206,7 @@
 msgstr "Parametry"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "Przedrostek"
 
@@ -3611,27 +3639,27 @@
 msgstr "Połączenie tunelu IP %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "Automatycznie (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatycznie (VPN), tylko adresy"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "Automatycznie, tylko adresy"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "Automatycznie (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatycznie (PPPoE), tylko adresy"
 
@@ -3644,17 +3672,17 @@
 msgstr "Automatycznie (DHCP), tylko adresy"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "Tylko Link-Local"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "_Dodatkowe serwery DNS:"
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "Dodatkowe dom_eny wyszukiwania:"
 
@@ -3691,39 +3719,39 @@
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "Serwer DNS IPv4 „%s” jest nieprawidłowy"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "Automatycznie, tylko DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Modyfikowanie tras IPv6 dla %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "Ustawienia IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr "Nie można wczytać interfejsu użytkownika IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "Adres IPv6 „%s” jest nieprawidłowy"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "Przedrostek IPv6 „%s” jest nieprawidłowy"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "Brama IPv6 „%s” jest nieprawidłowa"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "Serwer DNS IPv6 „%s” jest nieprawidłowy"
diff -Nru network-manager-applet-1.8.4/po/POTFILES.in network-manager-applet-1.8.10/po/POTFILES.in
--- network-manager-applet-1.8.4/po/POTFILES.in	2017-08-11 09:40:17.000000000 +0000
+++ network-manager-applet-1.8.10/po/POTFILES.in	2017-12-19 11:44:30.000000000 +0000
@@ -14,6 +14,7 @@
 src/applet-device-ethernet.c
 src/applet-device-wifi.c
 src/applet-dialogs.c
+src/applet-vpn-request.c
 src/applet.h
 [type: gettext/glade]src/connection-editor/ce-ip4-routes.ui
 [type: gettext/glade]src/connection-editor/ce-ip6-routes.ui
diff -Nru network-manager-applet-1.8.4/po/pt_BR.po network-manager-applet-1.8.10/po/pt_BR.po
--- network-manager-applet-1.8.4/po/pt_BR.po	2017-06-28 09:48:36.000000000 +0000
+++ network-manager-applet-1.8.10/po/pt_BR.po	2017-12-19 11:44:30.000000000 +0000
@@ -17,24 +17,24 @@
 # Enrico Nicoletto , 2013, 2014.
 # Felipe Braga , 2015.
 # Rafael Fontenelle , 2013, 2014, 2015, 2016, 2017.
+# lrintel , 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: network-nanager-applet\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Networ"
-"kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2017-06-18 09:33+0000\n"
-"PO-Revision-Date: 2017-06-25 12:54-0200\n"
-"Last-Translator: Rafael Fontenelle \n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-12-12 11:18+0100\n"
+"PO-Revision-Date: 2017-11-07 06:45+0000\n"
+"Last-Translator: Copied by Zanata \n"
 "Language-Team: Brazilian Portuguese \n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
+"X-Generator: Zanata 4.3.2\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3181
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
 msgstr "Rede"
 
@@ -43,7 +43,7 @@
 msgstr "Controle suas conexões de rede"
 
 #: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: ../src/connection-editor/nm-connection-list.ui.h:1
 msgid "Network Connections"
 msgstr "Conexões de rede"
 
@@ -174,17 +174,17 @@
 msgid "The NetworkManager Developers"
 msgstr "Os desenvolvedores do NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "a classe de objeto “%s” não possui uma propriedade chamada “%s”"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "a propriedade “%s” da classe de objeto “%s” não é gravável"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -192,20 +192,20 @@
 "a propriedade de construtor “%s” para objeto “%s” não pode ser definido após "
 "construção"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "“%s:%s” não é um nome de propriedade válida; “%s” não é um subtipo de GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "não foi possível definir a propriedade “%s” de tipo “%s” a partir do valor "
 "de tipo “%s”"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -214,22 +214,35 @@
 "o valor “%s” de tipo “%s” é inválido ou fora do intervalo da propriedade "
 "“%s” de tipo “%s”"
 
-#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticação 802.1x"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1
+#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
+#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
 #: ../src/connection-editor/ce-new-connection.ui.h:1
 #: ../src/connection-editor/ce-page-dcb.ui.h:17
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/connection-editor/connection-helpers.c:308
+#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/page-bluetooth.c:311
+#: ../src/connection-editor/page-mobile.c:543
+#: ../src/connection-editor/page-proxy.c:121
+#: ../src/connection-editor/page-team.c:344
+#: ../src/connection-editor/page-team-port.c:206
+#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
+#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/libnma/nma-vpn-password-dialog.c:209
+#: ../src/libnma/nma-wifi-dialog.c:1066
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/8021x.ui.h:3
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "C_onectado"
 
@@ -245,37 +258,37 @@
 msgid "secure."
 msgstr "seguro."
 
-#: ../src/applet.c:387
+#: ../src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Falha ao adicionar/ativar conexão"
 
-#: ../src/applet.c:389 ../src/applet.c:443 ../src/applet.c:478
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: ../src/applet.c:392 ../src/applet.c:481 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Falha de conexão"
 
-#: ../src/applet.c:441
+#: ../src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Desconexão de dispositivo falhou"
 
-#: ../src/applet.c:446
+#: ../src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Falha ao desconectar"
 
-#: ../src/applet.c:476
+#: ../src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Ativação da conexão falhou"
 
-#: ../src/applet.c:799 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Não mostrar esta mensagem novamente"
 
-#: ../src/applet.c:889
+#: ../src/applet.c:899
 #, c-format
 msgid ""
 "\n"
@@ -285,7 +298,7 @@
 "\n"
 "A conexão VPN “%s” desconectou porque a conexão de rede foi interrompida."
 
-#: ../src/applet.c:891
+#: ../src/applet.c:901
 #, c-format
 msgid ""
 "\n"
@@ -295,7 +308,7 @@
 "\n"
 "A conexão VPN “%s” falhou porque a conexão de rede foi interrompida."
 
-#: ../src/applet.c:893
+#: ../src/applet.c:903
 #, c-format
 msgid ""
 "\n"
@@ -304,7 +317,7 @@
 "\n"
 "A conexão VPN “%s” falhou porque o serviço de VPN parou inesperadamente."
 
-#: ../src/applet.c:895
+#: ../src/applet.c:905
 #, c-format
 msgid ""
 "\n"
@@ -315,7 +328,7 @@
 "A conexão VPN “%s” falhou porque o serviço VPN retornou uma configuração "
 "inválida."
 
-#: ../src/applet.c:897
+#: ../src/applet.c:907
 #, c-format
 msgid ""
 "\n"
@@ -324,7 +337,7 @@
 "\n"
 "A conexão VPN “%s” falhou porque esgotou o tempo de tentativas de conexão."
 
-#: ../src/applet.c:899
+#: ../src/applet.c:909
 #, c-format
 msgid ""
 "\n"
@@ -333,7 +346,7 @@
 "\n"
 "A conexão VPN “%s” falhou porque o serviço VPN não iniciou a tempo."
 
-#: ../src/applet.c:901
+#: ../src/applet.c:911
 #, c-format
 msgid ""
 "\n"
@@ -342,7 +355,7 @@
 "\n"
 "A conexão VPN “%s” falhou porque o serviço VPN falhou ao iniciar."
 
-#: ../src/applet.c:903
+#: ../src/applet.c:913
 #, c-format
 msgid ""
 "\n"
@@ -351,7 +364,7 @@
 "\n"
 "A conexão VPN “%s” falhou porque não haviam segredos VPN válidos."
 
-#: ../src/applet.c:905
+#: ../src/applet.c:915
 #, c-format
 msgid ""
 "\n"
@@ -360,7 +373,7 @@
 "\n"
 "A conexão VPN “%s” falhou por causa de chaves VPN inválidas."
 
-#: ../src/applet.c:910
+#: ../src/applet.c:920
 #, c-format
 msgid ""
 "\n"
@@ -369,7 +382,7 @@
 "\n"
 "A conexão VPN “%s” falhou."
 
-#: ../src/applet.c:937
+#: ../src/applet.c:947
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -380,19 +393,19 @@
 "\n"
 "%s\n"
 
-#: ../src/applet.c:939
+#: ../src/applet.c:949
 msgid "VPN connection has been successfully established.\n"
 msgstr "A conexão VPN foi estabelecida com sucesso.\n"
 
-#: ../src/applet.c:941
+#: ../src/applet.c:951
 msgid "VPN Login Message"
 msgstr "Mensagem de login VPN"
 
-#: ../src/applet.c:949 ../src/applet.c:989
+#: ../src/applet.c:959 ../src/applet.c:999
 msgid "VPN Connection Failed"
 msgstr "A conexão VPN falhou"
 
-#: ../src/applet.c:993
+#: ../src/applet.c:1003
 #, c-format
 msgid ""
 "\n"
@@ -405,7 +418,7 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:996
+#: ../src/applet.c:1006
 #, c-format
 msgid ""
 "\n"
@@ -418,144 +431,144 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:1285
+#: ../src/applet.c:1295
 msgid "device not ready (firmware missing)"
 msgstr "dispositivo não está pronto (faltando firmware)"
 
-#: ../src/applet.c:1287
+#: ../src/applet.c:1297
 msgid "device not ready"
 msgstr "dispositivo não está pronto"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1297 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconectado"
 
-#: ../src/applet.c:1313
+#: ../src/applet.c:1323
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/applet.c:1327
+#: ../src/applet.c:1337
 msgid "device not managed"
 msgstr "dispositivo não gerenciado"
 
-#: ../src/applet.c:1400
+#: ../src/applet.c:1410
 msgid "No network devices available"
 msgstr "Nenhum dispositivo de rede disponível"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1464
 msgid "_VPN Connections"
 msgstr "Conexões _VPN"
 
-#: ../src/applet.c:1498
+#: ../src/applet.c:1508
 msgid "_Configure VPN…"
 msgstr "_Configurar VPN…"
 
-#: ../src/applet.c:1501
+#: ../src/applet.c:1511
 msgid "_Add a VPN connection…"
 msgstr "_Adicionar uma conexão VPN…"
 
-#: ../src/applet.c:1607
+#: ../src/applet.c:1617
 msgid "NetworkManager is not running…"
 msgstr "O gerenciador de redes não está em execução…"
 
-#: ../src/applet.c:1612 ../src/applet.c:2677
+#: ../src/applet.c:1622 ../src/applet.c:2687
 msgid "Networking disabled"
 msgstr "Rede desabilitada"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1822
+#: ../src/applet.c:1832
 msgid "Enable _Networking"
 msgstr "_Habilitar rede"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1831
+#: ../src/applet.c:1841
 msgid "Enable _Wi-Fi"
 msgstr "Habilitar _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1840
+#: ../src/applet.c:1850
 msgid "Enable _Mobile Broadband"
 msgstr "Habilitar banda larga _móvel"
 
 #. Toggle notifications item
-#: ../src/applet.c:1852
+#: ../src/applet.c:1862
 msgid "Enable N_otifications"
 msgstr "Habilitar n_otificações"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1864
+#: ../src/applet.c:1874
 msgid "Connection _Information"
 msgstr "_Informações da conexão"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1872
+#: ../src/applet.c:1882
 msgid "Edit Connections…"
 msgstr "Editar conexões…"
 
-#: ../src/applet.c:1886
+#: ../src/applet.c:1896
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/applet.c:2197
+#: ../src/applet.c:2207
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Você agora está conectado a “%s”."
 
-#: ../src/applet.c:2237
+#: ../src/applet.c:2247
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../src/applet.c:2238
+#: ../src/applet.c:2248
 msgid "The network connection has been disconnected."
 msgstr "A conexão de rede foi desconectada."
 
-#: ../src/applet.c:2540
+#: ../src/applet.c:2550
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Preparando conexão de rede “%s”…"
 
-#: ../src/applet.c:2543
+#: ../src/applet.c:2553
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Autenticação necessária pela conexão de rede “%s”…"
 
-#: ../src/applet.c:2546 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Requisitando um endereço de rede para “%s”…"
 
-#: ../src/applet.c:2549
+#: ../src/applet.c:2559
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Conexão de rede “%s” está ativa"
 
-#: ../src/applet.c:2622
+#: ../src/applet.c:2632
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Iniciando conexão VPN “%s”…"
 
-#: ../src/applet.c:2625
+#: ../src/applet.c:2635
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Autenticação necessária pela conexão VPN “%s”…"
 
-#: ../src/applet.c:2628
+#: ../src/applet.c:2638
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Requisitando um endereço de rede VPN para “%s”…"
 
-#: ../src/applet.c:2631
+#: ../src/applet.c:2641
 #, c-format
 msgid "VPN connection active"
 msgstr "Conexão VPN ativa"
 
-#: ../src/applet.c:2681
+#: ../src/applet.c:2691
 msgid "No network connection"
 msgstr "Nenhuma conexão de rede"
 
-#: ../src/applet.c:3282
+#: ../src/applet.c:3292
 msgid "NetworkManager Applet"
 msgstr "Miniaplicativo gerenciador de redes"
 
@@ -572,46 +585,46 @@
 msgid "Sending unlock code…"
 msgstr "Enviando código do desbloqueio…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda larga móvel (%s)"
 
-#: ../src/applet-device-broadband.c:738
+#: ../src/applet-device-broadband.c:739
 #: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Banda larga móvel"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Disponível"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 msgid "New Mobile Broadband connection…"
 msgstr "Nova conexão de banda larga móvel…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Conexão estabelecida"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Você agora está conectado à rede de banda larga móvel."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "Rede de banda larga móvel."
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "Você agora está conectado à rede doméstica."
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "Você agora está conectado em uma rede em roaming."
 
@@ -694,6 +707,18 @@
 msgid "DSL authentication"
 msgstr "Autenticação DSL"
 
+#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/page-bluetooth.c:313
+#: ../src/connection-editor/page-mobile.c:545
+#: ../src/libnma/nma-vpn-password-dialog.c:210
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+msgid "_OK"
+msgstr "_OK"
+
 #: ../src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Conectar a rede Wi-Fi oculta…"
@@ -706,7 +731,7 @@
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Falha ao adicionar nova conexão"
 
@@ -714,78 +739,78 @@
 msgid "Insufficient privileges."
 msgstr "Privilégios insuficientes."
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Redes Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Rede Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Rede Wi-Fi"
 msgstr[1] "Rede Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi está desabilitado"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi desabilitado por hardware"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Mais redes"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Redes Wi-Fi disponíveis"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Use o menu de rede para se conectar a uma rede Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Você agora está conectado à rede Wi-Fi “%s”."
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Preparando conexão de rede Wi-Fi “%s”…"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Configurando conexão de rede Wi-Fi “%s”…"
 
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Autenticação necessária pela rede Wi-Fi “%s”…"
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Requisitando um endereço de rede Wi-Fi para “%s”…"
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Conexão de rede Wi-Fi “%s” ativa: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Conexão de rede Wi-Fi “%s” ativa"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Falha ao ativar conexão"
 
@@ -793,195 +818,196 @@
 msgid "Error displaying connection information:"
 msgstr "Erro ao exibir informações de conexão:"
 
-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:381
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
 #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: ../src/applet-dialogs.c:75
 msgid "Dynamic WEP"
 msgstr "WEP Dinâmico"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:231
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: ../src/applet-dialogs.c:152
 msgid "More addresses"
 msgstr "Mais endereços"
 
-#: ../src/applet-dialogs.c:226
+#: ../src/applet-dialogs.c:227
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
 #: ../src/connection-editor/page-wifi-security.c:332
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:261
 #, c-format
 msgid "%s (default)"
 msgstr "%s (padrão)"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
 msgid "IP Address:"
 msgstr "Endereço IP:"
 
-#: ../src/applet-dialogs.c:369
+#: ../src/applet-dialogs.c:370
 msgid "Broadcast Address:"
 msgstr "Endereço de broadcast:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: ../src/applet-dialogs.c:382
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:383
 msgid "Subnet Mask:"
 msgstr "Máscara de sub-rede:"
 
-#: ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:493
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:496
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: ../src/applet-dialogs.c:503
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: ../src/applet-dialogs.c:505
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
 #: ../src/connection-editor/ce-page-team-port.ui.h:23
 #: ../src/connection-editor/ce-page-team.ui.h:48
 #: ../src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Geral"
 
-#: ../src/applet-dialogs.c:516
+#: ../src/applet-dialogs.c:517
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../src/applet-dialogs.c:536
+#: ../src/applet-dialogs.c:537
 msgid "Hardware Address:"
 msgstr "Endereço de hardware:"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:551
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:586
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:601
 msgid "Security:"
 msgstr "Segurança:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
 #: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
 msgid "Default Route:"
 msgstr "Rota padrão:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
 #: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:816
 msgid "VPN Type:"
 msgstr "Tipo de VPN:"
 
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:823
 msgid "VPN Gateway:"
 msgstr "Gateway de VPN:"
 
-#: ../src/applet-dialogs.c:828
+#: ../src/applet-dialogs.c:829
 msgid "VPN Username:"
 msgstr "Nome de usuário de VPN:"
 
-#: ../src/applet-dialogs.c:834
+#: ../src/applet-dialogs.c:835
 msgid "VPN Banner:"
 msgstr "Mensagem VPN:"
 
-#: ../src/applet-dialogs.c:840
+#: ../src/applet-dialogs.c:841
 msgid "Base Connection:"
 msgstr "Conexão base:"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: ../src/applet-dialogs.c:958
 msgid "No valid active connections found!"
 msgstr "Nenhuma conexão ativa e válida localizada!"
 
-#: ../src/applet-dialogs.c:985
+#: ../src/applet-dialogs.c:1007
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc.\n"
-"e muitos outros contribuidores da comunidade e tradutores"
 
-#: ../src/applet-dialogs.c:988
+#: ../src/applet-dialogs.c:1010
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Miniaplicativo de área de notificação para gerenciamento dos seus "
 "dispositivos de rede e conexões."
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1012
 msgid "NetworkManager Website"
 msgstr "Site do Gerenciador de redes"
 
-#: ../src/applet-dialogs.c:1001
+#: ../src/applet-dialogs.c:1016
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1026
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -989,33 +1015,33 @@
 "Não foi possível ao miniaplicativo Gerenciador de redes localizar alguns "
 "recursos necessários (o arquivo .ui não foi encontrado)."
 
-#: ../src/applet-dialogs.c:1006
+#: ../src/applet-dialogs.c:1031
 msgid "Missing resources"
 msgstr "Recursos em falta"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1057
 msgid "Mobile broadband network password"
 msgstr "Senha de rede de banda larga móvel"
 
-#: ../src/applet-dialogs.c:1040
+#: ../src/applet-dialogs.c:1066
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Uma senha é necessária para conectar-se a “%s”."
 
-#: ../src/applet-dialogs.c:1055
+#: ../src/applet-dialogs.c:1081
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1363
 msgid "SIM PIN unlock required"
 msgstr "É necessário informar o código SIM PIN do desbloqueio"
 
-#: ../src/applet-dialogs.c:1338
+#: ../src/applet-dialogs.c:1364
 msgid "SIM PIN Unlock Required"
 msgstr "É necessário informar o código SIM PIN do Desbloqueio"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1366
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1025,25 +1051,25 @@
 "ele possa ser usado."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1368
 msgid "PIN code:"
 msgstr "Código PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1372
 msgid "Show PIN code"
 msgstr "Exibir código PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1374
 msgid "SIM PUK unlock required"
 msgstr "É necessário informar o código SIM PUK de desbloqueio"
 
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1375
 msgid "SIM PUK Unlock Required"
 msgstr "É necessário informar o código SIM PUK de Desbloqueio"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: ../src/applet-dialogs.c:1377
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1053,31 +1079,38 @@
 "possa ser usado."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1379
 msgid "PUK code:"
 msgstr "Código PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: ../src/applet-dialogs.c:1382
 msgid "New PIN code:"
 msgstr "Novo código PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: ../src/applet-dialogs.c:1384
 msgid "Re-enter new PIN code:"
 msgstr "Re-inserir o novo código PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: ../src/applet-dialogs.c:1389
 msgid "Show PIN/PUK codes"
 msgstr "Mostrar códigos PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
-msgstr "_OK"
+#: ../src/applet-vpn-request.c:201
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Informações da conexão"
+
+#: ../src/applet-vpn-request.c:251
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Falha ao ativar conexão"
+
+#: ../src/applet-vpn-request.c:259
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
@@ -1094,21 +1127,21 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
 msgstr "_Adicionar"
 
-#. Delete
 #: ../src/connection-editor/ce-ip4-routes.ui.h:5
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/nm-connection-list.c:711
+#: ../src/connection-editor/connection-helpers.c:772
+#: ../src/connection-editor/nm-connection-list.ui.h:4
 msgid "_Delete"
 msgstr "E_xcluir"
 
@@ -1199,11 +1232,10 @@
 msgid "M_ode:"
 msgstr "M_odo:"
 
-#. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: ../src/connection-editor/nm-connection-list.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -1259,7 +1291,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 #: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
@@ -1268,7 +1300,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-infiniband.ui.h:7
 #: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
@@ -1302,25 +1334,71 @@
 msgstr "Tempo de saudação (_hello):"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "Enable I_GMP snooping"
 msgstr "Habilitar I_GMP snooping"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:14
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Habilitar _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:15
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:16
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:17
 msgid "_Max age:"
 msgstr "Tempo _máximo de expiração:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:18
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:19
 msgid "_Aging time:"
 msgstr "Tempo de _vencimento:"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:20
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:21
+msgid "Group _forward mask:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:22
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
 #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automático"
@@ -1582,10 +1660,20 @@
 msgstr "Nome de _usuário:"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
 msgid "_Service:"
 msgstr "_Serviço:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:5
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 #: ../src/wireless-security/ws-leap.ui.h:3
@@ -1593,7 +1681,11 @@
 msgid "Sho_w password"
 msgstr "_Mostrar senha"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-dsl.ui.h:6
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:7
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
 #: ../src/libnma/nma-vpn-password-dialog.c:97
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
@@ -1604,13 +1696,29 @@
 msgid "_Password:"
 msgstr "Se_nha:"
 
+#: ../src/connection-editor/ce-page-dsl.ui.h:8
+msgid "PPP _interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:9
+msgid "P_arent interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:10
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:11
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "Automático"
@@ -1656,7 +1764,7 @@
 msgstr "Full"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -1664,7 +1772,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "Manual"
 
@@ -1673,7 +1781,7 @@
 msgstr "_Porta:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
 msgid "_Device:"
 msgstr "_Dispositivo:"
@@ -1841,20 +1949,20 @@
 msgid "Address (optional)"
 msgstr "Endereço (opcional)"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "Modo _transporte:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
 msgid "Datagram"
 msgstr "Datagrama"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
 msgid "Connected"
 msgstr "Conectado"
 
+#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+msgid "_Transport mode:"
+msgstr "Modo _transporte:"
+
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
 msgid "IPIP"
 msgstr "IPIP"
@@ -1893,38 +2001,38 @@
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
 #: ../src/connection-editor/ce-page-macsec.ui.h:6
-msgid "Device name"
-msgstr "Nome do dispositivo"
+msgid "Device name:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
 #: ../src/connection-editor/ce-page-macsec.ui.h:8
-msgid "Parent device"
-msgstr "Dispositivo pai"
+msgid "Parent device:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
 #: ../src/connection-editor/ce-page-macsec.ui.h:16
-msgid "Mode"
-msgstr "Modo"
+msgid "Mode:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP"
-msgstr "IP local"
+msgid "Local IP:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP"
-msgstr "IP remoto"
+msgid "Remote IP:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key"
-msgstr "Chave de entrada"
+msgid "Input key:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key"
-msgstr "Chave de saída"
+msgid "Output key:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-msgid "MTU"
-msgstr "MTU"
+msgid "MTU:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1939,12 +2047,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "Compartilhado com outros computadores"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "_Método:"
 
@@ -1959,7 +2067,7 @@
 "identificador de cliente DHCP, digite aqui."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1972,16 +2080,16 @@
 msgstr "ID do cliente D_HCP:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "Pe_squisar domínios:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "Servidores _DNS:"
 
@@ -2007,7 +2115,7 @@
 "a configuração do Ipv4 falhar, mas a IPv6 for bem sucedida."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "_Rotas…"
 
@@ -2025,7 +2133,15 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "Ativado (preferir endereço temporário)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Stable privacy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -2036,15 +2152,19 @@
 "de domínio. Endereços de conexões locais serão inseridas automaticamente no "
 "escopo de interface de conectividade."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "Extensões de _privacidade IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Requer endereçamento do IPv_6 para que esta conexão seja concluída"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2066,7 +2186,6 @@
 msgstr "Verificar"
 
 #: ../src/connection-editor/ce-page-macsec.ui.h:5
-#| msgid "Metric"
 msgid "Strict"
 msgstr "Estrita"
 
@@ -2109,37 +2228,37 @@
 "obtida. Para o modo EAP, preenche os parâmetros na página de segurança 802.1X"
 
 #: ../src/connection-editor/ce-page-macsec.ui.h:14
-msgid "CKN"
-msgstr "CKN"
+msgid "CKN:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-macsec.ui.h:15
-msgid "CAK"
-msgstr "CAK"
+msgid "CAK:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-macsec.ui.h:17
-msgid "Keys"
-msgstr "Chaves"
+msgid "Keys:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-macsec.ui.h:18
-msgid "Parameters"
-msgstr "Parâmetros"
+msgid "Parameters:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-macsec.ui.h:19
-msgid "Encrypt"
-msgstr "Criptografar"
+msgid "Validation:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-macsec.ui.h:20
-msgid "Validation"
-msgstr "Validação"
+msgid "SCI port:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-macsec.ui.h:21
-msgid "SCI port"
-msgstr "Porta SCI"
-
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
 msgid "Specifies the validation mode for incoming frames"
 msgstr "Especifica o modo de validação para quadros recebidos"
 
+#: ../src/connection-editor/ce-page-macsec.ui.h:22
+msgid "Encrypt"
+msgstr "Criptografar"
+
 #: ../src/connection-editor/ce-page-macsec.ui.h:23
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "Se o tráfego transmitido deve ser criptografado"
@@ -2236,39 +2355,39 @@
 msgstr "Enviar pacotes de _eco PPP"
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:1
-msgid "Method:"
-msgstr "Método:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-team.ui.h:25
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: ../src/connection-editor/ce-page-proxy.ui.h:3
 msgid "For browser only"
 msgstr "Para navegador apenas"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: ../src/connection-editor/ce-page-proxy.ui.h:4
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 "Use essa configuração de proxy para apenas navegadores clientes/esquemas."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: ../src/connection-editor/ce-page-proxy.ui.h:5
 msgid "PAC URL:"
 msgstr "PAC URL:"
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:6
+msgid "PAC script:"
+msgstr "PAC script:"
+
 #: ../src/connection-editor/ce-page-proxy.ui.h:7
 msgid "URL from where the PAC script is to be obtained."
 msgstr "URL por meio da qual o script PAC deve ser obtido."
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
-msgstr "PAC script:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
 msgid "Import script from a file…"
 msgstr "Importar script de um arquivo…"
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:9
+msgid "Method:"
+msgstr "Método:"
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:19
 msgid "Ad_vanced…"
@@ -2316,23 +2435,14 @@
 msgstr "ID da fila para a qual esta porta deve estar mapeada."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
-msgstr "Prioridade da _porta:"
+msgid "Active-Backup runner options"
+msgstr "Opções do executor backup-ativo"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
-msgstr "Porta afi_xada"
+msgid "_Port priority:"
+msgstr "Prioridade da _porta:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:82
-msgid ""
-"Validate received ARP packets on active ports. If this is not checked, all "
-"incoming ARP packets will be considered as a good reply."
-msgstr ""
-"Valida pacotes ARP recebidos em portas ativas. Se isso não estiver marcado, "
-"todos pacotes ARP recebidos serão considerados como reposta boa."
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:44
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
@@ -2341,24 +2451,37 @@
 "O valor é um número positivo em milissegundos. Especifica um intervalo entre "
 "rajadas de pacotes de notificação da outra ponta."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
 msgid "Port priority. The higher number means higher priority."
 msgstr ""
 "Prioridade da porta. O número mais alto significa uma prioridade mais alta."
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port _sticky"
+msgstr "Porta afi_xada"
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:15
-msgid "Active-Backup runner options"
-msgstr "Opções do executor backup-ativo"
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
+msgstr ""
+"Valida pacotes ARP recebidos em portas ativas. Se isso não estiver marcado, "
+"todos pacotes ARP recebidos serão considerados como reposta boa."
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:16
+msgid "LACP runner options"
+msgstr "Opções do executor LACP"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
 msgid "_LACP port priority:"
 msgstr "Prioridade de porta _LACP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
 msgid "LACP port _key:"
 msgstr "C_have de porta LACP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
 #: ../src/connection-editor/ce-page-team.ui.h:43
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
@@ -2367,7 +2490,7 @@
 "Número de rajadas de requisições multicasts de reingresso em grupo enviadas "
 "após porta ser habilitada ou desabilitada."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
@@ -2375,7 +2498,7 @@
 "Prioridade da porta de acordo com o padrão do LACP. O número mais baixo "
 "significa prioridade mais alta."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
 #: ../src/connection-editor/ce-page-team.ui.h:45
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
@@ -2384,7 +2507,7 @@
 "O valor é um número positivo em milissegundos. Especifica um intervalo entre "
 "rajadas de requisições multicasts de reingresso em grupo."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
@@ -2392,10 +2515,6 @@
 "Chave de porta de acordo com o padrão do LACP. É possível agregar portas com "
 "a mesma chave."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
-msgid "LACP runner options"
-msgstr "Opções do executor LACP"
-
 #: ../src/connection-editor/ce-page-team-port.ui.h:24
 #: ../src/connection-editor/ce-page-team.ui.h:70
 msgid "_Link watcher:"
@@ -2869,6 +2988,7 @@
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
+#: ../src/connection-editor/ce-polkit.c:63
 #: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Nenhuma autorização polkit para realizar a ação"
@@ -2937,9 +3057,9 @@
 msgstr "Bluetooth"
 
 #: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: ../src/connection-editor/page-dsl.c:201
+msgid "DSL/PPPoE"
+msgstr ""
 
 #: ../src/connection-editor/connection-helpers.c:116
 #: ../src/connection-editor/page-infiniband.c:148
@@ -2955,13 +3075,13 @@
 
 # Link agreggation = Team Network
 #: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Equipe"
 
 #: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:212
+#: ../src/connection-editor/page-bridge.c:233
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Ponte"
@@ -3020,6 +3140,13 @@
 msgid "Select file to import"
 msgstr "Seleciona o arquivo a ser importado"
 
+#: ../src/connection-editor/connection-helpers.c:309
+#: ../src/connection-editor/page-proxy.c:122
+#: ../src/connection-editor/page-team.c:345
+#: ../src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
 #: ../src/connection-editor/connection-helpers.c:340
 msgid "Hardware"
 msgstr "Hardware"
@@ -3057,7 +3184,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "Endereço"
 
@@ -3069,7 +3196,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "Gateway"
 
@@ -3079,7 +3206,7 @@
 msgstr "Métrica"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "Prefixo"
 
@@ -3105,7 +3232,7 @@
 msgstr "Erro de inicialização…"
 
 #: ../src/connection-editor/nm-connection-editor.c:360
-#: ../src/connection-editor/nm-connection-list.c:408
+#: ../src/connection-editor/nm-connection-list.c:443
 msgid "Connection cannot be modified"
 msgstr "A conexão não pôde ser modificada"
 
@@ -3123,6 +3250,7 @@
 "arquivo .ui não foi localizado)."
 
 #: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Salvar"
 
@@ -3163,19 +3291,15 @@
 msgid "Error initializing editor"
 msgstr "Erro ao iniciar o editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:1148
+#: ../src/connection-editor/nm-connection-editor.c:1157
 msgid "Connection add failed"
 msgstr "A criação da conexão falhou"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr "_Fechar"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Fix"
 msgstr "Corrigir"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3183,23 +3307,23 @@
 "Rótulos de segurança podem evitar que alguns arquivos seja usados com "
 "autenticação com certificado."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "_Nome da conexão:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "_Export…"
 msgstr "_Exportar…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
 msgid "File Relabel"
 msgstr "Rerotulagem de arquivo"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "_Relabel"
 msgstr "_Rerotular"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
@@ -3207,116 +3331,132 @@
 "Os arquivos a seguir não estão rotulados para usar com autenticação de com "
 "certificado. você deseja ajustar os rótulos?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
 msgid "Relabel"
 msgstr "Rerotular"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: ../src/connection-editor/nm-connection-list.c:151
 msgid "never"
 msgstr "nunca"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:173
 msgid "now"
 msgstr "agora"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: ../src/connection-editor/nm-connection-list.c:180
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuto atrás"
 msgstr[1] "%d minutos atrás"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: ../src/connection-editor/nm-connection-list.c:184
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d hora atrás"
 msgstr[1] "%d horas atrás"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:196
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dia atrás"
 msgstr[1] "%d dias atrás"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: ../src/connection-editor/nm-connection-list.c:202
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d mês atrás"
 msgstr[1] "%d meses atrás"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: ../src/connection-editor/nm-connection-list.c:206
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d ano atrás"
 msgstr[1] "%d anos atrás"
 
-#: ../src/connection-editor/nm-connection-list.c:635
+#: ../src/connection-editor/nm-connection-list.c:445
+msgid "Connection cannot be deleted"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:448
+msgid "Select a connection to edit"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:450
+msgid "Select a connection to delete"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:785
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: ../src/connection-editor/nm-connection-list.c:798
 msgid "Last Used"
 msgstr "Usada em"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: ../src/connection-editor/nm-connection-list.c:836
 msgid "Edit the selected connection"
 msgstr "Edita a conexão selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: ../src/connection-editor/nm-connection-list.c:837
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentique-se para editar a conexão selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: ../src/connection-editor/nm-connection-list.c:842
 msgid "Delete the selected connection"
 msgstr "Excluir a conexão selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: ../src/connection-editor/nm-connection-list.c:843
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentique-se para excluir a conexão selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:1048
+#: ../src/connection-editor/nm-connection-list.c:1051
 msgid "Error creating connection"
 msgstr "Erro ao criar conexão"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:1049
 msgid "No VPN plugins are installed."
 msgstr "Nenhum plug-in de VPN está instalado."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:1052
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Não foi possível criar as conexões “%s”"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: ../src/connection-editor/nm-connection-list.c:1085
 msgid "Error editing connection"
 msgstr "Erro editando conexão"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: ../src/connection-editor/nm-connection-list.c:1086
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Não é possível localizar a conexão com UUID “%s”"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: ../src/connection-editor/nm-connection-list.ui.h:2
+msgid "Add a new connection"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:116
 msgid "802.1X Security"
 msgstr "Segurança 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: ../src/connection-editor/page-8021x-security.c:118
 msgid "Could not load 802.1X Security user interface."
 msgstr "Não foi possível carregar a interface gráfica de segurança 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: ../src/connection-editor/page-8021x-security.c:132
 msgid "Use 802.1_X security for this connection"
 msgstr "Usar protocolo de segurança 802.1_X para esta conexão"
 
@@ -3367,11 +3507,11 @@
 msgid "Bond connection %d"
 msgstr "Conexão de agregação %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:236
 msgid "Could not load bridge user interface."
 msgstr "Não foi possível carregar a interface gráfica de ponte."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: ../src/connection-editor/page-bridge.c:352
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Conexão de ponte %d"
@@ -3396,11 +3536,15 @@
 msgid "Could not load DCB user interface."
 msgstr "Não foi possível carregar a interface gráfica de DCB."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: ../src/connection-editor/page-dsl.c:203
 msgid "Could not load DSL user interface."
 msgstr "Não foi possível carregar a interface gráfica para DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: ../src/connection-editor/page-dsl.c:298
+msgid "missing parent interface"
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:343
 #, c-format
 msgid "DSL connection %d"
 msgstr "Conexão DSL %d"
@@ -3499,27 +3643,27 @@
 msgstr "Conexão de encapsulamento de IP %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "Automático (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "Somente endereços (VPN) automáticos"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "Automático, somente endereços"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "Automático (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Somente endereços (PPPoE) automáticos"
 
@@ -3532,17 +3676,17 @@
 msgstr "Somente endereços (DHCP) automáticos"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "Apenas conexão local"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "Servidores _DNS adicionais:"
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "Pe_squisar domínios adicionais:"
 
@@ -3579,51 +3723,49 @@
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "Servidor DNS IPv4 “%s” inválido"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "Automático, somente DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editando rotas IPv6 para %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "Configurações IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr "Não foi possível carregar a interface gráfica para IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "Endereço IPv6 “%s” inválido"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "Prefixo IPv6 “%s” inválido"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "Gateway IPv6 “%s” inválido"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "Servidor DNS IPv6 “%s” inválido"
 
 #: ../src/connection-editor/page-macsec.c:192
-#| msgid "Could not load WiMAX user interface."
 msgid "Could not load MACsec user interface."
 msgstr "Não foi possível carregar a interface de usuário MACsec."
 
 #: ../src/connection-editor/page-macsec.c:331
 #, c-format
-#| msgid "WiMAX connection %d"
 msgid "MACSEC connection %d"
 msgstr "Conexão MACSEC %d"
 
@@ -3693,24 +3835,24 @@
 msgstr "GSM"
 
 #: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:288
+#: ../src/wireless-security/eap-method-ttls.c:287
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:300
-#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/eap-method-fast.c:282
+#: ../src/wireless-security/eap-method-peap.c:299
+#: ../src/wireless-security/eap-method-ttls.c:317
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:303
+#: ../src/wireless-security/eap-method-ttls.c:302
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3745,11 +3887,11 @@
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Erro: o arquivo não contém uma configuração válido de JSON"
 
-#: ../src/connection-editor/page-team.c:1156
+#: ../src/connection-editor/page-team.c:1034
 msgid "Could not load team user interface."
 msgstr "Não foi possível carregar a interface gráfica de equipe."
 
-#: ../src/connection-editor/page-team.c:1253
+#: ../src/connection-editor/page-team.c:1131
 #, c-format
 msgid "Team connection %d"
 msgstr "Conexão de equipe %d"
@@ -3757,11 +3899,11 @@
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: ../src/connection-editor/page-team-port.c:655
 msgid "Team Port"
 msgstr "Porta de equipe"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: ../src/connection-editor/page-team-port.c:657
 msgid "Could not load team port user interface."
 msgstr "Não foi possível carregar a interface gráfica de porta de equipe."
 
@@ -3961,34 +4103,38 @@
 msgid "Connection Information"
 msgstr "Informações da conexão"
 
+#: ../src/info.ui.h:2
+msgid "_Close"
+msgstr "_Fechar"
+
 #: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Conexões de rede ativas"
 
 #: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
 msgid "No certificate set"
 msgstr "Nenhum certificado definido"
 
 #: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
 msgid "No key set"
 msgstr "Nenhuma chave definida"
 
 #: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Escolha uma chave para certificado de %s"
 
 #: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
 #, c-format
 msgid "%s private _key:"
 msgstr "chave _privada de %s:"
 
 #: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
 #, c-format
 msgid "%s key _password:"
 msgstr "_Senha da chave de %s:"
@@ -3999,7 +4145,7 @@
 msgstr "Escolha o certificado de %s"
 
 #: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
 msgid "%s _certificate:"
 msgstr "_Certificado de %s:"
@@ -4202,45 +4348,45 @@
 msgid "New Mobile Broadband Connection"
 msgstr "Nova conexão de banda larga móvel"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: ../src/libnma/nma-cert-chooser-button.c:165
 msgid "(None)"
 msgstr "(Nenhum)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: ../src/libnma/nma-cert-chooser-button.c:173
 #, c-format
 msgid "Key in %s"
 msgstr "Chave em %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: ../src/libnma/nma-cert-chooser-button.c:174
 #, c-format
 msgid "Certificate in %s"
 msgstr "Certificado em %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
+#: ../src/libnma/nma-cert-chooser-button.c:193
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Desconhecido)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: ../src/libnma/nma-cert-chooser-button.c:215
+#: ../src/libnma/nma-cert-chooser-button.c:245
 msgid "Select"
 msgstr "Selecionar"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: ../src/libnma/nma-cert-chooser-button.c:216
+#: ../src/libnma/nma-cert-chooser-button.c:246
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: ../src/libnma/nma-cert-chooser-button.c:472
 msgid "Select from file…"
 msgstr "Selecionar do arquivo…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Escolha um certificado de %s"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s certificate _password:"
 msgstr "_Senha de certificado de %s:"
@@ -4300,8 +4446,8 @@
 msgid "_Tertiary Password:"
 msgstr "Senha _terciária:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: ../src/libnma/nma-vpn-password-dialog.c:238
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "M_ostrar senhas"
 
@@ -4330,11 +4476,11 @@
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinâmico (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_riar"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4342,35 +4488,35 @@
 "Senhas ou chaves de criptografia são necessárias para acessar a rede Wi-Fi "
 "“%s”."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autenticação necessária na rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autenticação necessária na rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Criar nova rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Nova rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
 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:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Conectar a rede Wi-Fi oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Rede Wi-Fi oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4553,11 +4699,11 @@
 msgid "%s connection"
 msgstr "Conexão %s"
 
-#: ../src/utils/utils.c:563
+#: ../src/utils/utils.c:565
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Certificados PEM (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: ../src/utils/utils.c:577
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Chaves privadas DER, PEM ou PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
@@ -4573,25 +4719,25 @@
 msgid "selected CA certificate file does not exist"
 msgstr "arquivo de certificado AC selecionado não existe"
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: ../src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "faltando arquivo PAC EAP-FAST"
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:330
-#: ../src/wireless-security/eap-method-ttls.c:380
+#: ../src/wireless-security/eap-method-fast.c:267
+#: ../src/wireless-security/eap-method-peap.c:329
+#: ../src/wireless-security/eap-method-ttls.c:379
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:405
 msgid "Choose a PAC file"
 msgstr "Escolha um arquivo PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:412
 msgid "PAC files (*.pac)"
 msgstr "Arquivos PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: ../src/wireless-security/eap-method-fast.c:416
 msgid "All files"
 msgstr "Todos os arquivos"
 
@@ -4635,8 +4781,8 @@
 msgid "missing EAP-LEAP password"
 msgstr "faltando senha EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-peap.c:315
-#: ../src/wireless-security/eap-method-ttls.c:365
+#: ../src/wireless-security/eap-method-peap.c:314
+#: ../src/wireless-security/eap-method-ttls.c:364
 #: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
@@ -4683,19 +4829,19 @@
 msgid "missing EAP-TLS identity"
 msgstr "faltando identidade EAP-TLS"
 
-#: ../src/wireless-security/eap-method-tls.c:251
+#: ../src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "nenhum certificado de usuário selecionado"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: ../src/wireless-security/eap-method-tls.c:261
 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:276
+#: ../src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "nenhuma chave selecionada"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: ../src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "arquivo de chave selecionado não existe"
 
@@ -4703,7 +4849,7 @@
 msgid "I_dentity:"
 msgstr "Id_entidade:"
 
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (não EAP)"
 
@@ -4782,17 +4928,17 @@
 msgstr "chave wep inválida: frase secreta deve ser menor que 64 caracteres"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Padrão)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Open System"
 msgstr "Sistema aberto"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Shared Key"
 msgstr "Chave compartilhada"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "1 (Default)"
+msgstr "1 (Padrão)"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key:"
 msgstr "_Chave:"
@@ -4823,457 +4969,3 @@
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "_Tipo:"
-
-#~ msgid "no file selected"
-#~ msgstr "nenhum arquivo selecionado"
-
-#~ msgid "file “%s” does not exist"
-#~ msgstr "o arquivo “%s” não existe"
-
-#~ msgid "unspecified error validating eap-method file"
-#~ msgstr "erro não especificado ao validar arquivo de método eap"
-
-#~ msgid "invalid EAP-PEAP CA certificate: %s"
-#~ msgstr "certificado de CA EAP-PEAP inválido: %s"
-
-#~ msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-#~ msgstr ""
-#~ "certificado de CA EAP-PEAP inválido: nenhum certificado especificado"
-
-#~ msgid "Choose a Certificate Authority certificate"
-#~ msgstr "Escolha um certificado de Autoridade Certificadora"
-
-#~ msgid "C_A certificate:"
-#~ msgstr "Certificado _AC:"
-
-#~ msgid "invalid EAP-TTLS CA certificate: %s"
-#~ msgstr "certificado de CA EAP-TTLS inválido: %s"
-
-#~ msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-#~ msgstr ""
-#~ "certificado de CA EAP-TTLS inválido: nenhum certificado especificado"
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection “%s” disconnected because the VPN service stopped."
-#~ msgstr ""
-#~ "\n"
-#~ "A conexão VPN “%s” desconectou porque o serviço VPN parou."
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection “%s” disconnected."
-#~ msgstr ""
-#~ "\n"
-#~ "A conexão VPN “%s” desconectou."
-
-#~ msgid "invalid EAP-TLS CA certificate: %s"
-#~ msgstr "certificado de CA EAP-TLS inválido: %s"
-
-#~ msgid "invalid EAP-TLS CA certificate: no certificate specified"
-#~ msgstr "certificado de CA EAP-TLS inválido: nenhum certificado especificado"
-
-#~ msgid "invalid EAP-TLS password: missing"
-#~ msgstr "senha EAP-TLS inválida: faltando"
-
-#~ msgid "invalid EAP-TLS private-key: %s"
-#~ msgstr "chave privada EAP-TLS inválida: %s"
-
-#~ msgid "invalid EAP-TLS user-certificate: %s"
-#~ msgstr "certificado de usuário EAP-TLS inválido: %s"
-
-#~ msgid "Unencrypted private keys are insecure"
-#~ msgstr "Chaves privadas não criptografadas são inseguras"
-
-#~| msgid ""
-#~| "The selected private key does not appear to be protected by a password.  "
-#~| "This could allow your security credentials to be compromised.  Please "
-#~| "select a password-protected private key.\n"
-#~| "\n"
-#~| "(You can password-protect your private key with openssl)"
-#~ msgid ""
-#~ "The selected private key does not appear to be protected by a password. "
-#~ "This could allow your security credentials to be compromised. Please "
-#~ "select a password-protected private key.\n"
-#~ "\n"
-#~ "(You can password-protect your private key with openssl)"
-#~ msgstr ""
-#~ "A chave privada selecionada não parece ser protegida por uma senha. Isso "
-#~ "pode permitir que as suas credenciais de segurança sejam comprometidas. "
-#~ "Por favor selecione uma chave privada protegida por senha.\n"
-#~ "\n"
-#~ "(Você pode proteger por senha sua chave privada com openssl)"
-
-#~ msgid "Choose your personal certificate"
-#~ msgstr "Escolha seu certificado pessoal"
-
-#~ msgid "Choose your private key"
-#~ msgstr "Escolha sua chave privada"
-
-#~ msgid "New Mobile Broadband connection..."
-#~ msgstr "Nova conexão de banda larga móvel..."
-
-#~ msgid "_Connect to Hidden Wi-Fi Network..."
-#~ msgstr "_Conectar-se a rede Wi-Fi oculta..."
-
-#~ msgid "Create _New Wi-Fi Network..."
-#~ msgstr "Criar _nova rede Wi-Fi..."
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "15"
-#~ msgstr "15"
-
-#~ msgid "Full duple_x"
-#~ msgstr "Full duple_x"
-
-#~ msgid "Aut_onegotiate"
-#~ msgstr "_Negociar automaticamente"
-
-#~ msgid "_Import team configuration from a file..."
-#~ msgstr "_Importar uma configuração de equipe de um arquivo..."
-
-#~ msgid "FirewallD is not running."
-#~ msgstr "FirewallD não está em execução."
-
-#~ msgid "New..."
-#~ msgstr "Novo..."
-
-#~ msgid "_Disconnect VPN"
-#~ msgstr "_Desconectar VPN"
-
-#~ msgid "NetworkManager for GNOME"
-#~ msgstr "Gerenciador de redes para o GNOME"
-
-#~ msgid "_Help"
-#~ msgstr "Aj_uda"
-
-#~ msgid "Infrastructure"
-#~ msgstr "Infraestrutura"
-
-#~ msgid "bdaddr"
-#~ msgstr "bdaddr"
-
-#~ msgid "Enable WiMA_X Mobile Broadband"
-#~ msgstr "Habilitar banda larga móvel WiMA_X"
-
-#~ msgid "You are now connected to the bonded network."
-#~ msgstr "Você agora está conectado à rede vinculada."
-
-#~ msgid "Preparing bond connection '%s'..."
-#~ msgstr "Preparando conexão de vínculo \"%s\"..."
-
-#~ msgid "Configuring bond connection '%s'..."
-#~ msgstr "Configurando conexão de vínculo \"%s\"..."
-
-#~ msgid "User authentication required for bond connection '%s'..."
-#~ msgstr "Autenticação necessária pela conexão de vínculo \"%s\"..."
-
-#~ msgid "Requesting address for '%s'..."
-#~ msgstr "Requisitando um endereço para \"%s\"..."
-
-#~ msgid "Bond connection '%s' active"
-#~ msgstr "Conexão de vínculo \"%s\" ativa"
-
-#~ msgid "You are now connected to the bridged network."
-#~ msgstr "Você agora está conectado à rede de ponte."
-
-#~ msgid "Preparing bridge connection '%s'..."
-#~ msgstr "Preparando conexão de ponte \"%s\"..."
-
-#~ msgid "Configuring bridge connection '%s'..."
-#~ msgstr "Configurando conexão de ponte \"%s\"..."
-
-#~ msgid "User authentication required for bridge connection '%s'..."
-#~ msgstr "Autenticação necessária pela conexão de ponte \"%s\"..."
-
-#~ msgid "Bridge connection '%s' active"
-#~ msgstr "Conexão de ponte \"%s\" ativa"
-
-#~ msgid "New Mobile Broadband (CDMA) connection..."
-#~ msgstr "Nova conexão de banda larga móvel (CDMA)..."
-
-#~ msgid "You are now connected to the CDMA network."
-#~ msgstr "Você agora está conectado à rede CDMA."
-
-#~ msgid "CDMA network."
-#~ msgstr "Rede CDMA."
-
-#~ msgid "New Mobile Broadband (GSM) connection..."
-#~ msgstr "Nova conexão de banda larga móvel (GSM)..."
-
-#~ msgid "You are now connected to the GSM network."
-#~ msgstr "Você agora está conectado à rede GSM."
-
-#~ msgid "GSM network."
-#~ msgstr "Rede GSM."
-
-#~ msgid "Auto InfiniBand"
-#~ msgstr "InfiniBand automática"
-
-#~ msgid "InfiniBand Networks (%s)"
-#~ msgstr "Redes InfiniBand (%s)"
-
-#~ msgid "InfiniBand Network (%s)"
-#~ msgstr "Rede InfiniBand (%s)"
-
-#~ msgid "InfiniBand Networks"
-#~ msgstr "Redes InfiniBand"
-
-#~ msgid "InfiniBand Network"
-#~ msgstr "Rede InfiniBand"
-
-#~ msgid "You are now connected to the InfiniBand network."
-#~ msgstr "Você agora está conectado à rede InfiniBand."
-
-#~ msgid "Preparing InfiniBand connection '%s'..."
-#~ msgstr "Preparando conexão InfiniBand \"%s\"..."
-
-#~ msgid "Configuring InfiniBand connection '%s'..."
-#~ msgstr "Configurando conexão InfiniBand \"%s\"..."
-
-#~ msgid "User authentication required for InfiniBand connection '%s'..."
-#~ msgstr "Autenticação necessária pela conexão InfiniBand \"%s\"..."
-
-#~ msgid "InfiniBand connection '%s' active"
-#~ msgstr "Conexão InfiniBand \"%s\" ativa"
-
-#~ msgid "You are now connected to the teamed network."
-#~ msgstr "Você agora está conectado à rede de união."
-
-#~ msgid "Preparing team connection '%s'..."
-#~ msgstr "Preparando conexão de união \"%s\"..."
-
-#~ msgid "Configuring team connection '%s'..."
-#~ msgstr "Configurando conexão de união \"%s\"..."
-
-#~ msgid "User authentication required for team connection '%s'..."
-#~ msgstr "Autenticação necessária pela conexão de união \"%s\"..."
-
-#~ msgid "Team connection '%s' active"
-#~ msgstr "Conexão de união \"%s\" ativa"
-
-#~ msgid "You are now connected to the VLAN."
-#~ msgstr "Você agora está conectado à VLAN."
-
-#~ msgid "Preparing VLAN connection '%s'..."
-#~ msgstr "Iniciando conexão VLAN \"%s\"..."
-
-#~ msgid "Configuring VLAN connection '%s'..."
-#~ msgstr "Iniciando conexão VLAN \"%s\"..."
-
-#~ msgid "User authentication required for VLAN connection '%s'..."
-#~ msgstr "Autenticação necessária pela conexão VLAN \"%s\"..."
-
-#~ msgid "VLAN connection '%s' active"
-#~ msgstr "Conexão VLAN \"%s\" ativa"
-
-#~ msgid "WiMAX Mobile Broadband (%s)"
-#~ msgstr "Banda larga móvel WiMAX (%s)"
-
-#~ msgid "WiMAX Mobile Broadband"
-#~ msgstr "Banda larga móvel WiMAX"
-
-#~ msgid "WiMAX is disabled"
-#~ msgstr "WiMAX está desabilitada"
-
-#~ msgid "WiMAX is disabled by hardware switch"
-#~ msgstr "WiMAX desabilitada por hardware"
-
-#~ msgid "You are now connected to the WiMAX network."
-#~ msgstr "Você agora está conectado à rede WiMAX."
-
-#~ msgid "%d dB"
-#~ msgstr "%d dB"
-
-#~ msgctxt "WiMAX CINR"
-#~ msgid "unknown"
-#~ msgstr "desconhecido"
-
-#~ msgctxt "WiMAX Base Station ID"
-#~ msgid "unknown"
-#~ msgstr "desconhecido"
-
-#~ msgid "WiMAX (%s)"
-#~ msgstr "WiMAX (%s)"
-
-#~ msgid "CINR:"
-#~ msgstr "CINR:"
-
-#~ msgid "BSID:"
-#~ msgstr "BSID:"
-
-#~ msgid "WiMAX"
-#~ msgstr "WiMAX"
-
-#~ msgid "Error saving connection"
-#~ msgstr "Erro ao salvar conexão"
-
-#~ msgid "The property '%s' / '%s' is invalid: %d"
-#~ msgstr "A propriedade  \"%s\" / \"%s\" inválida: %d"
-
-#~ msgid "IPv4 address netmask missing"
-#~ msgstr "Faltando máscara de rede do endereço IPv4"
-
-#~ msgid "IPv6 prefix \"%s\" missing"
-#~ msgstr "Faltando prefixo IPv6 \"%s\""
-
-#~ msgid "WiMAX name missing"
-#~ msgstr "Faltando nome WiMAX"
-
-#~ msgid "WiMAX device"
-#~ msgstr "dispositivo WiMAX"
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
-#~ "%s)."
-#~ msgstr ""
-#~ "Não foi possível realizar configuração de Bluetooth (falha ao conectar ao "
-#~ "D-Bus: (%s) %s)."
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
-#~ "%s)."
-#~ msgstr ""
-#~ "Não foi possível realizar configuração de Bluetooth (erro ao localizar o "
-#~ "NetworkManager: (%s) %s)."
-
-#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
-#~ msgstr "Use seu telefone celular como um dispositivo de rede (PAN/NAP)"
-
-#~ msgid "Access the Internet using your mobile phone (DUN)"
-#~ msgstr "Acesse a internet usando seu celular (DUN)"
-
-#~ msgid "Error: %s"
-#~ msgstr "Erro: %s"
-
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Falhou ao criar a conexão DUN: %s"
-
-#~ msgid "Your phone is now ready to use!"
-#~ msgstr "Seu telefone não está pronto para uso!"
-
-#~ msgid "Mobile wizard was canceled"
-#~ msgstr "Assistente móvel foi cancelado"
-
-#~ msgid "Unknown phone device type (not GSM or CDMA)"
-#~ msgstr "Tipo de dispositivo de telefone desconhecido (não GSM ou CDMA)"
-
-#~ msgid "failed to connect to the phone."
-#~ msgstr "falha ao conectar ao telefone."
-
-#~ msgid "error getting bus connection"
-#~ msgstr "Erro ao obter conexão de barramento"
-
-#~ msgid "unexpectedly disconnected from the phone."
-#~ msgstr "Houve uma disconexão do telefone inesperada."
-
-#~ msgid "timed out detecting phone details."
-#~ msgstr "tempo expirado ao detectar detalhes do telefone."
-
-#~ msgid "Detecting phone configuration..."
-#~ msgstr "Detectando configuração de telefone..."
-
-#~ msgid ""
-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-#~ "Networking connection."
-#~ msgstr ""
-#~ "O adaptador padrão de Bluetooth deve estar ativado antes de configurar "
-#~ "uma conexão de rede com discagem direta."
-
-#~ msgid "Failed to create PAN connection: %s"
-#~ msgstr "Falhou ao criar a conexão PAN: %s"
-
-#~ msgid "%s Network"
-#~ msgstr "Rede %s"
-
-#~ msgid "_Device MAC address:"
-#~ msgstr "Endereço MAC do _dispositivo:"
-
-#~ msgid "I_mport team configuration from a file..."
-#~ msgstr "Importar uma configuração de equipe de um arquivo..."
-
-#~ msgid "Any"
-#~ msgstr "Qualquer"
-
-#~ msgid "3G (UMTS/HSPA)"
-#~ msgstr "3G (UMTS/HSPA)"
-
-#~ msgid "2G (GPRS/EDGE)"
-#~ msgstr "2G (GPRS/EDGE)"
-
-#~ msgid "Prefer 3G (UMTS/HSPA)"
-#~ msgstr "Preferir 3G (UMTS/HSPA)"
-
-#~ msgid "Prefer 2G (GPRS/EDGE)"
-#~ msgstr "Preferir 2G (GPRS/EDGE)"
-
-#~ msgid "Prefer 4G (LTE)"
-#~ msgstr "Preferir 4G (LTE)"
-
-#~ msgid "Use only 4G (LTE)"
-#~ msgstr "Usar apenas 4G (LTE)"
-
-#~ msgid "Primary DNS:"
-#~ msgstr "DNS primário:"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS secundário:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS terciário:"
-
-#~ msgid "Automatic (PPP)"
-#~ msgstr "Automático (PPP)"
-
-#~ msgid "Automatic (PPP) addresses only"
-#~ msgstr "Somente endereços (PPP) automáticos"
-
-#~ msgid "unknown modem type."
-#~ msgstr "tipo de modem desconhecido."
-
-#~ msgid "_Save..."
-#~ msgstr "_Salvar..."
-
-#~ msgid "_Edit..."
-#~ msgstr "_Editar..."
-
-#~ msgid "_Delete..."
-#~ msgstr "E_xcluir..."
-
-#~ msgid "No Certificate Authority certificate chosen"
-#~ msgstr "Nenhum certificado de autoridade certificadora escolhido"
-
-#~ msgid ""
-#~ "Not using a Certificate Authority (CA) certificate can result in "
-#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
-#~ "a Certificate Authority certificate?"
-#~ msgstr ""
-#~ "Não usar um certificado de Autoridade Certificadora (CA) pode resultar em "
-#~ "conexões inseguras, redes Wi-Fi vulneráveis e não confiáveis. Você "
-#~ "gostaria de escolher um certificado de Autoridade Certificadora?"
diff -Nru network-manager-applet-1.8.4/po/ru.po network-manager-applet-1.8.10/po/ru.po
--- network-manager-applet-1.8.4/po/ru.po	2017-05-10 10:44:54.000000000 +0000
+++ network-manager-applet-1.8.10/po/ru.po	2017-12-19 11:44:30.000000000 +0000
@@ -8,14 +8,14 @@
 # Andrey Cherepanov , 2009, 2010.
 # Yuri Myasoedov , 2012, 2013.
 # Stas Solovey , 2011, 2014, 2017.
-#
+# lrintel , 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager-applet\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
-"PO-Revision-Date: 2017-04-03 22:50+0300\n"
-"Last-Translator: Stas Solovey \n"
+"POT-Creation-Date: 2017-12-12 11:18+0100\n"
+"PO-Revision-Date: 2017-11-07 06:44+0000\n"
+"Last-Translator: Copied by Zanata \n"
 "Language-Team: Русский \n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -23,9 +23,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Zanata 4.3.2\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
 msgstr "Сеть"
 
@@ -34,7 +34,7 @@
 msgstr "Управление сетевыми соединениями"
 
 #: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: ../src/connection-editor/nm-connection-list.ui.h:1
 msgid "Network Connections"
 msgstr "Сетевые соединения"
 
@@ -160,55 +160,68 @@
 msgid "The NetworkManager Developers"
 msgstr "Разработчики NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
 
-#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Аутентификация 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1
+#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
+#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
 #: ../src/connection-editor/ce-new-connection.ui.h:1
 #: ../src/connection-editor/ce-page-dcb.ui.h:17
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/connection-editor/connection-helpers.c:308
+#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/page-bluetooth.c:311
+#: ../src/connection-editor/page-mobile.c:543
+#: ../src/connection-editor/page-proxy.c:121
+#: ../src/connection-editor/page-team.c:344
+#: ../src/connection-editor/page-team-port.c:206
+#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
+#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/libnma/nma-vpn-password-dialog.c:209
+#: ../src/libnma/nma-wifi-dialog.c:1066
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: ../src/8021x.ui.h:3
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "П_одключиться"
 
@@ -224,37 +237,37 @@
 msgid "secure."
 msgstr "безопасный."
 
-#: ../src/applet.c:381
+#: ../src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Не удалось создать/включить соединение"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Сбой подключения"
 
-#: ../src/applet.c:435
+#: ../src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Сбой устройства при отключении"
 
-#: ../src/applet.c:440
+#: ../src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Сбой при отключении"
 
-#: ../src/applet.c:470
+#: ../src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Сбой при включении соединения"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Больше не показывать это сообщение"
 
-#: ../src/applet.c:883
+#: ../src/applet.c:899
 #, c-format
 msgid ""
 "\n"
@@ -264,7 +277,7 @@
 "\n"
 "VPN-соединение «%s» разорвано, поскольку подключение к сети было прервано."
 
-#: ../src/applet.c:885
+#: ../src/applet.c:901
 #, c-format
 msgid ""
 "\n"
@@ -275,7 +288,7 @@
 "Произошёл сбой VPN-соединения «%s», поскольку подключение к сети было "
 "прервано."
 
-#: ../src/applet.c:887
+#: ../src/applet.c:903
 #, c-format
 msgid ""
 "\n"
@@ -285,7 +298,7 @@
 "Произошёл сбой VPN-соединения «%s», поскольку служба VPN неожиданно "
 "завершилась."
 
-#: ../src/applet.c:889
+#: ../src/applet.c:905
 #, c-format
 msgid ""
 "\n"
@@ -296,7 +309,7 @@
 "Произошёл сбой VPN-соединения «%s», поскольку служба VPN вернула неверную "
 "конфигурацию."
 
-#: ../src/applet.c:891
+#: ../src/applet.c:907
 #, c-format
 msgid ""
 "\n"
@@ -305,7 +318,7 @@
 "\n"
 "Произошёл сбой VPN-соединения «%s», поскольку превышено время ожидания."
 
-#: ../src/applet.c:893
+#: ../src/applet.c:909
 #, c-format
 msgid ""
 "\n"
@@ -315,7 +328,7 @@
 "Произошёл сбой VPN-соединения «%s», поскольку служба VPN не запустилась "
 "вовремя."
 
-#: ../src/applet.c:895
+#: ../src/applet.c:911
 #, c-format
 msgid ""
 "\n"
@@ -325,7 +338,7 @@
 "Произошёл сбой VPN-соединения «%s», поскольку не удалось запустить службу "
 "VPN."
 
-#: ../src/applet.c:897
+#: ../src/applet.c:913
 #, c-format
 msgid ""
 "\n"
@@ -335,7 +348,7 @@
 "Произошёл сбой соединения VPN «%s», поскольку не удалось найти подходящий "
 "ключ VPN."
 
-#: ../src/applet.c:899
+#: ../src/applet.c:915
 #, c-format
 msgid ""
 "\n"
@@ -344,7 +357,7 @@
 "\n"
 "Не удалось установить VPN-соединение «%s», неверный ключ доступа VPN."
 
-#: ../src/applet.c:904
+#: ../src/applet.c:920
 #, c-format
 msgid ""
 "\n"
@@ -353,7 +366,7 @@
 "\n"
 "Сбой VPN-соединения «%s»."
 
-#: ../src/applet.c:931
+#: ../src/applet.c:947
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -364,19 +377,19 @@
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: ../src/applet.c:949
 msgid "VPN connection has been successfully established.\n"
 msgstr "Соединение VPN успешно установлено.\n"
 
-#: ../src/applet.c:935
+#: ../src/applet.c:951
 msgid "VPN Login Message"
 msgstr "Сообщение авторизации VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: ../src/applet.c:959 ../src/applet.c:999
 msgid "VPN Connection Failed"
 msgstr "Сбой соединения VPN"
 
-#: ../src/applet.c:987
+#: ../src/applet.c:1003
 #, c-format
 msgid ""
 "\n"
@@ -389,7 +402,7 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: ../src/applet.c:1006
 #, c-format
 msgid ""
 "\n"
@@ -402,144 +415,144 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: ../src/applet.c:1295
 msgid "device not ready (firmware missing)"
 msgstr "устройство не готово (нет прошивки)"
 
-#: ../src/applet.c:1281
+#: ../src/applet.c:1297
 msgid "device not ready"
 msgstr "устройство не готово"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "соединение разорвано"
 
-#: ../src/applet.c:1307
+#: ../src/applet.c:1323
 msgid "Disconnect"
 msgstr "Отключиться"
 
-#: ../src/applet.c:1321
+#: ../src/applet.c:1337
 msgid "device not managed"
 msgstr "устройство не управляется"
 
-#: ../src/applet.c:1394
+#: ../src/applet.c:1410
 msgid "No network devices available"
 msgstr "Нет доступных сетевых устройств"
 
-#: ../src/applet.c:1448
+#: ../src/applet.c:1464
 msgid "_VPN Connections"
 msgstr "Соединения _VPN"
 
-#: ../src/applet.c:1492
+#: ../src/applet.c:1508
 msgid "_Configure VPN…"
 msgstr "_Настроить VPN…"
 
-#: ../src/applet.c:1495
+#: ../src/applet.c:1511
 msgid "_Add a VPN connection…"
 msgstr "_Добавить VPN-соединение…"
 
-#: ../src/applet.c:1601
+#: ../src/applet.c:1617
 msgid "NetworkManager is not running…"
 msgstr "Служба NetworkManager не запущена…"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: ../src/applet.c:1622 ../src/applet.c:2687
 msgid "Networking disabled"
 msgstr "Поддержка сети отключена"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: ../src/applet.c:1832
 msgid "Enable _Networking"
 msgstr "Включить поддержку сети"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: ../src/applet.c:1841
 msgid "Enable _Wi-Fi"
 msgstr "Включить _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: ../src/applet.c:1850
 msgid "Enable _Mobile Broadband"
 msgstr "Включить _мобильную связь"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: ../src/applet.c:1862
 msgid "Enable N_otifications"
 msgstr "Включить _уведомления"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: ../src/applet.c:1874
 msgid "Connection _Information"
 msgstr "C_ведения о соединении"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: ../src/applet.c:1882
 msgid "Edit Connections…"
 msgstr "Изменить соединения…"
 
-#: ../src/applet.c:1880
+#: ../src/applet.c:1896
 msgid "_About"
 msgstr "_О программе"
 
-#: ../src/applet.c:2191
+#: ../src/applet.c:2207
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Вы подключены к сети «%s»."
 
-#: ../src/applet.c:2231
+#: ../src/applet.c:2247
 msgid "Disconnected"
 msgstr "Соединение разорвано"
 
-#: ../src/applet.c:2232
+#: ../src/applet.c:2248
 msgid "The network connection has been disconnected."
 msgstr "Сетевое соединение было разорвано."
 
-#: ../src/applet.c:2534
+#: ../src/applet.c:2550
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Подготовка сетевого соединения «%s»…"
 
-#: ../src/applet.c:2537
+#: ../src/applet.c:2553
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Для сетевого соединения «%s» требуется аутентификация…"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Получение сетевого адреса для «%s»…"
 
-#: ../src/applet.c:2543
+#: ../src/applet.c:2559
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Сетевое соединение «%s» активно"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2632
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Устанавливается VPN-соединение «%s»…"
 
-#: ../src/applet.c:2619
+#: ../src/applet.c:2635
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Для VPN-соединения «%s» требуется аутентификация…"
 
-#: ../src/applet.c:2622
+#: ../src/applet.c:2638
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Запрос адреса VPN для «%s»…"
 
-#: ../src/applet.c:2625
+#: ../src/applet.c:2641
 #, c-format
 msgid "VPN connection active"
 msgstr "VPN-соединение активно"
 
-#: ../src/applet.c:2675
+#: ../src/applet.c:2691
 msgid "No network connection"
 msgstr "Нет подключения к сети"
 
-#: ../src/applet.c:3276
+#: ../src/applet.c:3292
 msgid "NetworkManager Applet"
 msgstr "Апплет NetworkManager"
 
@@ -556,46 +569,46 @@
 msgid "Sending unlock code…"
 msgstr "Отправка кода разблокировки…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Мобильная связь (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/applet-device-broadband.c:739
+#: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Мобильная связь"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Доступно"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 msgid "New Mobile Broadband connection…"
 msgstr "Создать подключение мобильной связи…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Соединение установлено"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Вы подключены к сети мобильной связи."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "Сеть мобильной связи."
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "Вы зарегистрированы в домашней сети."
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "Вы зарегистрированы в роуминговой сети."
 
@@ -603,22 +616,22 @@
 msgid "You are now connected to the mobile broadband network."
 msgstr "Вы подключены к сети мобильной связи."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Подготовка соединения мобильной связи «%s»…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Настройка соединения мобильной связи «%s»…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Для соединения мобильной связи «%s» требуется аутентификация…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Соединение мобильной связи «%s» активно"
@@ -678,6 +691,18 @@
 msgid "DSL authentication"
 msgstr "Аутентификация DSL"
 
+#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/page-bluetooth.c:313
+#: ../src/connection-editor/page-mobile.c:545
+#: ../src/libnma/nma-vpn-password-dialog.c:210
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+msgid "_OK"
+msgstr "_ОК"
+
 #: ../src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Подключиться к скрытой сети Wi-Fi…"
@@ -690,7 +715,7 @@
 msgid "(none)"
 msgstr "(нет)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Не удалось добавить новое соединение"
 
@@ -698,79 +723,79 @@
 msgid "Insufficient privileges."
 msgstr "Недостаточно прав."
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Сети Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Сеть Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Сеть Wi-Fi"
 msgstr[1] "Сети Wi-Fi"
 msgstr[2] "Сетей Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi выключен"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi выключен механическим переключателем"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Ещё сети"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Доступны сети Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Используйте меню сети для подключения к сети Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Вы подключены к сети Wi-Fi «%s»."
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Подготовка сетевого соединения Wi-Fi «%s»…"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Настройка сетевого соединения Wi-Fi «%s»…"
 
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Для соединения Wi-Fi «%s» требуется аутентификация…"
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Запрос адреса сети Wi-Fi для «%s»…"
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Сетевое соединение Wi-Fi «%s» активно: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Сетевое соединение Wi-Fi «%s» активно"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Не удалось включить соединение"
 
@@ -778,195 +803,196 @@
 msgid "Error displaying connection information:"
 msgstr "Ошибка показа сведений о соединении:"
 
-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
 #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: ../src/applet-dialogs.c:75
 msgid "Dynamic WEP"
 msgstr "Динамический WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:231
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: ../src/applet-dialogs.c:152
 msgid "More addresses"
 msgstr "Дополнительные адреса"
 
-#: ../src/applet-dialogs.c:226
+#: ../src/applet-dialogs.c:227
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
+#: ../src/connection-editor/page-wifi-security.c:332
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Нет"
 
-#: ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:261
 #, c-format
 msgid "%s (default)"
 msgstr "%s (по умолчанию)"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мбит/c"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Неизвестно"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
 msgid "IP Address:"
 msgstr "IP-адрес:"
 
-#: ../src/applet-dialogs.c:369
+#: ../src/applet-dialogs.c:370
 msgid "Broadcast Address:"
 msgstr "Широковещательный адрес:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: ../src/applet-dialogs.c:382
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:383
 msgid "Subnet Mask:"
 msgstr "Маска подсети:"
 
-#: ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:493
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:496
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: ../src/applet-dialogs.c:503
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: ../src/applet-dialogs.c:505
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
 #: ../src/connection-editor/ce-page-team-port.ui.h:23
 #: ../src/connection-editor/ce-page-team.ui.h:48
 #: ../src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Основное"
 
-#: ../src/applet-dialogs.c:516
+#: ../src/applet-dialogs.c:517
 msgid "Interface:"
 msgstr "Интерфейс:"
 
-#: ../src/applet-dialogs.c:536
+#: ../src/applet-dialogs.c:537
 msgid "Hardware Address:"
 msgstr "Аппаратный адрес:"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:551
 msgid "Driver:"
 msgstr "Драйвер:"
 
-#: ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:586
 msgid "Speed:"
 msgstr "Скорость:"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:601
 msgid "Security:"
 msgstr "Защита:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
 #: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
 msgid "Default Route:"
 msgstr "Шлюз по умолчанию:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
 #: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
 msgid "Ignored"
 msgstr "Игнорируется"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:816
 msgid "VPN Type:"
 msgstr "Тип VPN:"
 
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:823
 msgid "VPN Gateway:"
 msgstr "Шлюз VPN:"
 
-#: ../src/applet-dialogs.c:828
+#: ../src/applet-dialogs.c:829
 msgid "VPN Username:"
 msgstr "Имя пользователя VPN:"
 
-#: ../src/applet-dialogs.c:834
+#: ../src/applet-dialogs.c:835
 msgid "VPN Banner:"
 msgstr "Баннер VPN:"
 
-#: ../src/applet-dialogs.c:840
+#: ../src/applet-dialogs.c:841
 msgid "Base Connection:"
 msgstr "Основное соединение:"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Неизвестно"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: ../src/applet-dialogs.c:958
 msgid "No valid active connections found!"
 msgstr "Активные соединения отсутствуют!"
 
-#: ../src/applet-dialogs.c:985
+#: ../src/applet-dialogs.c:1007
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"Авторское право © 2004-2014 Red Hat, Inc.\n"
-"Авторское право © 2005-2008 Novell, Inc.\n"
-"и многие другие участники сообщества и переводчики"
 
-#: ../src/applet-dialogs.c:988
+#: ../src/applet-dialogs.c:1010
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Апплет области уведомления для управления сетевыми устройствами и "
 "соединениями."
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1012
 msgid "NetworkManager Website"
 msgstr "Веб-сайт NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: ../src/applet-dialogs.c:1016
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1026
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -974,33 +1000,33 @@
 "Апплет NetworkManager не смог найти некоторые необходимые ресурсы (не "
 "найден .ui-файл интерфейса)."
 
-#: ../src/applet-dialogs.c:1006
+#: ../src/applet-dialogs.c:1031
 msgid "Missing resources"
 msgstr "Отсутствуют ресурсы"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1057
 msgid "Mobile broadband network password"
 msgstr "Пароль сети мобильной связи"
 
-#: ../src/applet-dialogs.c:1040
+#: ../src/applet-dialogs.c:1066
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Для подключения к «%s» требуется пароль."
 
-#: ../src/applet-dialogs.c:1055
+#: ../src/applet-dialogs.c:1081
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1363
 msgid "SIM PIN unlock required"
 msgstr "Для разблокировки SIM требуется PIN-код"
 
-#: ../src/applet-dialogs.c:1338
+#: ../src/applet-dialogs.c:1364
 msgid "SIM PIN Unlock Required"
 msgstr "Для разблокировки SIM требуется PIN-код"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1366
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1008,25 +1034,25 @@
 msgstr "Для работы устройства мобильной связи «%s» требуется PIN-код SIM."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1368
 msgid "PIN code:"
 msgstr "PIN-код:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1372
 msgid "Show PIN code"
 msgstr "Показывать PIN-код"
 
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1374
 msgid "SIM PUK unlock required"
 msgstr "Для разблокировки SIM требуется PUK-код"
 
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1375
 msgid "SIM PUK Unlock Required"
 msgstr "Для разблокировки SIM требуется PUK-код"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: ../src/applet-dialogs.c:1377
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1034,31 +1060,38 @@
 msgstr "Для работы устройства мобильной связи «%s» требуется PUK-код SIM."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1379
 msgid "PUK code:"
 msgstr "PUK-код:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: ../src/applet-dialogs.c:1382
 msgid "New PIN code:"
 msgstr "Новый PIN-код:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: ../src/applet-dialogs.c:1384
 msgid "Re-enter new PIN code:"
 msgstr "Введите новый PIN-код ещё раз:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: ../src/applet-dialogs.c:1389
 msgid "Show PIN/PUK codes"
 msgstr "Показывать PIN/PUK-коды"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
-msgstr "_ОК"
+#: ../src/applet-vpn-request.c:201
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Сведения о текущем соединении"
+
+#: ../src/applet-vpn-request.c:251
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Не удалось включить соединение"
+
+#: ../src/applet-vpn-request.c:259
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
@@ -1075,21 +1108,21 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
 msgstr "_Добавить"
 
-#. Delete
 #: ../src/connection-editor/ce-ip4-routes.ui.h:5
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/nm-connection-list.c:711
+#: ../src/connection-editor/connection-helpers.c:772
+#: ../src/connection-editor/nm-connection-list.ui.h:4
 msgid "_Delete"
 msgstr "_Удалить"
 
@@ -1181,11 +1214,10 @@
 msgid "M_ode:"
 msgstr "_Режим:"
 
-#. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: ../src/connection-editor/nm-connection-list.ui.h:5
 msgid "_Edit"
 msgstr "_Изменить"
 
@@ -1241,7 +1273,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 #: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
@@ -1250,7 +1282,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-infiniband.ui.h:7
 #: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
@@ -1283,25 +1315,71 @@
 msgstr "Интервал _hello:"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "s"
 msgstr "с"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "Enable I_GMP snooping"
 msgstr "Включить I_GMP snooping"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:14
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Включить _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:15
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:16
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:17
 msgid "_Max age:"
 msgstr "_Максимальное время жизни сообщения:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:18
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:19
 msgid "_Aging time:"
 msgstr "_Время жизни сообщения:"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:20
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:21
+msgid "Group _forward mask:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:22
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
 #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "автоматический"
@@ -1555,10 +1633,20 @@
 msgstr "_Имя пользователя:"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
 msgid "_Service:"
 msgstr "С_лужба:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:5
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 #: ../src/wireless-security/ws-leap.ui.h:3
@@ -1566,7 +1654,11 @@
 msgid "Sho_w password"
 msgstr "Пока_зывать пароль"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-dsl.ui.h:6
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:7
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
 #: ../src/libnma/nma-vpn-password-dialog.c:97
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
@@ -1577,13 +1669,29 @@
 msgid "_Password:"
 msgstr "_Пароль:"
 
+#: ../src/connection-editor/ce-page-dsl.ui.h:8
+msgid "PPP _interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:9
+msgid "P_arent interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:10
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:11
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "Автоматический"
@@ -1629,7 +1737,7 @@
 msgstr "Полный"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "Игнорировать"
 
@@ -1637,7 +1745,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "Вручную"
 
@@ -1646,7 +1754,7 @@
 msgstr "_Порт:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
 msgid "_Device:"
 msgstr "_Устройство"
@@ -1795,20 +1903,20 @@
 msgid "Address (optional)"
 msgstr "Адрес (опционально)"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "_Транспортный режим:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
 msgid "Datagram"
 msgstr "Дейтаграмма"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
 msgid "Connected"
 msgstr "Подключено"
 
+#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+msgid "_Transport mode:"
+msgstr "_Транспортный режим:"
+
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
 msgid "IPIP"
 msgstr "IPIP"
@@ -1846,36 +1954,39 @@
 msgstr "VTI6"
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-msgid "Device name"
-msgstr "Имя устройства"
+#: ../src/connection-editor/ce-page-macsec.ui.h:6
+msgid "Device name:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-msgid "Parent device"
-msgstr "Родительское устройство"
+#: ../src/connection-editor/ce-page-macsec.ui.h:8
+msgid "Parent device:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-msgid "Mode"
-msgstr "Режим"
+#: ../src/connection-editor/ce-page-macsec.ui.h:16
+msgid "Mode:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP"
-msgstr "Локальный IP"
+msgid "Local IP:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP"
-msgstr "Удалённый IP"
+msgid "Remote IP:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key"
-msgstr "Ключ ввода"
+msgid "Input key:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key"
-msgstr "Ключ вывода"
+msgid "Output key:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-msgid "MTU"
-msgstr "MTU"
+msgid "MTU:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1890,12 +2001,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "Общий с другими компьютерами"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "_Метод:"
 
@@ -1910,7 +2021,7 @@
 "DHCP, введите его здесь."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1923,16 +2034,16 @@
 msgstr "ID _клиента DHCP:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "_Поисковый домен:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "Серверы _DNS:"
 
@@ -1957,11 +2068,12 @@
 "соединение в случае сбоя конфигурации IPv4, но успеха конфигурации IPv6."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "_Маршруты…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-macsec.ui.h:3
 #: ../src/connection-editor/page-ip4.c:198
 msgid "Disabled"
 msgstr "Выключено"
@@ -1974,7 +2086,15 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "Включено (предпочитать временный адрес)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Stable privacy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -1984,15 +2104,19 @@
 "несколько DNS-серверов через запятую. Адреса локальной связи будут "
 "автоматически привязаны к интерфейсу подключения."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "Расширения _конфиденциальности IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Требовать адресацию IPv_6 для этого соединения"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2000,6 +2124,94 @@
 "При подключении к сетям с возможностями IPv4: разрешает установить "
 "соединение в случае сбоя конфигурации IPv6, но успеха конфигурации IPv4."
 
+#: ../src/connection-editor/ce-page-macsec.ui.h:1
+msgid "PSK"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:2
+#: ../src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:4
+msgid "Check"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:5
+msgid "Strict"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:7
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:9
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:10
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:11
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:12
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:13
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:14
+msgid "CKN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:15
+msgid "CAK:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:17
+msgid "Keys:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:18
+msgid "Parameters:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:19
+msgid "Validation:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:20
+msgid "SCI port:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:21
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:22
+msgid "Encrypt"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:23
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:24
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:26
 msgid "Basic"
@@ -2086,38 +2298,38 @@
 msgstr "Посылать _эхо-пакеты PPP"
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:1
-msgid "Method:"
-msgstr "Метод:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-team.ui.h:25
 msgid "None"
 msgstr "Нет"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: ../src/connection-editor/ce-page-proxy.ui.h:3
 msgid "For browser only"
 msgstr "Только для браузера"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: ../src/connection-editor/ce-page-proxy.ui.h:4
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: ../src/connection-editor/ce-page-proxy.ui.h:5
 msgid "PAC URL:"
 msgstr ""
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:6
+msgid "PAC script:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-proxy.ui.h:7
 msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
 msgid "Import script from a file…"
 msgstr "Импортировать скрипт из файла…"
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:9
+msgid "Method:"
+msgstr "Метод:"
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:19
 msgid "Ad_vanced…"
@@ -2163,75 +2375,75 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
-msgstr "_Приоритет порта:"
+msgid "Active-Backup runner options"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
-msgstr ""
+msgid "_Port priority:"
+msgstr "_Приоритет порта:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:82
-msgid ""
-"Validate received ARP packets on active ports. If this is not checked, all "
-"incoming ARP packets will be considered as a good reply."
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:44
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
 msgid "Port priority. The higher number means higher priority."
 msgstr ""
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port _sticky"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:15
-msgid "Active-Backup runner options"
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:16
+msgid "LACP runner options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
 #, fuzzy
 msgid "_LACP port priority:"
 msgstr "_Приоритет:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
 #, fuzzy
 msgid "LACP port _key:"
 msgstr "Секретный _ключ:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
 #: ../src/connection-editor/ce-page-team.ui.h:43
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
 #: ../src/connection-editor/ce-page-team.ui.h:45
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
-msgid "LACP runner options"
-msgstr ""
-
 #: ../src/connection-editor/ce-page-team-port.ui.h:24
 #: ../src/connection-editor/ce-page-team.ui.h:70
 msgid "_Link watcher:"
@@ -2418,14 +2630,14 @@
 msgstr "LACP"
 
 #: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/connection-helpers.c:105
 #: ../src/connection-editor/page-ethernet.c:351
 #: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/connection-helpers.c:120
 #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
 #: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
@@ -2680,6 +2892,7 @@
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
+#: ../src/connection-editor/ce-polkit.c:63
 #: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Нет разрешения polkit для выполнения действия"
@@ -2737,58 +2950,63 @@
 "аутентификации. Если же соединение не устанавливается, попробуйте выключить "
 "поддержку некоторых методов."
 
-#: ../src/connection-editor/connection-helpers.c:105
+#: ../src/connection-editor/connection-helpers.c:106
 #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
+#: ../src/connection-editor/connection-helpers.c:114
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
-
 #: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-dsl.c:201
+msgid "DSL/PPPoE"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
 #: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:117
 #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Team"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-bridge.c:212
+#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/page-bridge.c:233
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Мост"
 
-#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/connection-helpers.c:121
 #: ../src/connection-editor/page-ip-tunnel.c:176
 msgid "IP tunnel"
 msgstr "IP-туннель"
 
 #: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
+#: ../src/connection-editor/page-macsec.c:190
+msgid "MACsec"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:124
+#: ../src/connection-editor/connection-helpers.c:398
 #: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:205
+#: ../src/connection-editor/connection-helpers.c:207
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2798,11 +3016,11 @@
 "\n"
 "Ошибка: нет типа службы VPN."
 
-#: ../src/connection-editor/connection-helpers.c:217
+#: ../src/connection-editor/connection-helpers.c:219
 msgid "Cannot import VPN connection"
 msgstr "Не удалось импортировать VPN-соединение"
 
-#: ../src/connection-editor/connection-helpers.c:219
+#: ../src/connection-editor/connection-helpers.c:221
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2815,46 +3033,53 @@
 "\n"
 "Ошибка: %s."
 
-#: ../src/connection-editor/connection-helpers.c:220
+#: ../src/connection-editor/connection-helpers.c:222
 msgid "unknown error"
 msgstr "неизвестная ошибка"
 
-#: ../src/connection-editor/connection-helpers.c:303
+#: ../src/connection-editor/connection-helpers.c:305
 #: ../src/connection-editor/page-proxy.c:118
 #: ../src/connection-editor/page-team.c:341
 #: ../src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Выбор файла для импортирования"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: ../src/connection-editor/connection-helpers.c:309
+#: ../src/connection-editor/page-proxy.c:122
+#: ../src/connection-editor/page-team.c:345
+#: ../src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:340
 msgid "Hardware"
 msgstr "Физическое"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: ../src/connection-editor/connection-helpers.c:367
 msgid "Virtual"
 msgstr "Логическое"
 
-#: ../src/connection-editor/connection-helpers.c:514
 #: ../src/connection-editor/connection-helpers.c:516
+#: ../src/connection-editor/connection-helpers.c:518
 msgid "Import a saved VPN configuration…"
 msgstr "Импортировать сохранённую конфигурацию VPN…"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: ../src/connection-editor/connection-helpers.c:548
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Не удалось создать диалог редактора соединений из-за внутренней ошибки."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: ../src/connection-editor/connection-helpers.c:557
 msgid "Could not create new connection"
 msgstr "Не удалось создать новое соединение"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: ../src/connection-editor/connection-helpers.c:720
 msgid "Connection delete failed"
 msgstr "Не удалось удалить соединение"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: ../src/connection-editor/connection-helpers.c:768
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Удалить соединение «%s»?"
@@ -2862,7 +3087,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "Адрес"
 
@@ -2874,7 +3099,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "Шлюз"
 
@@ -2884,38 +3109,38 @@
 msgstr "Метрика"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "Префикс"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: ../src/connection-editor/nm-connection-editor.c:109
 #, c-format
 msgid "Editing %s"
 msgstr "Изменение %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: ../src/connection-editor/nm-connection-editor.c:113
 msgid "Editing un-named connection"
 msgstr "Изменение безымянного соединения"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: ../src/connection-editor/nm-connection-editor.c:133
 msgid "Missing connection name"
 msgstr "Отсутствует имя соединения"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: ../src/connection-editor/nm-connection-editor.c:353
 msgid "Editor initializing…"
 msgstr "Инициализация редактора…"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: ../src/connection-editor/nm-connection-editor.c:360
+#: ../src/connection-editor/nm-connection-list.c:443
 msgid "Connection cannot be modified"
 msgstr "Невозможно изменить соединение"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: ../src/connection-editor/nm-connection-editor.c:375
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Недопустимая настройка %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: ../src/connection-editor/nm-connection-editor.c:451
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2923,55 +3148,52 @@
 "Редактор соединений не может найти некоторые необходимые ресурсы (не найден "
 "файл .ui)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/nm-connection-editor.c:579
 msgid "Save any changes made to this connection."
 msgstr "Сохранить параметры соединения."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: ../src/connection-editor/nm-connection-editor.c:580
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Введите пароль администратора для того, чтобы сделать это соединение общим "
 "для всех пользователей компьютера."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not create connection"
 msgstr "Не удалось создать соединение"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not edit connection"
 msgstr "Не удалось изменить соединение"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: ../src/connection-editor/nm-connection-editor.c:598
 msgid "Unknown error creating connection editor dialog."
 msgstr "Ошибка создания диалога для изменения соединений."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: ../src/connection-editor/nm-connection-editor.c:739
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:758
+#: ../src/connection-editor/nm-connection-editor.c:759
 msgid "Error initializing editor"
 msgstr "Ошибка инициализации редактора"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: ../src/connection-editor/nm-connection-editor.c:1157
 msgid "Connection add failed"
 msgstr "Сбой добавления соединения"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr "_Закрыть"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Fix"
 msgstr "Исправить"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -2980,50 +3202,50 @@
 "Установите в TRUE, чтобы отключить предупреждения о сертификатах CA для "
 "аутентификации EAP."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "_Название соединения:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "_Export…"
 msgstr "_Экспортировать…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
 #, fuzzy
 msgid "File Relabel"
 msgstr "Имя файла"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 #, fuzzy
 msgid "_Relabel"
 msgstr "Имя файла"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
 #, fuzzy
 msgid "Relabel"
 msgstr "Имя файла"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
 msgid "Filename"
 msgstr "Имя файла"
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: ../src/connection-editor/nm-connection-list.c:151
 msgid "never"
 msgstr "никогда"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:173
 msgid "now"
 msgstr "сейчас"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: ../src/connection-editor/nm-connection-list.c:180
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3031,7 +3253,7 @@
 msgstr[1] "%d минуты назад"
 msgstr[2] "%d минут назад"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: ../src/connection-editor/nm-connection-list.c:184
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3039,7 +3261,7 @@
 msgstr[1] "%d часа назад"
 msgstr[2] "%d часов назад"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:196
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3047,7 +3269,7 @@
 msgstr[1] "%d дня назад"
 msgstr[2] "%d дней назад"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: ../src/connection-editor/nm-connection-list.c:202
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3055,7 +3277,7 @@
 msgstr[1] "%d месяца назад"
 msgstr[2] "%d месяцев назад"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: ../src/connection-editor/nm-connection-list.c:206
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3063,63 +3285,79 @@
 msgstr[1] "%d года назад"
 msgstr[2] "%d лет назад"
 
-#: ../src/connection-editor/nm-connection-list.c:635
+#: ../src/connection-editor/nm-connection-list.c:445
+msgid "Connection cannot be deleted"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:448
+msgid "Select a connection to edit"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:450
+msgid "Select a connection to delete"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:785
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: ../src/connection-editor/nm-connection-list.c:798
 msgid "Last Used"
 msgstr "Последнее использование"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: ../src/connection-editor/nm-connection-list.c:836
 msgid "Edit the selected connection"
 msgstr "Изменить выбранное соединение"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: ../src/connection-editor/nm-connection-list.c:837
 msgid "Authenticate to edit the selected connection"
 msgstr "Для изменения выбранного соединения необходима аутентификация"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: ../src/connection-editor/nm-connection-list.c:842
 msgid "Delete the selected connection"
 msgstr "Удалить выбранное соединение"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: ../src/connection-editor/nm-connection-list.c:843
 msgid "Authenticate to delete the selected connection"
 msgstr "Для удаления выбранного соединения необходима аутентификация"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:1048
+#: ../src/connection-editor/nm-connection-list.c:1051
 msgid "Error creating connection"
 msgstr "Ошибка создания соединения"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:1049
 msgid "No VPN plugins are installed."
 msgstr "Модули VPN не установлены."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:1052
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Неизвестно, как создавать соединения «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: ../src/connection-editor/nm-connection-list.c:1085
 msgid "Error editing connection"
 msgstr "Ошибка изменения соединения"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: ../src/connection-editor/nm-connection-list.c:1086
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Соединение с UUID «%s» не найдено"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: ../src/connection-editor/nm-connection-list.ui.h:2
+msgid "Add a new connection"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:116
 msgid "802.1X Security"
 msgstr "Безопасность 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: ../src/connection-editor/page-8021x-security.c:118
 msgid "Could not load 802.1X Security user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс безопасности 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: ../src/connection-editor/page-8021x-security.c:132
 msgid "Use 802.1_X security for this connection"
 msgstr "Использовать безопасность 802.1_X для этого соединения"
 
@@ -3172,11 +3410,11 @@
 msgid "Bond connection %d"
 msgstr "Агрегированное соединение (bond) %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:236
 msgid "Could not load bridge user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс соединения типа мост."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: ../src/connection-editor/page-bridge.c:352
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Соединение типа мост %d"
@@ -3201,11 +3439,15 @@
 msgid "Could not load DCB user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс DCB."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: ../src/connection-editor/page-dsl.c:203
 msgid "Could not load DSL user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: ../src/connection-editor/page-dsl.c:298
+msgid "missing parent interface"
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:343
 #, c-format
 msgid "DSL connection %d"
 msgstr "Соединение DSL %d"
@@ -3306,27 +3548,27 @@
 msgstr "Проводное соединение %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "Автоматический (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "Автоматический (VPN, только адрес)"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "Автоматический, только адреса"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "Автоматический (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Автоматический (PPPoE, только адрес)"
 
@@ -3339,17 +3581,17 @@
 msgstr "Автоматический (DHCP, только адрес)"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "Только для локальной связи"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "_Дополнительные серверы DNS:"
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "До_полнительные поисковые домены:"
 
@@ -3386,45 +3628,54 @@
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "Автоматический, только DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Маршруты IPv4 для %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "Параметры IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr ""
 "Не удалось загрузить пользовательский интерфейс IPv6.пользовательский "
 "интерфейс"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
+#: ../src/connection-editor/page-macsec.c:192
+msgid "Could not load MACsec user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-macsec.c:331
+#, c-format
+msgid "MACSEC connection %d"
+msgstr ""
+
 #: ../src/connection-editor/page-master.c:247
 #: ../src/connection-editor/page-master.c:258
 msgid "Duplicate slaves"
@@ -3481,38 +3732,34 @@
 msgstr "Оператор использует технологию _CDMA (1xRTT, EVDO)"
 
 #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: ../src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
 #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: ../src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
 #: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: ../src/wireless-security/eap-method-ttls.c:287
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: ../src/wireless-security/eap-method-fast.c:282
+#: ../src/wireless-security/eap-method-peap.c:299
+#: ../src/wireless-security/eap-method-ttls.c:317
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: ../src/wireless-security/eap-method-ttls.c:302
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3547,13 +3794,13 @@
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Ошибка: файл не содержит конфигурации JSON"
 
-#: ../src/connection-editor/page-team.c:1156
+#: ../src/connection-editor/page-team.c:1034
 msgid "Could not load team user interface."
 msgstr ""
 "Не удалось загрузить пользовательский интерфейс агрегированного соединения "
 "(team)."
 
-#: ../src/connection-editor/page-team.c:1253
+#: ../src/connection-editor/page-team.c:1131
 #, c-format
 msgid "Team connection %d"
 msgstr "Агрегированное соединение (team) %d"
@@ -3561,11 +3808,11 @@
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: ../src/connection-editor/page-team-port.c:655
 msgid "Team Port"
 msgstr "Порт агрегации (team)"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: ../src/connection-editor/page-team-port.c:657
 msgid "Could not load team port user interface."
 msgstr ""
 "Не удалось загрузить пользовательский интерфейс порта агрегации (team)."
@@ -3673,50 +3920,50 @@
 msgid "Wi-Fi connection %d"
 msgstr "Соединение Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
+#: ../src/connection-editor/page-wifi-security.c:358
 #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP (40/128-битный ключ (Hex или ASCII))"
 
-#: ../src/connection-editor/page-wifi-security.c:366
+#: ../src/connection-editor/page-wifi-security.c:368
 #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP (128-битный ключ)"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: ../src/connection-editor/page-wifi-security.c:394
 msgid "Dynamic WEP (802.1X)"
 msgstr "Динамический WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
+#: ../src/connection-editor/page-wifi-security.c:407
 #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA/WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
+#: ../src/connection-editor/page-wifi-security.c:420
 #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: ../src/connection-editor/page-wifi-security.c:463
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Не удалось загрузить пользовательский интерфейс безопасности Wi-Fi; "
 "отсутствуют параметры Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: ../src/connection-editor/page-wifi-security.c:474
 msgid "Wi-Fi Security"
 msgstr "Защита Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: ../src/connection-editor/page-wifi-security.c:476
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс безопасности Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:558
+#: ../src/connection-editor/page-wifi-security.c:560
 #, c-format
 msgid "missing SSID"
 msgstr "отсутствует SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:564
+#: ../src/connection-editor/page-wifi-security.c:566
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Безопасность несовместима с режимом Ad-Hoc"
@@ -3766,36 +4013,40 @@
 msgid "Connection Information"
 msgstr "Сведения о текущем соединении"
 
+#: ../src/info.ui.h:2
+msgid "_Close"
+msgstr "_Закрыть"
+
 #: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Активные сетевые соединения"
 
 #: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
 #, fuzzy
 msgid "No certificate set"
 msgstr "Сертификат УЦ не _требуется"
 
 #: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
 #, fuzzy
 msgid "No key set"
 msgstr "файлы не выбраны"
 
 #: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Выбрать сертификат УЦ"
 
 #: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
 #, fuzzy, c-format
 msgid "%s private _key:"
 msgstr "Приватный _ключ:"
 
 #: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
 #, fuzzy, c-format
 msgid "%s key _password:"
 msgstr "_Пароль приватного ключа:"
@@ -3806,7 +4057,7 @@
 msgstr "Выбрать сертификат УЦ"
 
 #: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
 msgid "%s _certificate:"
 msgstr "Сертификат _пользователя:"
@@ -4008,45 +4259,45 @@
 msgid "New Mobile Broadband Connection"
 msgstr "Новое соединение мобильной связи"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: ../src/libnma/nma-cert-chooser-button.c:165
 msgid "(None)"
 msgstr "(Нет)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: ../src/libnma/nma-cert-chooser-button.c:173
 #, c-format
 msgid "Key in %s"
 msgstr "Ключ в %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: ../src/libnma/nma-cert-chooser-button.c:174
 #, c-format
 msgid "Certificate in %s"
 msgstr "Сертификат в %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
+#: ../src/libnma/nma-cert-chooser-button.c:193
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Неизвестно)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: ../src/libnma/nma-cert-chooser-button.c:215
+#: ../src/libnma/nma-cert-chooser-button.c:245
 msgid "Select"
 msgstr "Выбрать"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: ../src/libnma/nma-cert-chooser-button.c:216
+#: ../src/libnma/nma-cert-chooser-button.c:246
 msgid "Cancel"
 msgstr "Отменить"
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: ../src/libnma/nma-cert-chooser-button.c:472
 msgid "Select from file…"
 msgstr "Выбрать из файла…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Выбрать сертификат %s"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s certificate _password:"
 msgstr "Пароль сертификата %s:"
@@ -4109,8 +4360,8 @@
 msgid "_Tertiary Password:"
 msgstr "_Третий пароль:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: ../src/libnma/nma-vpn-password-dialog.c:238
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "По_казывать пароли"
 
@@ -4139,45 +4390,45 @@
 msgid "Dynamic WEP (802.1x)"
 msgstr "Динамический WEP (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "С_оздать"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Для подключения к сети Wi-Fi «%s» требуется указать ключ или пароль."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Для сети Wi-Fi требуется аутентификация"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Сеть Wi-Fi требует аутентификацию"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Создать новую сеть Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Новая сеть Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Введите имя для создаваемой сети Wi-Fi."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Подключение к скрытой сети Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Скрытая сеть Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4331,25 +4582,25 @@
 msgid "Roaming network"
 msgstr "Роуминговая сеть"
 
-#: ../src/mobile-helpers.c:331
+#: ../src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN-код для SIM-карты «%s» на «%s»"
 
-#: ../src/mobile-helpers.c:464
+#: ../src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Требуется PIN-код"
 
-#: ../src/mobile-helpers.c:472
+#: ../src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Для устройства мобильной связи требуется PIN-код"
 
-#: ../src/mobile-helpers.c:622
+#: ../src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Соединение мобильной связи «%s» активно: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: ../src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "роуминг"
 
@@ -4359,11 +4610,11 @@
 msgid "%s connection"
 msgstr "Подключение %s"
 
-#: ../src/utils/utils.c:563
+#: ../src/utils/utils.c:565
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Сертификаты PEM (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: ../src/utils/utils.c:577
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Секретные ключи DER, PEM или PKCS#12 (*.der, *.pem, *.p12)"
 
@@ -4371,38 +4622,35 @@
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "неизвестная ошибка в безопасности 802.1x (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr "файлы не выбраны"
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr "файл «%s» не существует"
+#: ../src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Сертификат УЦ не _требуется"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
-msgstr "неизвестная ошибка проверки файла ЕАР-методом"
+#: ../src/wireless-security/eap-method.c:370
+#, fuzzy
+msgid "selected CA certificate file does not exist"
+msgstr "Сертификат УЦ не _требуется"
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: ../src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "отсутствует файл EAP-FAST PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: ../src/wireless-security/eap-method-fast.c:267
+#: ../src/wireless-security/eap-method-peap.c:329
+#: ../src/wireless-security/eap-method-ttls.c:379
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:405
 msgid "Choose a PAC file"
 msgstr "Выбрать файл PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:412
 msgid "PAC files (*.pac)"
 msgstr "Файлы PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: ../src/wireless-security/eap-method-fast.c:416
 msgid "All files"
 msgstr "Все файлы"
 
@@ -4420,7 +4668,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:4
 #: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "Anony_mous identity:"
 msgstr "_Анонимная идентификация:"
 
@@ -4430,7 +4678,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:6
 #: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
 msgid "_Inner authentication:"
 msgstr "Вн_утренняя аутентификация:"
 
@@ -4446,26 +4694,12 @@
 msgid "missing EAP-LEAP password"
 msgstr "отсутствует пароль EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr "недействительный сертификат EAP-PEAP CA: %s"
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr "недействительный сертификат EAP-PEAP CA: сертификат не указан"
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: ../src/wireless-security/eap-method-peap.c:314
+#: ../src/wireless-security/eap-method-ttls.c:364
 #: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-msgid "Choose a Certificate Authority certificate"
-msgstr "Выбрать сертификат удостоверяющего центра"
-
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "Версия 0"
@@ -4475,20 +4709,27 @@
 msgstr "Версия 1"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "С_ертификат УЦ:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
 #: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
 msgid "No CA certificate is _required"
 msgstr "Сертификат УЦ не _требуется"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:6
 msgid "PEAP _version:"
 msgstr "_Версия PEAP:"
 
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Domain:"
+msgstr ""
+
 #: ../src/wireless-security/eap-method-simple.c:75
 msgid "missing EAP username"
 msgstr "отсутствует имя пользователя EAP"
@@ -4501,50 +4742,31 @@
 msgid "missing EAP-TLS identity"
 msgstr "отсутствует идентичность EAP-TLS"
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: ../src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Сертификат УЦ не _требуется"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: ../src/wireless-security/eap-method-tls.c:261
 #, fuzzy
 msgid "selected user certificate file does not exist"
 msgstr "Сертификат УЦ не _требуется"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:281
 #, fuzzy
 msgid "no key selected"
 msgstr "файлы не выбраны"
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: ../src/wireless-security/eap-method-tls.c:286
 #, fuzzy
 msgid "selected key file does not exist"
 msgstr "файл «%s» не существует"
 
-#: ../src/wireless-security/eap-method-tls.c:314
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Сертификат УЦ не _требуется"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-#, fuzzy
-msgid "selected CA certificate file does not exist"
-msgstr "Сертификат УЦ не _требуется"
-
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "_Идентификация:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr "недействительный сертификат EAP-TTLS CA: %s"
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr "недействительный сертификат EAP-TTLS CA: сертификат не указан"
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (без EAP)"
 
@@ -4625,17 +4847,17 @@
 "недействительный wep-ключ: парольная фраза должна быть короче 64 символов"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (по умолчанию)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Open System"
 msgstr "Открытая система"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Shared Key"
 msgstr "Общий ключ"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "1 (Default)"
+msgstr "1 (по умолчанию)"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key:"
 msgstr "_Ключ:"
@@ -4666,560 +4888,3 @@
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "_Тип:"
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection “%s” disconnected because the VPN service stopped."
-#~ msgstr ""
-#~ "\n"
-#~ "VPN-соединение «%s» разорвано, поскольку служба VPN была остановлена."
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection “%s” disconnected."
-#~ msgstr ""
-#~ "\n"
-#~ "VPN-соединение «%s» разорвано."
-
-#, fuzzy
-#~ msgid "invalid EAP-TLS CA certificate: %s"
-#~ msgstr "С_ертификат УЦ:"
-
-#, fuzzy
-#~ msgid "invalid EAP-TLS CA certificate: no certificate specified"
-#~ msgstr "С_ертификат УЦ:"
-
-#, fuzzy
-#~ msgid "invalid EAP-TLS password: missing"
-#~ msgstr "С_ертификат УЦ:"
-
-#, fuzzy
-#~ msgid "invalid EAP-TLS private-key: %s"
-#~ msgstr "С_ертификат УЦ:"
-
-#, fuzzy
-#~ msgid "invalid EAP-TLS user-certificate: %s"
-#~ msgstr "С_ертификат УЦ:"
-
-#~ msgid "Unencrypted private keys are insecure"
-#~ msgstr "Использовать секретные ключи без шифрования небезопасно"
-
-#, fuzzy
-#~| msgid ""
-#~| "The selected private key does not appear to be protected by a password.  "
-#~| "This could allow your security credentials to be compromised.  Please "
-#~| "select a password-protected private key.\n"
-#~| "\n"
-#~| "(You can password-protect your private key with openssl)"
-#~ msgid ""
-#~ "The selected private key does not appear to be protected by a password. "
-#~ "This could allow your security credentials to be compromised. Please "
-#~ "select a password-protected private key.\n"
-#~ "\n"
-#~ "(You can password-protect your private key with openssl)"
-#~ msgstr ""
-#~ "Выбранный секретный ключ не защищён паролем. Это небезопасно, выберите "
-#~ "секретный ключ, защищённый паролем.\n"
-#~ "\n"
-#~ "Примечание: секретный ключ можно защитить с помощью openssl."
-
-#, fuzzy
-#~| msgid "Choose your personal certificate..."
-#~ msgid "Choose your personal certificate"
-#~ msgstr "Выбрать персональный сертификат…"
-
-#, fuzzy
-#~| msgid "Choose your private key..."
-#~ msgid "Choose your private key"
-#~ msgstr "Выбрать секретный ключ…"
-
-#~ msgid "_User certificate:"
-#~ msgstr "_Пользовательский сертификат:"
-
-#~ msgid "Preparing network connection '%s'..."
-#~ msgstr "Подготовка сетевого соединения «%s»…"
-
-#~ msgid "User authentication required for network connection '%s'..."
-#~ msgstr "Для сетевого соединения «%s» требуется аутентификация…"
-
-#~ msgid "Requesting a network address for '%s'..."
-#~ msgstr "Запрос сетевого адреса для «%s»…"
-
-#~ msgid "Starting VPN connection '%s'..."
-#~ msgstr "Запуск VPN-соединения «%s»…"
-
-#~ msgid "User authentication required for VPN connection '%s'..."
-#~ msgstr "Для VPN-соединения «%s» требуется аутентификация…"
-
-#~ msgid "Requesting a VPN address for '%s'..."
-#~ msgstr "Запрос VPN-адреса для «%s»…"
-
-#~ msgid "New Mobile Broadband connection..."
-#~ msgstr "Создать соединение мобильной связи…"
-
-#~ msgid "User authentication required for mobile broadband connection '%s'..."
-#~ msgstr "Для соединения мобильной связи «%s» требуется аутентификация…"
-
-#~ msgid "Preparing ethernet network connection '%s'..."
-#~ msgstr "Подготовка сетевого соединения ethernet «%s»…"
-
-#~ msgid "Configuring ethernet network connection '%s'..."
-#~ msgstr "Настройка сетевого соединения ethernet «%s»…"
-
-#~ msgid "User authentication required for ethernet network connection '%s'..."
-#~ msgstr "Для сетевого соединения ethernet «%s» требуется аутентификация…"
-
-#~ msgid "Requesting an ethernet network address for '%s'..."
-#~ msgstr "Запрос адреса сетевого соединения ethernet для «%s»…"
-
-#~ msgid "_Connect to Hidden Wi-Fi Network..."
-#~ msgstr "_Подключиться к скрытой сети Wi-Fi…"
-
-# перевод wifi как "беспроводная сеть" не подходит, так как bluetooth тоже беспроводная сеть
-#~ msgid "Create _New Wi-Fi Network..."
-#~ msgstr "Создать _новую сеть Wi-Fi…"
-
-#~ msgid "Preparing Wi-Fi network connection '%s'..."
-#~ msgstr "Подготовка сетевого соединения Wi-Fi «%s»…"
-
-#~ msgid "Configuring Wi-Fi network connection '%s'..."
-#~ msgstr "Настройка сетевого соединения Wi-Fi «%s»…"
-
-#~ msgid "Requesting a Wi-Fi network address for '%s'..."
-#~ msgstr "Запрос адреса сети Wi-Fi для «%s»…"
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "15"
-#~ msgstr "15"
-
-#~ msgid "Aut_onegotiate"
-#~ msgstr "_Автосогласование"
-
-#~ msgid "_Import team configuration from a file..."
-#~ msgstr ""
-#~ "_Импортировать параметры агрегированного соединения (team) из файла…"
-
-#~ msgid "Im_port team configuration from a file..."
-#~ msgstr ""
-#~ "И_мпортировать параметры агрегированного соединения (team) из файла…"
-
-#~ msgid "Don't know how to create '%s' connections"
-#~ msgstr "Неизвестно, как создавать соединения «%s»"
-
-#~ msgid "FirewallD is not running."
-#~ msgstr "FirewallD не запущен."
-
-#~ msgid "New..."
-#~ msgstr "Создать…"
-
-#~ msgid "NetworkManager for GNOME"
-#~ msgstr "NetworkManager для GNOME"
-
-#~ msgid "_Disconnect VPN"
-#~ msgstr "_Отключить VPN"
-
-#~ msgid "Enable WiMA_X Mobile Broadband"
-#~ msgstr "Включить мобильную связь WiMA_X"
-
-#~ msgid "_Help"
-#~ msgstr "_Справка"
-
-#~ msgid "VPN connection '%s' active"
-#~ msgstr "VPN-соединение «%s» активно"
-
-# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду
-#~ msgid "You are now connected to the bonded network."
-#~ msgstr "Вы подключены к агрегированной сети (bond)."
-
-# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду
-#~ msgid "Preparing bond connection '%s'..."
-#~ msgstr "Подготовка агрегированного соединения (bond) «%s»…"
-
-# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду
-#~ msgid "Configuring bond connection '%s'..."
-#~ msgstr "Настройка агрегированного соединения (bond) «%s»…"
-
-# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду
-#~ msgid "User authentication required for bond connection '%s'..."
-#~ msgstr ""
-#~ "Для агрегированного соединения (bond) «%s» требуется аутентификация…"
-
-#~ msgid "Requesting address for '%s'..."
-#~ msgstr "Запрос адреса для «%s»…"
-
-#~ msgid "Bond connection '%s' active"
-#~ msgstr "Агрегированное соединение (bond) «%s» активно"
-
-#~ msgid "You are now connected to the bridged network."
-#~ msgstr "Вы подключены к сети типа мост."
-
-#~ msgid "Preparing bridge connection '%s'..."
-#~ msgstr "Подготовка соединения типа мост «%s»…"
-
-#~ msgid "Configuring bridge connection '%s'..."
-#~ msgstr "Настройка соединения типа мост «%s»…"
-
-#~ msgid "User authentication required for bridge connection '%s'..."
-#~ msgstr "Для соединения типа мост «%s» требуется аутентификация…"
-
-#~ msgid "Bridge connection '%s' active"
-#~ msgstr "Соединение типа мост «%s» активно"
-
-#~ msgid "New Mobile Broadband (CDMA) connection..."
-#~ msgstr "Новое подключение к сети мобильной связи CDMA…"
-
-#~ msgid "You are now connected to the CDMA network."
-#~ msgstr "Вы подключены к сети CDMA."
-
-#~ msgid "CDMA network."
-#~ msgstr "Сеть CDMA."
-
-#~ msgid "New Mobile Broadband (GSM) connection..."
-#~ msgstr "Новое подключение к сети мобильной связи GSM…"
-
-#~ msgid "You are now connected to the GSM network."
-#~ msgstr "Вы подключены к сети GSM."
-
-#~ msgid "GSM network."
-#~ msgstr "Сеть GSM."
-
-#~ msgid "Auto InfiniBand"
-#~ msgstr "Автоматический InfiniBand"
-
-#~ msgid "InfiniBand Networks (%s)"
-#~ msgstr "Сети InfiniBand (%s)"
-
-#~ msgid "InfiniBand Network (%s)"
-#~ msgstr "Сеть InfiniBand (%s)"
-
-#~ msgid "InfiniBand Networks"
-#~ msgstr "Сети InfiniBand"
-
-#~ msgid "InfiniBand Network"
-#~ msgstr "Сеть InfiniBand"
-
-#~ msgid "You are now connected to the InfiniBand network."
-#~ msgstr "Вы подключены к сети InfiniBand."
-
-#~ msgid "Preparing InfiniBand connection '%s'..."
-#~ msgstr "Подготовка соединения InfiniBand «%s»…"
-
-#~ msgid "Configuring InfiniBand connection '%s'..."
-#~ msgstr "Настройка соединения InfiniBand «%s»…"
-
-#~ msgid "User authentication required for InfiniBand connection '%s'..."
-#~ msgstr "Для соединения InfiniBand «%s» требуется аутентификация…"
-
-#~ msgid "InfiniBand connection '%s' active"
-#~ msgstr "Соединение InfiniBand «%s» активно"
-
-#~ msgid "You are now connected to the teamed network."
-#~ msgstr "Вы подключены к агрегированной сети (team)."
-
-#~ msgid "Preparing team connection '%s'..."
-#~ msgstr "Подготовка агрегированного соединения (team) «%s»…"
-
-#~ msgid "Configuring team connection '%s'..."
-#~ msgstr "Настройка агрегированного соединения (team) «%s»…"
-
-#~ msgid "User authentication required for team connection '%s'..."
-#~ msgstr ""
-#~ "Для агрегированного соединения (team) «%s» требуется аутентификация…"
-
-#~ msgid "Team connection '%s' active"
-#~ msgstr "Агрегированное соединение (team) «%s» активно"
-
-#~ msgid "You are now connected to the VLAN."
-#~ msgstr "Вы подключены к сети VLAN."
-
-#~ msgid "Preparing VLAN connection '%s'..."
-#~ msgstr "Подготовка соединения VLAN «%s»…"
-
-#~ msgid "Configuring VLAN connection '%s'..."
-#~ msgstr "Настройка соединения VLAN «%s»…"
-
-#~ msgid "User authentication required for VLAN connection '%s'..."
-#~ msgstr "Для соединения VLAN «%s» требуется аутентификация…"
-
-#~ msgid "VLAN connection '%s' active"
-#~ msgstr "Соединение VLAN «%s» активно"
-
-#~ msgid "WiMAX Mobile Broadband (%s)"
-#~ msgstr "Мобильная связь WiMAX (%s)"
-
-#~ msgid "WiMAX Mobile Broadband"
-#~ msgstr "Мобильная связь WiMAX"
-
-#~ msgid "WiMAX is disabled"
-#~ msgstr "WiMAX выключен"
-
-#~ msgid "WiMAX is disabled by hardware switch"
-#~ msgstr "WiMAX выключен механическим переключателем"
-
-#~ msgid "You are now connected to the WiMAX network."
-#~ msgstr "Вы подключены к сети WiMAX."
-
-#~ msgid "%d dB"
-#~ msgstr "%d дБ"
-
-#~ msgctxt "WiMAX CINR"
-#~ msgid "unknown"
-#~ msgstr "неизвестно"
-
-#~ msgctxt "WiMAX Base Station ID"
-#~ msgid "unknown"
-#~ msgstr "неизвестно"
-
-#~ msgid "WiMAX (%s)"
-#~ msgstr "WiMAX (%s)"
-
-#~ msgid "CINR:"
-#~ msgstr "CINR:"
-
-#~ msgid "BSID:"
-#~ msgstr "BSID:"
-
-#~ msgid "_Cloned MAC address:"
-#~ msgstr "_Клонированный MAC-адрес:"
-
-#~ msgid "WiMAX"
-#~ msgstr "WiMAX"
-
-#~ msgid "Error saving connection"
-#~ msgstr "Ошибка сохранения соединения"
-
-#~ msgid "The property '%s' / '%s' is invalid: %d"
-#~ msgstr "Неверное свойство «%s» / «%s»: %d"
-
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Не удалось загрузить пользовательский интерфейс WiMAX."
-
-#~ msgid "WiMAX name missing"
-#~ msgstr "Отсутствует имя WiMAX"
-
-#~ msgid "WiMAX device"
-#~ msgstr "Устройство WiMAX"
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "Соединение WiMAX %d"
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
-#~ "%s)."
-#~ msgstr ""
-#~ "Невозможно настроить Bluetooth (ошибка подключения к D-Bus: (%s) %s)."
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
-#~ "%s)."
-#~ msgstr "Невозможно настроить Bluetooth (не найден NetworkManager: (%s) %s)."
-
-#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
-#~ msgstr "Использовать мобильный телефон как сетевое устройство (PAN/NAP)"
-
-#~ msgid "Access the Internet using your mobile phone (DUN)"
-#~ msgstr ""
-#~ "Доступ к Интернету с использованием вашего мобильного телефона (DUN)"
-
-#~ msgid "Error: %s"
-#~ msgstr "Ошибка: %s"
-
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Не удалось создать DUN-соединение: %s"
-
-#~ msgid "Your phone is now ready to use!"
-#~ msgstr "Телефон готов к работе!"
-
-#~ msgid "Mobile wizard was canceled"
-#~ msgstr "Мастер настройки мобильного соединения отменён"
-
-#~ msgid "Unknown phone device type (not GSM or CDMA)"
-#~ msgstr "Неизвестный тип телефона (не GSM и не CDMA)"
-
-#~ msgid "failed to connect to the phone."
-#~ msgstr "не удалось подключиться к телефону."
-
-#~ msgid "error getting bus connection"
-#~ msgstr "ошибка получения подключения к шине"
-
-#~ msgid "unexpectedly disconnected from the phone."
-#~ msgstr "неожиданный разрыв связи с телефоном."
-
-#~ msgid "timed out detecting phone details."
-#~ msgstr "превышено время ожидания для поиска телефона."
-
-#~ msgid "Detecting phone configuration..."
-#~ msgstr "Поиск настроек телефона…"
-
-#~ msgid ""
-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-#~ "Networking connection."
-#~ msgstr ""
-#~ "Адаптер Bluetooth по умолчанию должен быть включён до настройки "
-#~ "коммутируемого соединения."
-
-#~ msgid "Failed to create PAN connection: %s"
-#~ msgstr "Не удалось создать PAN-соединение: %s"
-
-#~ msgid "%s Network"
-#~ msgstr "Сеть %s"
-
-#~ msgid "_Device MAC address:"
-#~ msgstr "MAC-адрес _устройства:"
-
-#~ msgid "Any"
-#~ msgstr "Любой"
-
-#~ msgid "3G (UMTS/HSPA)"
-#~ msgstr "3G (UMTS/HSPA)"
-
-#~ msgid "2G (GPRS/EDGE)"
-#~ msgstr "2G (GPRS/EDGE)"
-
-#~ msgid "Prefer 3G (UMTS/HSPA)"
-#~ msgstr "Предпочитать 3G (UMTS/HSPA)"
-
-#~ msgid "Prefer 2G (GPRS/EDGE)"
-#~ msgstr "Предпочитать 2G (GPRS/EDGE)"
-
-#~ msgid "Prefer 4G (LTE)"
-#~ msgstr "Предпочитать 4G (LTE)"
-
-#~ msgid "Use only 4G (LTE)"
-#~ msgstr "Только 4G (LTE)"
-
-#~ msgid "Infrastructure"
-#~ msgstr "Инфраструктура"
-
-#~ msgid "Automatic (PPP)"
-#~ msgstr "Автоматически (PPP)"
-
-#~ msgid "Automatic (PPP) addresses only"
-#~ msgstr "Автоматически (PPP, только адрес)"
-
-#~ msgid "unknown modem type."
-#~ msgstr "неизвестный тип модема."
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "Вторичный DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Третичный DNS:"
-
-#~ msgid "_Save..."
-#~ msgstr "_Сохранить…"
-
-#~ msgid "_Edit..."
-#~ msgstr "_Изменить…"
-
-#~ msgid "_Delete..."
-#~ msgstr "_Удалить…"
-
-#~ msgid "No Certificate Authority certificate chosen"
-#~ msgstr "Не выбран сертификат удостоверяющего центра"
-
-#~| msgid ""
-#~| "Not using a Certificate Authority (CA) certificate can result in "
-#~| "connections to insecure, rogue wireless networks.  Would you like to "
-#~| "choose a Certificate Authority certificate?"
-#~ msgid ""
-#~ "Not using a Certificate Authority (CA) certificate can result in "
-#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
-#~ "a Certificate Authority certificate?"
-#~ msgstr ""
-#~ "Игнорирование сертификата удостоверяющего центра (УЦ) может сделать "
-#~ "подключения уязвимыми.  Хотите выбрать сертификат удостоверяющего центра?"
-
-#~ msgid "Wireless Networks (%s)"
-#~ msgstr "Беспроводные сети (%s)"
-
-#~ msgid "Wireless Network (%s)"
-#~ msgstr "Беспроводная сеть (%s)"
-
-#~ msgid "Wireless Network"
-#~ msgid_plural "Wireless Networks"
-#~ msgstr[0] "Беспроводная сеть"
-#~ msgstr[1] "Беспроводные сети"
-#~ msgstr[2] "Беспроводных сетей"
-
-#~ msgid "wireless is disabled"
-#~ msgstr "поддержка беспроводных сетей отключена"
-
-#~ msgid "wireless is disabled by hardware switch"
-#~ msgstr "поддержка беспроводных сетей отключена аппаратно"
-
-#~ msgid "Wireless network connection '%s' active"
-#~ msgstr "Беспроводное сетевое соединение «%s» установлено"
-
-#~ msgid "Could not load Wired Security security user interface."
-#~ msgstr ""
-#~ "Не удалось загрузить интерфейс настройки защиты проводного соединения."
-
-#~ msgid "Wireless"
-#~ msgstr "Беспроводные"
-
-#~ msgid "Wireless connection %d"
-#~ msgstr "Беспроводное соединение %d"
-
-#~ msgid "_Import"
-#~ msgstr "_Импортировать"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "Подключаться _автоматически"
-
-#~ msgid "A_vailable to all users"
-#~ msgstr "Доступно _всем пользователям"
-
-#~ msgid "An unknown error occurred."
-#~ msgstr "Произошла неизвестная ошибка."
-
-#~ msgid "Could not edit new connection"
-#~ msgstr "Не удалось изменить новое соединение"
-
-#~ msgid "Could not edit imported connection"
-#~ msgstr "Не удалось изменить импортированное соединение"
-
-#~ msgid "No VPN plugin available. Please install one to enable this button."
-#~ msgstr ""
-#~ "Модуль VPN недоступен. Установите модуль, чтобы эта кнопка стала активной."
-
-#~ msgid "No"
-#~ msgstr "Нет"
-
-#~ msgid "Yes"
-#~ msgstr "Да"
-
-#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-#~ msgstr "Невозможно настроить Bluetooth (ошибка создания прокси D-Bus)."
-
-#~ msgid "_Security:"
-#~ msgstr "_Защита:"
-
-#~ msgid "Click on this icon to connect to a wireless network"
-#~ msgstr "Нажмите на этот значок для подключения к беспроводной сети"
diff -Nru network-manager-applet-1.8.4/po/zh_CN.po network-manager-applet-1.8.10/po/zh_CN.po
--- network-manager-applet-1.8.4/po/zh_CN.po	2017-05-10 10:44:54.000000000 +0000
+++ network-manager-applet-1.8.10/po/zh_CN.po	2017-12-19 11:44:30.000000000 +0000
@@ -12,24 +12,24 @@
 # Edison Zhao , 2011.
 # EL8LatSPQ , 2012.
 # YunQiang Su , 2012.
-#
+# lrintel , 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-applet master\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
-"PO-Revision-Date: 2016-04-06 17:10+0800\n"
-"Last-Translator: shijing \n"
+"POT-Creation-Date: 2017-12-12 11:18+0100\n"
+"PO-Revision-Date: 2017-11-07 06:44+0000\n"
+"Last-Translator: Copied by Zanata \n"
 "Language-Team: Chinese (simplified) \n"
-"Language: zh_CN\n"
+"Language: zh_Hans\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Launchpad-Export-Date: 2016-03-22 13:39+0000\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Zanata 4.3.2\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
 msgstr "网络"
 
@@ -38,7 +38,7 @@
 msgstr "管理网络连接"
 
 #: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: ../src/connection-editor/nm-connection-list.ui.h:1
 msgid "Network Connections"
 msgstr "网络连接"
 
@@ -149,55 +149,68 @@
 msgid "The NetworkManager Developers"
 msgstr "网络管理器小程序"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
 
-#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X 认证"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1
+#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
+#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
 #: ../src/connection-editor/ce-new-connection.ui.h:1
 #: ../src/connection-editor/ce-page-dcb.ui.h:17
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/connection-editor/connection-helpers.c:308
+#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/page-bluetooth.c:311
+#: ../src/connection-editor/page-mobile.c:543
+#: ../src/connection-editor/page-proxy.c:121
+#: ../src/connection-editor/page-team.c:344
+#: ../src/connection-editor/page-team-port.c:206
+#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
+#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/libnma/nma-vpn-password-dialog.c:209
+#: ../src/libnma/nma-wifi-dialog.c:1066
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
 #, fuzzy
 msgid "C_onnect"
 msgstr "已连接"
@@ -214,38 +227,38 @@
 msgid "secure."
 msgstr "安全。"
 
-#: ../src/applet.c:381
+#: ../src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "无法添加/启用连接"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "连接失败"
 
-#: ../src/applet.c:435
+#: ../src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "设备断开失败"
 
-#: ../src/applet.c:440
+#: ../src/applet.c:451
 msgid "Disconnect failure"
 msgstr "断开失败"
 
-#: ../src/applet.c:470
+#: ../src/applet.c:481
 msgid "Connection activation failed"
 msgstr "连接启用失败"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "不再显示此信息"
 
-#: ../src/applet.c:883
+#: ../src/applet.c:899
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -255,7 +268,7 @@
 "\n"
 "VPN 连接“%s”已断开。网络连接被中断。"
 
-#: ../src/applet.c:885
+#: ../src/applet.c:901
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -265,7 +278,7 @@
 "\n"
 "VPN 连接“%s”失败。网络连接被中断。"
 
-#: ../src/applet.c:887
+#: ../src/applet.c:903
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -274,7 +287,7 @@
 "\n"
 "VPN 连接“%s”失败。VPN 服务异常中断。"
 
-#: ../src/applet.c:889
+#: ../src/applet.c:905
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -284,7 +297,7 @@
 "\n"
 "VPN 连接“%s”失败。VPN 服务返回了一个非法配置。"
 
-#: ../src/applet.c:891
+#: ../src/applet.c:907
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -293,7 +306,7 @@
 "\n"
 "VPN 连接“%s”失败。连接超时。"
 
-#: ../src/applet.c:893
+#: ../src/applet.c:909
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -302,7 +315,7 @@
 "\n"
 "VPN 连接“%s”失败。VPN 服务未在所需时间内启动。"
 
-#: ../src/applet.c:895
+#: ../src/applet.c:911
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -311,7 +324,7 @@
 "\n"
 "VPN 连接“%s”失败。VPN 服务启动失败。"
 
-#: ../src/applet.c:897
+#: ../src/applet.c:913
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -320,7 +333,7 @@
 "\n"
 "VPN 连接“%s”失败。没有合法的 VPN secret。"
 
-#: ../src/applet.c:899
+#: ../src/applet.c:915
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -329,7 +342,7 @@
 "\n"
 "VPN 连接“%s”失败。VPN secret 非法。"
 
-#: ../src/applet.c:904
+#: ../src/applet.c:920
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -338,7 +351,7 @@
 "\n"
 "VPN 连接“%s”失败。"
 
-#: ../src/applet.c:931
+#: ../src/applet.c:947
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -349,19 +362,19 @@
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: ../src/applet.c:949
 msgid "VPN connection has been successfully established.\n"
 msgstr "已成功建立 VPN 连接。\n"
 
-#: ../src/applet.c:935
+#: ../src/applet.c:951
 msgid "VPN Login Message"
 msgstr "VPN 登录消息"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: ../src/applet.c:959 ../src/applet.c:999
 msgid "VPN Connection Failed"
 msgstr "VPN 连接失败"
 
-#: ../src/applet.c:987
+#: ../src/applet.c:1003
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -374,7 +387,7 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: ../src/applet.c:1006
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -387,151 +400,151 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: ../src/applet.c:1295
 msgid "device not ready (firmware missing)"
 msgstr "设备未就绪(缺少固件)"
 
-#: ../src/applet.c:1281
+#: ../src/applet.c:1297
 msgid "device not ready"
 msgstr "设备未就绪"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "已断开"
 
-#: ../src/applet.c:1307
+#: ../src/applet.c:1323
 msgid "Disconnect"
 msgstr "断开"
 
-#: ../src/applet.c:1321
+#: ../src/applet.c:1337
 msgid "device not managed"
 msgstr "设备未托管"
 
-#: ../src/applet.c:1394
+#: ../src/applet.c:1410
 msgid "No network devices available"
 msgstr "没有可用的网络设备"
 
-#: ../src/applet.c:1448
+#: ../src/applet.c:1464
 msgid "_VPN Connections"
 msgstr "_VPN 连接"
 
-#: ../src/applet.c:1492
+#: ../src/applet.c:1508
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "配置 VPN(_C)..."
 
-#: ../src/applet.c:1495
+#: ../src/applet.c:1511
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN 连接"
 
-#: ../src/applet.c:1601
+#: ../src/applet.c:1617
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "网络管理器未运行..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: ../src/applet.c:1622 ../src/applet.c:2687
 msgid "Networking disabled"
 msgstr "网络已禁用"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: ../src/applet.c:1832
 msgid "Enable _Networking"
 msgstr "启用联网(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: ../src/applet.c:1841
 msgid "Enable _Wi-Fi"
 msgstr "启用 _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: ../src/applet.c:1850
 msgid "Enable _Mobile Broadband"
 msgstr "启用移动宽带(_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: ../src/applet.c:1862
 msgid "Enable N_otifications"
 msgstr "启用通知(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: ../src/applet.c:1874
 msgid "Connection _Information"
 msgstr "连接信息(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: ../src/applet.c:1882
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "编辑连接..."
 
-#: ../src/applet.c:1880
+#: ../src/applet.c:1896
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/applet.c:2191
+#: ../src/applet.c:2207
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "您现在已连接到“%s”。"
 
-#: ../src/applet.c:2231
+#: ../src/applet.c:2247
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: ../src/applet.c:2232
+#: ../src/applet.c:2248
 #, fuzzy
 msgid "The network connection has been disconnected."
 msgstr ""
 "\n"
 "VPN 连接“%s”已断开。"
 
-#: ../src/applet.c:2534
+#: ../src/applet.c:2550
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "正在准备网络连接“%s”..."
 
-#: ../src/applet.c:2537
+#: ../src/applet.c:2553
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "网络连接“%s”需要用户认证..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "正在为“%s”请求一个网络地址..."
 
-#: ../src/applet.c:2543
+#: ../src/applet.c:2559
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "网络连接“%s”已处于活动状态"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2632
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "正在启动 VPN 连接“%s”..."
 
-#: ../src/applet.c:2619
+#: ../src/applet.c:2635
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN 连接“%s”需要用户认证..."
 
-#: ../src/applet.c:2622
+#: ../src/applet.c:2638
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "正在为“%s”请求一个 VPN 地址..."
 
-#: ../src/applet.c:2625
+#: ../src/applet.c:2641
 #, fuzzy, c-format
 msgid "VPN connection active"
 msgstr "VPN 连接“%s”已处于活动状态"
 
-#: ../src/applet.c:2675
+#: ../src/applet.c:2691
 msgid "No network connection"
 msgstr "没有网络连接"
 
-#: ../src/applet.c:3276
+#: ../src/applet.c:3292
 msgid "NetworkManager Applet"
 msgstr "网络管理器小程序"
 
@@ -549,48 +562,48 @@
 msgid "Sending unlock code…"
 msgstr "正在发送解锁码..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "移动宽带(%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/applet-device-broadband.c:739
+#: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "移动宽带"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "可用的"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "新移动宽带连接"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "连接已建立"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "您现在已连接到移动宽带网络。"
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "移动宽带网络。"
 
 # 这里的"home network"与下面的“漫游网络”是对比的关闭，应和下文的其他地方译法一致为“主网络”才说的通。
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "您现在已注册到主网络。"
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "您现在已注册到一个漫游网络。"
 
@@ -598,22 +611,22 @@
 msgid "You are now connected to the mobile broadband network."
 msgstr "您现在已连接到移动宽带网络。"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "正在准备移动宽带连接“%s”..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "正在配置移动宽带连接“%s”..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "移动宽带连接“%s”需要用户认证..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "移动宽带连接“%s”已处于活动状态"
@@ -673,6 +686,18 @@
 msgid "DSL authentication"
 msgstr "DSL 认证"
 
+#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/page-bluetooth.c:313
+#: ../src/connection-editor/page-mobile.c:545
+#: ../src/libnma/nma-vpn-password-dialog.c:210
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
 #: ../src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
@@ -687,7 +712,7 @@
 msgid "(none)"
 msgstr "(无)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "无法添加新连接"
 
@@ -695,77 +720,77 @@
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi 网络(%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi 网络(%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi 网络"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi 已禁用"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi 已通过硬件开关禁用"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "更多网络"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi 网络可用"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "使用网络菜单连接到 Wi-Fi 网络"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "您现在已连接到 Wi-Fi 网络 %s。"
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "正在准备 Wi-Fi 网络连接 %s..."
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "正在配置 Wi-Fi 网络连接 %s..."
 
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Wi-Fi 网络 %s 需要用户认证..."
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "正在为 %s 请求一个网络地址..."
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi 网络连接 %s 处于活动状态：%s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wi-Fi 网络连接 %s 已处于活动状态"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "无法启用连接"
 
@@ -773,227 +798,227 @@
 msgid "Error displaying connection information:"
 msgstr "显示连接信息时出错："
 
-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
 #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: ../src/applet-dialogs.c:75
 msgid "Dynamic WEP"
 msgstr "动态 WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:231
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: ../src/applet-dialogs.c:152
 #, fuzzy
 msgid "More addresses"
 msgstr "MAC 地址"
 
-#: ../src/applet-dialogs.c:226
+#: ../src/applet-dialogs.c:227
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
+#: ../src/connection-editor/page-wifi-security.c:332
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "无"
 
-#: ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:261
 #, c-format
 msgid "%s (default)"
 msgstr "%s (默认)"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "未知"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
 msgctxt "Address"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
 msgid "IP Address:"
 msgstr "IP 地址："
 
-#: ../src/applet-dialogs.c:369
+#: ../src/applet-dialogs.c:370
 msgid "Broadcast Address:"
 msgstr "广播地址："
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: ../src/applet-dialogs.c:382
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:383
 msgid "Subnet Mask:"
 msgstr "子网掩码："
 
-#: ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:493
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "以太网(%s)"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:496
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: ../src/applet-dialogs.c:503
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: ../src/applet-dialogs.c:505
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
 #: ../src/connection-editor/ce-page-team-port.ui.h:23
 #: ../src/connection-editor/ce-page-team.ui.h:48
 #: ../src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "常规"
 
-#: ../src/applet-dialogs.c:516
+#: ../src/applet-dialogs.c:517
 msgid "Interface:"
 msgstr "接口："
 
-#: ../src/applet-dialogs.c:536
+#: ../src/applet-dialogs.c:537
 msgid "Hardware Address:"
 msgstr "硬件地址："
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:551
 msgid "Driver:"
 msgstr "驱动程序："
 
-#: ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:586
 msgid "Speed:"
 msgstr "速度："
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:601
 msgid "Security:"
 msgstr "安全性："
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
 #: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
 msgid "Default Route:"
 msgstr "默认路由："
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
 #: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
 msgid "Ignored"
 msgstr "已忽略"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:816
 msgid "VPN Type:"
 msgstr "VPN 类型："
 
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:823
 msgid "VPN Gateway:"
 msgstr "VPN 网关："
 
-#: ../src/applet-dialogs.c:828
+#: ../src/applet-dialogs.c:829
 msgid "VPN Username:"
 msgstr "VPN 用户名："
 
-#: ../src/applet-dialogs.c:834
+#: ../src/applet-dialogs.c:835
 msgid "VPN Banner:"
 msgstr "VPN Banner："
 
-#: ../src/applet-dialogs.c:840
+#: ../src/applet-dialogs.c:841
 msgid "Base Connection:"
 msgstr "基本连接："
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "未知"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: ../src/applet-dialogs.c:958
 msgid "No valid active connections found!"
 msgstr "未找到合法的活动连接！"
 
-#: ../src/applet-dialogs.c:985
-#, fuzzy
+#: ../src/applet-dialogs.c:1007
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"版权所有 (C) 2004-2011 Red Hat 公司\n"
-"版权所有 (C) 2005-2008 Novell 公司\n"
-"和其他众多社区贡献者和翻译者"
 
-#: ../src/applet-dialogs.c:988
+#: ../src/applet-dialogs.c:1010
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "管理您网络设备和连接的通知区域小程序。"
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1012
 msgid "NetworkManager Website"
 msgstr "NetworkManager 网站"
 
-#: ../src/applet-dialogs.c:1001
+#: ../src/applet-dialogs.c:1016
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1026
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "网络管理器小程序找不到所需的资源(.ui 文件未找到)。"
 
-#: ../src/applet-dialogs.c:1006
+#: ../src/applet-dialogs.c:1031
 msgid "Missing resources"
 msgstr "缺少资源"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1057
 msgid "Mobile broadband network password"
 msgstr "移动宽带网络密码"
 
-#: ../src/applet-dialogs.c:1040
+#: ../src/applet-dialogs.c:1066
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "连接到“%s”需要密码。"
 
-#: ../src/applet-dialogs.c:1055
+#: ../src/applet-dialogs.c:1081
 msgid "Password:"
 msgstr "密码："
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1363
 msgid "SIM PIN unlock required"
 msgstr "需要解锁 SIM PIN"
 
-#: ../src/applet-dialogs.c:1338
+#: ../src/applet-dialogs.c:1364
 msgid "SIM PIN Unlock Required"
 msgstr "需要解锁 SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1366
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1001,25 +1026,25 @@
 msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PIN 码。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1368
 msgid "PIN code:"
 msgstr "PIN 代码："
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1372
 msgid "Show PIN code"
 msgstr "显示 PIN 码"
 
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1374
 msgid "SIM PUK unlock required"
 msgstr "需要解锁 SIM PUK"
 
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1375
 msgid "SIM PUK Unlock Required"
 msgstr "需要解锁 SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: ../src/applet-dialogs.c:1377
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1027,30 +1052,37 @@
 msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PUK 码。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1379
 msgid "PUK code:"
 msgstr "PUK 码："
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: ../src/applet-dialogs.c:1382
 msgid "New PIN code:"
 msgstr "新的 PIN 码："
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: ../src/applet-dialogs.c:1384
 msgid "Re-enter new PIN code:"
 msgstr "再次输入新的 PIN 码："
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: ../src/applet-dialogs.c:1389
 msgid "Show PIN/PUK codes"
 msgstr "显示 PIN/PUK 码："
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: ../src/applet-vpn-request.c:201
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "连接信息"
+
+#: ../src/applet-vpn-request.c:251
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "无法启用连接"
+
+#: ../src/applet-vpn-request.c:259
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
@@ -1067,21 +1099,21 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
 msgstr ""
 
-#. Delete
 #: ../src/connection-editor/ce-ip4-routes.ui.h:5
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/nm-connection-list.c:711
+#: ../src/connection-editor/connection-helpers.c:772
+#: ../src/connection-editor/nm-connection-list.ui.h:4
 msgid "_Delete"
 msgstr "删除(_D)"
 
@@ -1171,11 +1203,10 @@
 msgid "M_ode:"
 msgstr "模式(_O)："
 
-#. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: ../src/connection-editor/nm-connection-list.ui.h:5
 msgid "_Edit"
 msgstr "编辑(_E)"
 
@@ -1227,7 +1258,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 #: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
@@ -1236,7 +1267,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-infiniband.ui.h:7
 #: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
@@ -1269,26 +1300,72 @@
 msgstr "问候时间(_H)："
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "s"
 msgstr "秒"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "启用联网(_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:14
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "启用 _STP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:15
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:16
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:17
 msgid "_Max age:"
 msgstr "最大老化时间(_M)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:18
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:19
 msgid "_Aging time:"
 msgstr "老化时间(_A)："
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:20
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:21
+msgid "Group _forward mask:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:22
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
 #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "自动"
@@ -1545,10 +1622,20 @@
 msgstr "用户名(_U)："
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
 msgid "_Service:"
 msgstr "服务(_S)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:5
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 #: ../src/wireless-security/ws-leap.ui.h:3
@@ -1556,7 +1643,11 @@
 msgid "Sho_w password"
 msgstr "显示密码(_W)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-dsl.ui.h:6
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:7
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
 #: ../src/libnma/nma-vpn-password-dialog.c:97
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
@@ -1567,13 +1658,29 @@
 msgid "_Password:"
 msgstr "密码(_P)："
 
+#: ../src/connection-editor/ce-page-dsl.ui.h:8
+msgid "PPP _interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:9
+msgid "P_arent interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:10
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:11
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "自动"
@@ -1619,7 +1726,7 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "忽略"
 
@@ -1627,7 +1734,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "手动"
 
@@ -1636,7 +1743,7 @@
 msgstr "端口(_P)："
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
 msgid "_Device:"
 msgstr "设备(_D):"
@@ -1785,20 +1892,20 @@
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "传输模式(_T)："
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
 msgid "Datagram"
 msgstr "数据报文"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
 msgid "Connected"
 msgstr "已连接"
 
+#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+msgid "_Transport mode:"
+msgstr "传输模式(_T)："
+
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
 msgid "IPIP"
 msgstr ""
@@ -1836,39 +1943,39 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#, fuzzy
-msgid "Device name"
-msgstr "设备名称 + 编号"
+#: ../src/connection-editor/ce-page-macsec.ui.h:6
+msgid "Device name:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#, fuzzy
-msgid "Parent device"
-msgstr "以太网设备"
+#: ../src/connection-editor/ce-page-macsec.ui.h:8
+msgid "Parent device:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-msgid "Mode"
+#: ../src/connection-editor/ce-page-macsec.ui.h:16
+msgid "Mode:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP"
+msgid "Local IP:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP"
+msgid "Remote IP:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key"
+msgid "Input key:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key"
+msgid "Output key:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-#, fuzzy
-msgid "MTU"
-msgstr "_MTU："
+msgid "MTU:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1883,12 +1990,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "与其它计算机共享"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "方法(_M)："
 
@@ -1903,7 +2010,7 @@
 "标识符，请在此输入。"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1914,16 +2021,16 @@
 msgstr "D_HCP 客户端 ID："
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "搜索域(_E)："
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "_DNS 服务器："
 
@@ -1946,11 +2053,12 @@
 "成。"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "路由(_R)..."
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-macsec.ui.h:3
 #: ../src/connection-editor/page-ip4.c:198
 msgid "Disabled"
 msgstr "已禁用"
@@ -1963,7 +2071,15 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "已启用(临时地址优先)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Stable privacy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -1972,15 +2088,19 @@
 "用来解析主机名的域名服务器的 IP 地址。用逗号分隔多个域名服务器地址。本地连接"
 "地址会自动配置到连接中的接口。"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6 隐私扩展(_P)："
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "需要 IPv_6 地址完成这个连接"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1988,6 +2108,94 @@
 "当连接到兼容 IPv4 的网络时，如果 IPv6 配置失败而 IPv4 配置成功，则允许连接完"
 "成。"
 
+#: ../src/connection-editor/ce-page-macsec.ui.h:1
+msgid "PSK"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:2
+#: ../src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:4
+msgid "Check"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:5
+msgid "Strict"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:7
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:9
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:10
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:11
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:12
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:13
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:14
+msgid "CKN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:15
+msgid "CAK:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:17
+msgid "Keys:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:18
+msgid "Parameters:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:19
+msgid "Validation:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:20
+msgid "SCI port:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:21
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:22
+msgid "Encrypt"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:23
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:24
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:26
 msgid "Basic"
@@ -2075,41 +2283,41 @@
 msgstr "发送 PPP 回响包(_E)"
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "方法(_M)："
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-team.ui.h:25
 #, fuzzy
 msgid "None"
 msgstr "无"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: ../src/connection-editor/ce-page-proxy.ui.h:3
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: ../src/connection-editor/ce-page-proxy.ui.h:4
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: ../src/connection-editor/ce-page-proxy.ui.h:5
 msgid "PAC URL:"
 msgstr ""
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:6
+msgid "PAC script:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-proxy.ui.h:7
 msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "从文件导入组队配置(_I)..."
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#, fuzzy
+msgid "Method:"
+msgstr "方法(_M)："
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:19
 #, fuzzy
@@ -2157,76 +2365,76 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:10
+msgid "Active-Backup runner options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:11
 #, fuzzy
 msgid "_Port priority:"
 msgstr "优先级(_P)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
-msgstr ""
-
 #: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:82
-msgid ""
-"Validate received ARP packets on active ports. If this is not checked, all "
-"incoming ARP packets will be considered as a good reply."
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:44
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
 msgid "Port priority. The higher number means higher priority."
 msgstr ""
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port _sticky"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:15
-msgid "Active-Backup runner options"
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:16
+msgid "LACP runner options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
 #, fuzzy
 msgid "_LACP port priority:"
 msgstr "优先级(_P)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
 #, fuzzy
 msgid "LACP port _key:"
 msgstr "私钥(_K)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
 #: ../src/connection-editor/ce-page-team.ui.h:43
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
 #: ../src/connection-editor/ce-page-team.ui.h:45
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
-msgid "LACP runner options"
-msgstr ""
-
 #: ../src/connection-editor/ce-page-team-port.ui.h:24
 #: ../src/connection-editor/ce-page-team.ui.h:70
 msgid "_Link watcher:"
@@ -2419,14 +2627,14 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/connection-helpers.c:105
 #: ../src/connection-editor/page-ethernet.c:351
 #: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "以太网"
 
 #: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/connection-helpers.c:120
 #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
 #: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
@@ -2688,6 +2896,7 @@
 msgid "SS_ID:"
 msgstr "SS_ID："
 
+#: ../src/connection-editor/ce-polkit.c:63
 #: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "执行这个动作需要 polkit 授权"
@@ -2745,58 +2954,63 @@
 "大多数情况下，服务商的 PPP 服务器支持所有的认证方法。如连接失败，请尝试禁用一"
 "些方法的支持。"
 
-#: ../src/connection-editor/connection-helpers.c:105
+#: ../src/connection-editor/connection-helpers.c:106
 #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
+#: ../src/connection-editor/connection-helpers.c:114
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
-
 #: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-dsl.c:201
+msgid "DSL/PPPoE"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
 #: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:117
 #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "绑定"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "组队"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-bridge.c:212
+#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/page-bridge.c:233
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "桥接"
 
-#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/connection-helpers.c:121
 #: ../src/connection-editor/page-ip-tunnel.c:176
 msgid "IP tunnel"
 msgstr ""
 
 #: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
+#: ../src/connection-editor/page-macsec.c:190
+msgid "MACsec"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:124
+#: ../src/connection-editor/connection-helpers.c:398
 #: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:205
+#: ../src/connection-editor/connection-helpers.c:207
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2806,11 +3020,11 @@
 "\n"
 "错误：没有 VPN 服务类型。"
 
-#: ../src/connection-editor/connection-helpers.c:217
+#: ../src/connection-editor/connection-helpers.c:219
 msgid "Cannot import VPN connection"
 msgstr "无法导入 VPN 连接"
 
-#: ../src/connection-editor/connection-helpers.c:219
+#: ../src/connection-editor/connection-helpers.c:221
 #, fuzzy, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2822,47 +3036,54 @@
 "\n"
 "错误：%s。"
 
-#: ../src/connection-editor/connection-helpers.c:220
+#: ../src/connection-editor/connection-helpers.c:222
 #, fuzzy
 msgid "unknown error"
 msgstr "未知错误"
 
-#: ../src/connection-editor/connection-helpers.c:303
+#: ../src/connection-editor/connection-helpers.c:305
 #: ../src/connection-editor/page-proxy.c:118
 #: ../src/connection-editor/page-team.c:341
 #: ../src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "选择要导入的文件"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: ../src/connection-editor/connection-helpers.c:309
+#: ../src/connection-editor/page-proxy.c:122
+#: ../src/connection-editor/page-team.c:345
+#: ../src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:340
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: ../src/connection-editor/connection-helpers.c:367
 msgid "Virtual"
 msgstr "虚拟"
 
-#: ../src/connection-editor/connection-helpers.c:514
 #: ../src/connection-editor/connection-helpers.c:516
+#: ../src/connection-editor/connection-helpers.c:518
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "导入 VPN 配置..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: ../src/connection-editor/connection-helpers.c:548
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "由于一个未知错误，连接编辑器对话框无法初始化。"
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: ../src/connection-editor/connection-helpers.c:557
 msgid "Could not create new connection"
 msgstr "无法建立新连接"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: ../src/connection-editor/connection-helpers.c:720
 msgid "Connection delete failed"
 msgstr "删除连接失败"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: ../src/connection-editor/connection-helpers.c:768
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "是否确认删除连接 %s？"
@@ -2870,7 +3091,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "地址"
 
@@ -2882,7 +3103,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "网关"
 
@@ -2892,225 +3113,238 @@
 msgstr "度量"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "前缀"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: ../src/connection-editor/nm-connection-editor.c:109
 #, c-format
 msgid "Editing %s"
 msgstr "正在编辑 %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: ../src/connection-editor/nm-connection-editor.c:113
 msgid "Editing un-named connection"
 msgstr "编辑未命名连接"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: ../src/connection-editor/nm-connection-editor.c:133
 msgid "Missing connection name"
 msgstr "缺少连接名"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: ../src/connection-editor/nm-connection-editor.c:353
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "编辑器正在初始化…"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: ../src/connection-editor/nm-connection-editor.c:360
+#: ../src/connection-editor/nm-connection-list.c:443
 msgid "Connection cannot be modified"
 msgstr "连接不能被修改"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: ../src/connection-editor/nm-connection-editor.c:375
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "无效设置 %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: ../src/connection-editor/nm-connection-editor.c:451
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "连接编辑器找不到所需的一些资源(未找到 .ui 文件)。"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/nm-connection-editor.c:579
 msgid "Save any changes made to this connection."
 msgstr "保存对此连接的全部更改。"
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: ../src/connection-editor/nm-connection-editor.c:580
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "为本机所有用户保存此连接需要认证。"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not create connection"
 msgstr "无法创建连接"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not edit connection"
 msgstr "无法编辑连接"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: ../src/connection-editor/nm-connection-editor.c:598
 msgid "Unknown error creating connection editor dialog."
 msgstr "创建连接编辑器对话框出现未知错误。"
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: ../src/connection-editor/nm-connection-editor.c:739
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:758
+#: ../src/connection-editor/nm-connection-editor.c:759
 msgid "Error initializing editor"
 msgstr "初始化编辑器错误"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: ../src/connection-editor/nm-connection-editor.c:1157
 msgid "Connection add failed"
 msgstr "添加连接失败"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "将此项设为 true 以禁用在 EAP 认证中关于 CA 证书的警告。"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "连接名称(_N)："
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 #, fuzzy
 msgid "_Export…"
 msgstr "导出(_E)..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: ../src/connection-editor/nm-connection-list.c:151
 msgid "never"
 msgstr "从不"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:173
 msgid "now"
 msgstr "现在"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: ../src/connection-editor/nm-connection-list.c:180
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟以前"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: ../src/connection-editor/nm-connection-list.c:184
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时以前"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:196
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以前"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: ../src/connection-editor/nm-connection-list.c:202
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 个月以前"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: ../src/connection-editor/nm-connection-list.c:206
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年以前"
 
-#: ../src/connection-editor/nm-connection-list.c:635
+#: ../src/connection-editor/nm-connection-list.c:445
+msgid "Connection cannot be deleted"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:448
+msgid "Select a connection to edit"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:450
+msgid "Select a connection to delete"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:785
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
 msgid "Name"
 msgstr "名称"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: ../src/connection-editor/nm-connection-list.c:798
 msgid "Last Used"
 msgstr "最后使用的"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: ../src/connection-editor/nm-connection-list.c:836
 msgid "Edit the selected connection"
 msgstr "编辑选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: ../src/connection-editor/nm-connection-list.c:837
 msgid "Authenticate to edit the selected connection"
 msgstr "进行认证以编辑选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: ../src/connection-editor/nm-connection-list.c:842
 msgid "Delete the selected connection"
 msgstr "删除选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: ../src/connection-editor/nm-connection-list.c:843
 msgid "Authenticate to delete the selected connection"
 msgstr "进行认证以删除选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:1048
+#: ../src/connection-editor/nm-connection-list.c:1051
 msgid "Error creating connection"
 msgstr "创建连接出错"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:1049
 msgid "No VPN plugins are installed."
 msgstr "未安装 VPN 插件。"
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:1052
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "不知道如何创建“%s”连接"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: ../src/connection-editor/nm-connection-list.c:1085
 msgid "Error editing connection"
 msgstr "编辑连接出错"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: ../src/connection-editor/nm-connection-list.c:1086
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "没有找到“%s”连接"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: ../src/connection-editor/nm-connection-list.ui.h:2
+msgid "Add a new connection"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:116
 msgid "802.1X Security"
 msgstr "802.1X 安全性"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: ../src/connection-editor/page-8021x-security.c:118
 msgid "Could not load 802.1X Security user interface."
 msgstr "无法加载 802.1X 安全配置用户界面。"
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: ../src/connection-editor/page-8021x-security.c:132
 msgid "Use 802.1_X security for this connection"
 msgstr "对此连接使用 802.1_X 安全配置"
 
@@ -3161,11 +3395,11 @@
 msgid "Bond connection %d"
 msgstr "绑定连接 %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:236
 msgid "Could not load bridge user interface."
 msgstr "无法加载桥接用户界面。"
 
-#: ../src/connection-editor/page-bridge.c:317
+#: ../src/connection-editor/page-bridge.c:352
 #, c-format
 msgid "Bridge connection %d"
 msgstr "桥接连接 %d"
@@ -3189,11 +3423,15 @@
 msgid "Could not load DCB user interface."
 msgstr "无法加载 DSL 用户界面。"
 
-#: ../src/connection-editor/page-dsl.c:129
+#: ../src/connection-editor/page-dsl.c:203
 msgid "Could not load DSL user interface."
 msgstr "无法加载 DSL 用户界面。"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: ../src/connection-editor/page-dsl.c:298
+msgid "missing parent interface"
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:343
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 连接 %d"
@@ -3292,27 +3530,27 @@
 msgstr "以太网连接 %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "自动(VPN)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "自动(VPN)仅地址"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "自动，仅地址"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "自动(PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "自动(PPPoE)仅地址"
 
@@ -3325,17 +3563,17 @@
 msgstr "自动(DHCP)仅地址"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "仅本地连接"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "附加 _DNS 服务器："
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "附加搜索域(_E)："
 
@@ -3372,43 +3610,52 @@
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4 DNS 服务器 “%s” 无效"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "自动，仅 DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "正在编辑 %s 的 IPv6 路由"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "IPv6 设置"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr "无法加载 IPv6 用户界面。"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, fuzzy, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6 地址 “%s” 无效"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, fuzzy, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6 前缀 “%s” 无效"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, fuzzy, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6 网关 “%s” 无效"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, fuzzy, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6 DNS 服务器 “%s” 无效"
 
+#: ../src/connection-editor/page-macsec.c:192
+msgid "Could not load MACsec user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-macsec.c:331
+#, c-format
+msgid "MACSEC connection %d"
+msgstr ""
+
 #: ../src/connection-editor/page-master.c:247
 #: ../src/connection-editor/page-master.c:258
 msgid "Duplicate slaves"
@@ -3462,38 +3709,34 @@
 msgstr "我的提供商使用基于 C_DMA 的技术(如 1xRTT、EVDO)"
 
 #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: ../src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
 #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: ../src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
 #: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: ../src/wireless-security/eap-method-ttls.c:287
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: ../src/wireless-security/eap-method-fast.c:282
+#: ../src/wireless-security/eap-method-peap.c:299
+#: ../src/wireless-security/eap-method-ttls.c:317
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: ../src/wireless-security/eap-method-ttls.c:302
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3530,11 +3773,11 @@
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "错误：此文件不含任何有效的 JSON 配置"
 
-#: ../src/connection-editor/page-team.c:1156
+#: ../src/connection-editor/page-team.c:1034
 msgid "Could not load team user interface."
 msgstr "无法加载组队用户界面。"
 
-#: ../src/connection-editor/page-team.c:1253
+#: ../src/connection-editor/page-team.c:1131
 #, c-format
 msgid "Team connection %d"
 msgstr "组队连接 %d"
@@ -3542,11 +3785,11 @@
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: ../src/connection-editor/page-team-port.c:655
 msgid "Team Port"
 msgstr "组队端口"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: ../src/connection-editor/page-team-port.c:657
 msgid "Could not load team port user interface."
 msgstr "无法加载组队端口用户界面。"
 
@@ -3655,48 +3898,48 @@
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 连接 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
+#: ../src/connection-editor/page-wifi-security.c:358
 #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 位密钥(十六进制或 ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
+#: ../src/connection-editor/page-wifi-security.c:368
 #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 位密码句"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: ../src/connection-editor/page-wifi-security.c:394
 msgid "Dynamic WEP (802.1X)"
 msgstr "动态 WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
+#: ../src/connection-editor/page-wifi-security.c:407
 #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 及 WPA2 个人"
 
-#: ../src/connection-editor/page-wifi-security.c:418
+#: ../src/connection-editor/page-wifi-security.c:420
 #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 及 WPA2 企业"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: ../src/connection-editor/page-wifi-security.c:463
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "无法加载 Wi-Fi 安全性用户界面，缺少 Wi-Fi 设置。"
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: ../src/connection-editor/page-wifi-security.c:474
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi 安全性"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: ../src/connection-editor/page-wifi-security.c:476
 msgid "Could not load Wi-Fi security user interface."
 msgstr "无法加载 Wi-Fi 安全性用户界面。"
 
-#: ../src/connection-editor/page-wifi-security.c:558
+#: ../src/connection-editor/page-wifi-security.c:560
 #, c-format
 msgid "missing SSID"
 msgstr "缺少 SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:564
+#: ../src/connection-editor/page-wifi-security.c:566
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "安全与 Ad-Hoc 模式不兼容"
@@ -3747,35 +3990,39 @@
 msgid "Connection Information"
 msgstr "连接信息"
 
+#: ../src/info.ui.h:2
+msgid "_Close"
+msgstr ""
+
 #: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "活动的网络连接"
 
 #: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
 #, fuzzy
 msgid "No certificate set"
 msgstr "不需要 CA 证书(_R)"
 
 #: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
 msgid "No key set"
 msgstr ""
 
 #: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "选择您的个人证书..."
 
 #: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
 #, fuzzy, c-format
 msgid "%s private _key:"
 msgstr "私钥(_K)："
 
 #: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
 #, fuzzy, c-format
 msgid "%s key _password:"
 msgstr "私钥密码(_P)："
@@ -3786,7 +4033,7 @@
 msgstr "选择您的个人证书..."
 
 #: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
 msgid "%s _certificate:"
 msgstr "用户证书(_U)："
@@ -3988,47 +4235,47 @@
 msgid "New Mobile Broadband Connection"
 msgstr "新移动宽带连接"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: ../src/libnma/nma-cert-chooser-button.c:165
 #, fuzzy
 msgid "(None)"
 msgstr "(无)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: ../src/libnma/nma-cert-chooser-button.c:173
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: ../src/libnma/nma-cert-chooser-button.c:174
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "C_A 证书："
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
+#: ../src/libnma/nma-cert-chooser-button.c:193
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "未知"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: ../src/libnma/nma-cert-chooser-button.c:215
+#: ../src/libnma/nma-cert-chooser-button.c:245
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: ../src/libnma/nma-cert-chooser-button.c:216
+#: ../src/libnma/nma-cert-chooser-button.c:246
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: ../src/libnma/nma-cert-chooser-button.c:472
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "选择您的个人证书..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
 msgid "%s certificate _password:"
 msgstr "用户证书(_U)："
@@ -4090,8 +4337,8 @@
 msgid "_Tertiary Password:"
 msgstr "三元密码(_T)："
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: ../src/libnma/nma-vpn-password-dialog.c:238
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "显示密码(_O)"
 
@@ -4121,45 +4368,45 @@
 msgid "Dynamic WEP (802.1x)"
 msgstr "动态 WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "需要密码或密钥来访问 Wi-Fi 网络 %s。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "需要 Wi-Fi 网络认证"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi 网络要求认证"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "创建新的 Wi-Fi 网络"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "新建 Wi-Fi 网络"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "输入您要创建的 Wi-Fi 网络的名称。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "连接到隐藏的 Wi-Fi 网络"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "隐藏的 Wi-Fi 网络"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4309,25 +4556,25 @@
 msgid "Roaming network"
 msgstr "漫游网络"
 
-#: ../src/mobile-helpers.c:331
+#: ../src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "%2$s 上 SIM 卡 %1$s 的 PIN 码"
 
-#: ../src/mobile-helpers.c:464
+#: ../src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "需要 PIN 码"
 
-#: ../src/mobile-helpers.c:472
+#: ../src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "移动宽带设备需要 PIN 码。"
 
-#: ../src/mobile-helpers.c:622
+#: ../src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "移动宽带连接“%s”已处于活动状态：(%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: ../src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "漫游中"
 
@@ -4337,12 +4584,12 @@
 msgid "%s connection"
 msgstr "%s 连接"
 
-#: ../src/utils/utils.c:563
+#: ../src/utils/utils.c:565
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER 或 PEM 证书(*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: ../src/utils/utils.c:577
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER，PEM 或 PKCS#12 私钥 (*.der, *.pem, *.p12, *.key)"
 
@@ -4350,39 +4597,35 @@
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "在 802.1X 安全性中不确定的错误 (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
+#: ../src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "不需要 CA 证书(_R)"
 
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
+#: ../src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
-msgstr "验证 eap 方法的文件时未指定的错误"
-
-#: ../src/wireless-security/eap-method-fast.c:73
+#: ../src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "缺少 EAP-FAST PAC 文件"
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: ../src/wireless-security/eap-method-fast.c:267
+#: ../src/wireless-security/eap-method-peap.c:329
+#: ../src/wireless-security/eap-method-ttls.c:379
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:405
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "选择一个 PAC 文件..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:412
 msgid "PAC files (*.pac)"
 msgstr "PAC 文件(*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: ../src/wireless-security/eap-method-fast.c:416
 msgid "All files"
 msgstr "所有文件"
 
@@ -4400,7 +4643,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:4
 #: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "Anony_mous identity:"
 msgstr "匿名身份(_M)："
 
@@ -4410,7 +4653,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:6
 #: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
 msgid "_Inner authentication:"
 msgstr "内部认证(_I)："
 
@@ -4426,27 +4669,12 @@
 msgid "missing EAP-LEAP password"
 msgstr "缺少 EAP-LEAP 密码"
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr "无效的 EAP-PEAP CA 认证： %s"
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr "无效的 EAP-PEAP CA 证书：没有指定的证书"
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: ../src/wireless-security/eap-method-peap.c:314
+#: ../src/wireless-security/eap-method-ttls.c:364
 #: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "选择一个认证中心证书..."
-
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "版本 0"
@@ -4456,20 +4684,27 @@
 msgstr "版本 1"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A 证书："
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
 #: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 证书(_R)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:6
 msgid "PEAP _version:"
 msgstr "PEAP 版本(_V)："
 
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Domain:"
+msgstr ""
+
 #: ../src/wireless-security/eap-method-simple.c:75
 msgid "missing EAP username"
 msgstr "缺少 EAP 用户名"
@@ -4482,46 +4717,28 @@
 msgid "missing EAP-TLS identity"
 msgstr "缺少 EAP-TLS 身份"
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: ../src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "不需要 CA 证书(_R)"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: ../src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: ../src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "不需要 CA 证书(_R)"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "身份(_D)："
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr "无效的 EAP-TTLS CA 证书：%s"
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr "无效的 EAP-TTLS CA 证书：没有指定的证书"
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: ../src/wireless-security/eap-method-ttls.c:333
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4597,17 +4814,17 @@
 msgstr "无效的 wep-key：密码必须少于64个字符"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (默认)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Open System"
 msgstr "开放式系统"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Shared Key"
 msgstr "共享密钥"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "1 (Default)"
+msgstr "1 (默认)"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key:"
 msgstr "密钥(_K)："
@@ -4635,345 +4852,3 @@
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "类型(_T)："
-
-#~ msgid "NetworkManager for GNOME"
-#~ msgstr "GNOME 网络管理器"
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection '%s' disconnected because the VPN service stopped."
-#~ msgstr ""
-#~ "\n"
-#~ "VPN 连接“%s”已断开。VPN 服务已停止。"
-
-#~ msgid "_Disconnect VPN"
-#~ msgstr "断开 VPN(_D)"
-
-#~ msgid "Enable WiMA_X Mobile Broadband"
-#~ msgstr "启用 WiMA_X 移动宽带"
-
-#~ msgid "_Help"
-#~ msgstr "帮助(_H)"
-
-#~ msgid "Disconnected - you are now offline"
-#~ msgstr "连接已断开 - 您现在处于离线状态"
-
-#~ msgid "Wireless network"
-#~ msgstr "无线网络"
-
-#~ msgid "Ethernet network"
-#~ msgstr "以太网"
-
-#~ msgid "Modem network"
-#~ msgstr "调制解调器网络"
-
-#~ msgid "You are now connected to the bonded network."
-#~ msgstr "您现在已连接到绑定的网络。"
-
-#~ msgid "Preparing bond connection '%s'..."
-#~ msgstr "正在准备绑定连接“%s”..."
-
-#~ msgid "Configuring bond connection '%s'..."
-#~ msgstr "正在配置绑定连接“%s”..."
-
-#~ msgid "User authentication required for bond connection '%s'..."
-#~ msgstr "绑定连接“%s”需要用户认证..."
-
-#~ msgid "Requesting address for '%s'..."
-#~ msgstr "正在为“%s”请求地址..."
-
-#~ msgid "Bond connection '%s' active"
-#~ msgstr "绑定连接“%s”已处于活动状态"
-
-#~ msgid "You are now connected to the bridged network."
-#~ msgstr "您现在已连接到桥接的网络。"
-
-#~ msgid "Preparing bridge connection '%s'..."
-#~ msgstr "正在准备桥接网络连接“%s”..."
-
-#~ msgid "Configuring bridge connection '%s'..."
-#~ msgstr "正在配置桥接网络连接 %s..."
-
-#~ msgid "User authentication required for bridge connection '%s'..."
-#~ msgstr "桥接网络“%s”需要用户认证..."
-
-#~ msgid "Bridge connection '%s' active"
-#~ msgstr "桥接网络连接“%s”已处于活动状态"
-
-#~ msgid "New Mobile Broadband connection..."
-#~ msgstr "新移动宽带连接..."
-
-#~ msgid "New Mobile Broadband (CDMA) connection..."
-#~ msgstr "新建移动宽带(CDMA)连接..."
-
-#~ msgid "You are now connected to the CDMA network."
-#~ msgstr "您现在已连接到 CDMA 网络。"
-
-#~ msgid "CDMA network."
-#~ msgstr "CDMA 网络。"
-
-#~ msgid "New Mobile Broadband (GSM) connection..."
-#~ msgstr "新建移动宽带(GSM)连接..."
-
-#~ msgid "You are now connected to the GSM network."
-#~ msgstr "您现在已连接到 GSM 网络。"
-
-#~ msgid "GSM network."
-#~ msgstr "GSM 网络。"
-
-#~ msgid "Auto InfiniBand"
-#~ msgstr "自动 InfiniBand"
-
-#~ msgid "InfiniBand Networks (%s)"
-#~ msgstr "InfiniBand 网络（%s）"
-
-#~ msgid "InfiniBand Network (%s)"
-#~ msgstr "InfiniBand 网络（%s）"
-
-#~ msgid "InfiniBand Networks"
-#~ msgstr "InfiniBand 网络"
-
-#~ msgid "InfiniBand Network"
-#~ msgstr "InfiniBand 网络"
-
-#~ msgid "You are now connected to the InfiniBand network."
-#~ msgstr "您现在已连接到 InfiniBand 网络。"
-
-#~ msgid "Preparing InfiniBand connection '%s'..."
-#~ msgstr "正在准备 InfiniBand 网络连接“%s”..."
-
-#~ msgid "Configuring InfiniBand connection '%s'..."
-#~ msgstr "正在配置 InfiniBand 网络连接 %s..."
-
-#~ msgid "User authentication required for InfiniBand connection '%s'..."
-#~ msgstr "InfiniBand 网络“%s”需要用户认证..."
-
-#~ msgid "InfiniBand connection '%s' active"
-#~ msgstr "InfiniBand 连接“%s”开启"
-
-#~ msgid "You are now connected to the teamed network."
-#~ msgstr "您现已连接到组队网络。"
-
-#~ msgid "Preparing team connection '%s'..."
-#~ msgstr "正在准备组队网络连接“%s”..."
-
-#~ msgid "Configuring team connection '%s'..."
-#~ msgstr "正在配置组队网络连接 %s..."
-
-#~ msgid "User authentication required for team connection '%s'..."
-#~ msgstr "组队连接“%s”需要用户认证..."
-
-#~ msgid "Team connection '%s' active"
-#~ msgstr "组队连接“%s”开启"
-
-#~ msgid "You are now connected to the VLAN."
-#~ msgstr "您现在已连接到 VLAN 网络。"
-
-#~ msgid "Preparing VLAN connection '%s'..."
-#~ msgstr "正在启动 VLAN 连接“%s”..."
-
-#~ msgid "Configuring VLAN connection '%s'..."
-#~ msgstr "正在启动 VLAN 连接“%s”..."
-
-#~ msgid "User authentication required for VLAN connection '%s'..."
-#~ msgstr "VLAN 连接“%s”需要用户认证..."
-
-#~ msgid "VLAN connection '%s' active"
-#~ msgstr "VLAN 连接“%s”已处于活动状态"
-
-#~ msgid "_Connect to Hidden Wi-Fi Network..."
-#~ msgstr "连接到隐藏的 Wi-Fi 网络(_C)..."
-
-#~ msgid "Create _New Wi-Fi Network..."
-#~ msgstr "创建新的 Wi-Fi 网络(_N)..."
-
-#~ msgid "WiMAX Mobile Broadband (%s)"
-#~ msgstr "WiMAX 移动宽带(%s)"
-
-#~ msgid "WiMAX Mobile Broadband"
-#~ msgstr "WiMAX 移动宽带"
-
-#~ msgid "WiMAX is disabled"
-#~ msgstr "WiMAX 已禁用"
-
-#~ msgid "WiMAX is disabled by hardware switch"
-#~ msgstr "WiMAX 已通过硬件开关禁用"
-
-#~ msgid "You are now connected to the WiMAX network."
-#~ msgstr "您现在已连接到 WiMAX 网络。"
-
-#~ msgid "%d dB"
-#~ msgstr "%d dB"
-
-#~ msgctxt "WiMAX CINR"
-#~ msgid "unknown"
-#~ msgstr "未知"
-
-#~ msgctxt "WiMAX Base Station ID"
-#~ msgid "unknown"
-#~ msgstr "未知"
-
-#~ msgid "WiMAX (%s)"
-#~ msgstr "WiMAX (%s)"
-
-#~ msgid "CINR:"
-#~ msgstr "CINR："
-
-#~ msgid "BSID:"
-#~ msgstr "BSID："
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "15"
-#~ msgstr "15"
-
-#~ msgid "Aut_onegotiate"
-#~ msgstr "自动握手(_O)"
-
-#~ msgid "WiMAX"
-#~ msgstr "WiMAX"
-
-#~ msgid "Error saving connection"
-#~ msgstr "保存连接出错"
-
-#~ msgid "The property '%s' / '%s' is invalid: %d"
-#~ msgstr "属性“%s”/“%s”非法：%d"
-
-#~ msgid "FirewallD is not running."
-#~ msgstr "FirewallD 未运行。"
-
-#~ msgid "IPv4 address netmask missing"
-#~ msgstr "IPv4 地址掩码丢失"
-
-#~ msgid "IPv6 prefix \"%s\" missing"
-#~ msgstr "IPv6 前缀 “%s” 丢失"
-
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "无法加载 WiMAX 用户界面。"
-
-#~ msgid "WiMAX name missing"
-#~ msgstr "WiMAX 名称缺失"
-
-#~ msgid "WiMAX device"
-#~ msgstr "WiMAX 设备"
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX 连接 %d"
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
-#~ "%s)."
-#~ msgstr "蓝牙配置不可用(无法连接 D-Bus：(%s) %s)。"
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
-#~ "%s)."
-#~ msgstr "蓝牙配置不可用(查找 NetworkManager 出错：(%s) %s)。"
-
-#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
-#~ msgstr "使用您的移动电话作为网络设备(PAN/NAP)"
-
-#~ msgid "Access the Internet using your mobile phone (DUN)"
-#~ msgstr "使用您的手机访问互联网(DUN)"
-
-#~ msgid "Error: %s"
-#~ msgstr "错误：%s"
-
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "无法建立 DUN 连接：%s"
-
-#~ msgid "Your phone is now ready to use!"
-#~ msgstr "您的电话已经可以使用！"
-
-#~ msgid "Mobile wizard was canceled"
-#~ msgstr "移动连接向导已被取消"
-
-#~ msgid "Unknown phone device type (not GSM or CDMA)"
-#~ msgstr "未知电话设备类型(不是 GSM 或者 CDMA)"
-
-#~ msgid "failed to connect to the phone."
-#~ msgstr "连接到电话失败。"
-
-#~ msgid "error getting bus connection"
-#~ msgstr "获取总线连接出错"
-
-#~ msgid "unexpectedly disconnected from the phone."
-#~ msgstr "意外断开与电话的连接。"
-
-#~ msgid "timed out detecting phone details."
-#~ msgstr "检测电话详细信息时超时。"
-
-#~ msgid "Detecting phone configuration..."
-#~ msgstr "正在检测电话配置..."
-
-#~ msgid ""
-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-#~ "Networking connection."
-#~ msgstr "在设置拨号网络连接前必须启用默认蓝牙适配器。"
-
-#~ msgid "Failed to create PAN connection: %s"
-#~ msgstr "无法建立 PAN 连接：%s"
-
-#~ msgid "%s Network"
-#~ msgstr "%s 网络"
-
-#~ msgid "New..."
-#~ msgstr "新建..."
-
-#~ msgid "invalid EAP-TLS CA certificate: %s"
-#~ msgstr "无效的 EAP-TLS CA 证书：%s"
-
-#~ msgid "invalid EAP-TLS CA certificate: no certificate specified"
-#~ msgstr "无效的 EAP-TLS CA 证书：没有指定的证书"
-
-#~ msgid "invalid EAP-TLS password: missing"
-#~ msgstr "无效的 EAP-TLS 密码：丢失"
-
-#~ msgid "invalid EAP-TLS private-key: %s"
-#~ msgstr "无效的 EAP-TLS 私钥：%s"
-
-#~ msgid "invalid EAP-TLS user-certificate: %s"
-#~ msgstr "无效的 EAP-TLS 用户证书：%s"
-
-#~ msgid "Unencrypted private keys are insecure"
-#~ msgstr "未加密的私钥是不安全的"
-
-#~ msgid ""
-#~ "The selected private key does not appear to be protected by a password.  "
-#~ "This could allow your security credentials to be compromised.  Please "
-#~ "select a password-protected private key.\n"
-#~ "\n"
-#~ "(You can password-protect your private key with openssl)"
-#~ msgstr ""
-#~ "选定的私钥似乎没有密码保护。这可能影响到您的安全证书的安全性。请选择一个有"
-#~ "密码保护的私钥。\n"
-#~ "\n"
-#~ "(您可以使用 openssl 来对私钥进行密码保护)"
-
-#~ msgid "Choose your private key..."
-#~ msgstr "选择您的私钥..."
diff -Nru network-manager-applet-1.8.4/po/zh_TW.po network-manager-applet-1.8.10/po/zh_TW.po
--- network-manager-applet-1.8.4/po/zh_TW.po	2017-05-10 10:44:54.000000000 +0000
+++ network-manager-applet-1.8.10/po/zh_TW.po	2017-12-19 11:44:30.000000000 +0000
@@ -8,23 +8,23 @@
 # Wei-Lun Chao , 2010.
 # Roy Chan , 2011.
 # Anthony Fok , 2013.
-#
+# lrintel , 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: network-manager-applet 0.9.8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
-"PO-Revision-Date: 2014-08-26 06:54+0800\n"
-"Last-Translator: Chao-Hsiung Liao \n"
+"POT-Creation-Date: 2017-12-12 11:18+0100\n"
+"PO-Revision-Date: 2017-11-07 06:45+0000\n"
+"Last-Translator: Copied by Zanata \n"
 "Language-Team: Traditional Chinese \n"
-"Language: zh_TW\n"
+"Language: zh_Hant\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.6.5\n"
+"X-Generator: Zanata 4.3.2\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
 msgid "Network"
 msgstr "網路"
 
@@ -33,7 +33,7 @@
 msgstr "管理您的網路連線"
 
 #: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: ../src/connection-editor/nm-connection-list.ui.h:1
 msgid "Network Connections"
 msgstr "網路連線"
 
@@ -145,55 +145,68 @@
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager 面板程式"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: ../shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: ../shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: ../shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: ../shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: ../shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: ../shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
 
-#. ***************************************************************************
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X 驗證"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-ip4-routes.ui.h:1
+#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
+#: ../src/applet-dialogs.c:1059 ../src/connection-editor/ce-ip4-routes.ui.h:1
 #: ../src/connection-editor/ce-ip6-routes.ui.h:1
 #: ../src/connection-editor/ce-new-connection.ui.h:1
 #: ../src/connection-editor/ce-page-dcb.ui.h:17
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/connection-editor/connection-helpers.c:308
+#: ../src/connection-editor/connection-helpers.c:771
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/page-bluetooth.c:311
+#: ../src/connection-editor/page-mobile.c:543
+#: ../src/connection-editor/page-proxy.c:121
+#: ../src/connection-editor/page-team.c:344
+#: ../src/connection-editor/page-team-port.c:206
+#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
+#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: ../src/libnma/nma-vpn-password-dialog.c:209
+#: ../src/libnma/nma-wifi-dialog.c:1066
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "連線(_O)"
 
@@ -209,38 +222,38 @@
 msgid "secure."
 msgstr "安全。"
 
-#: ../src/applet.c:381
+#: ../src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "無法加入/使用連線"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
+#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
+#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "連線失敗"
 
-#: ../src/applet.c:435
+#: ../src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "裝置斷線失敗"
 
-#: ../src/applet.c:440
+#: ../src/applet.c:451
 msgid "Disconnect failure"
 msgstr "斷線失敗"
 
-#: ../src/applet.c:470
+#: ../src/applet.c:481
 msgid "Connection activation failed"
 msgstr "連線生效失敗"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "不要再顯示這個訊息"
 
-#: ../src/applet.c:883
+#: ../src/applet.c:899
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -250,7 +263,7 @@
 "\n"
 "VPN 連線「%s」失敗，因為網路連線中斷了。"
 
-#: ../src/applet.c:885
+#: ../src/applet.c:901
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -260,7 +273,7 @@
 "\n"
 "VPN 連線「%s」失敗，因為網路連線被中斷了。"
 
-#: ../src/applet.c:887
+#: ../src/applet.c:903
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -269,7 +282,7 @@
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務意外的停止了。"
 
-#: ../src/applet.c:889
+#: ../src/applet.c:905
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -279,7 +292,7 @@
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務傳回無效的組態。"
 
-#: ../src/applet.c:891
+#: ../src/applet.c:907
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -288,7 +301,7 @@
 "\n"
 "VPN 連線「%s」失敗，因為連線的嘗試已逾時。"
 
-#: ../src/applet.c:893
+#: ../src/applet.c:909
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -297,7 +310,7 @@
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務沒有及時啟動。"
 
-#: ../src/applet.c:895
+#: ../src/applet.c:911
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -306,7 +319,7 @@
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務啟動失敗。"
 
-#: ../src/applet.c:897
+#: ../src/applet.c:913
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -315,7 +328,7 @@
 "\n"
 "VPN 連線「%s」失敗，因為沒有有效的 VPN 服務。"
 
-#: ../src/applet.c:899
+#: ../src/applet.c:915
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -324,7 +337,7 @@
 "\n"
 "VPN 連線「%s」失敗，因為無效的 VPN 機密。"
 
-#: ../src/applet.c:904
+#: ../src/applet.c:920
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -333,7 +346,7 @@
 "\n"
 "VPN 連線「%s」失敗。"
 
-#: ../src/applet.c:931
+#: ../src/applet.c:947
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -343,19 +356,19 @@
 "VPN 連線已成功的。\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: ../src/applet.c:949
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN 連線已成功的。\n"
 
-#: ../src/applet.c:935
+#: ../src/applet.c:951
 msgid "VPN Login Message"
 msgstr "VPN 登錄訊息"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: ../src/applet.c:959 ../src/applet.c:999
 msgid "VPN Connection Failed"
 msgstr "VPN 連線失敗"
 
-#: ../src/applet.c:987
+#: ../src/applet.c:1003
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -368,7 +381,7 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: ../src/applet.c:1006
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -381,148 +394,148 @@
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: ../src/applet.c:1295
 msgid "device not ready (firmware missing)"
 msgstr "裝置尚未就緒 (缺少韌體)"
 
-#: ../src/applet.c:1281
+#: ../src/applet.c:1297
 msgid "device not ready"
 msgstr "裝置尚未就緒"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:1307
+#: ../src/applet.c:1323
 msgid "Disconnect"
 msgstr "斷線"
 
-#: ../src/applet.c:1321
+#: ../src/applet.c:1337
 msgid "device not managed"
 msgstr "裝置無法管理"
 
-#: ../src/applet.c:1394
+#: ../src/applet.c:1410
 msgid "No network devices available"
 msgstr "沒有可用的網路裝置"
 
-#: ../src/applet.c:1448
+#: ../src/applet.c:1464
 msgid "_VPN Connections"
 msgstr "_VPN 連線"
 
-#: ../src/applet.c:1492
+#: ../src/applet.c:1508
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "設置 VPN(_C)…"
 
-#: ../src/applet.c:1495
+#: ../src/applet.c:1511
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN 連線"
 
-#: ../src/applet.c:1601
+#: ../src/applet.c:1617
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager 沒有執行…."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: ../src/applet.c:1622 ../src/applet.c:2687
 msgid "Networking disabled"
 msgstr "網路已停用"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: ../src/applet.c:1832
 msgid "Enable _Networking"
 msgstr "啟用網路(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: ../src/applet.c:1841
 msgid "Enable _Wi-Fi"
 msgstr "啟用 _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: ../src/applet.c:1850
 msgid "Enable _Mobile Broadband"
 msgstr "啟用行動寬頻(_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: ../src/applet.c:1862
 msgid "Enable N_otifications"
 msgstr "啟用通知功能(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: ../src/applet.c:1874
 msgid "Connection _Information"
 msgstr "連線資訊(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: ../src/applet.c:1882
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "編輯連線…"
 
-#: ../src/applet.c:1880
+#: ../src/applet.c:1896
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../src/applet.c:2191
+#: ../src/applet.c:2207
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "您現在已連線至「%s」。"
 
-#: ../src/applet.c:2231
+#: ../src/applet.c:2247
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:2232
+#: ../src/applet.c:2248
 msgid "The network connection has been disconnected."
 msgstr "網路連線已中斷。"
 
-#: ../src/applet.c:2534
+#: ../src/applet.c:2550
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "正在準備網路連線「%s」…"
 
-#: ../src/applet.c:2537
+#: ../src/applet.c:2553
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "網路連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "正在要求提供「%s」的網路位址…"
 
-#: ../src/applet.c:2543
+#: ../src/applet.c:2559
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "網路連線「%s」在使用中"
 
-#: ../src/applet.c:2616
+#: ../src/applet.c:2632
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "正在啟動 VPN 連線「%s」…"
 
-#: ../src/applet.c:2619
+#: ../src/applet.c:2635
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN 連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2622
+#: ../src/applet.c:2638
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "正在要求 VPN 提供「%s」的網路位址…"
 
-#: ../src/applet.c:2625
+#: ../src/applet.c:2641
 #, fuzzy, c-format
 msgid "VPN connection active"
 msgstr "VPN 連線「%s」在使用中"
 
-#: ../src/applet.c:2675
+#: ../src/applet.c:2691
 msgid "No network connection"
 msgstr "沒有網路連接"
 
-#: ../src/applet.c:3276
+#: ../src/applet.c:3292
 msgid "NetworkManager Applet"
 msgstr "NetworkManager 面板程式"
 
@@ -540,47 +553,47 @@
 msgid "Sending unlock code…"
 msgstr "發送解鎖用的密碼…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "行動寬頻 (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/applet-device-broadband.c:739
+#: ../src/connection-editor/connection-helpers.c:108
 #: ../src/connection-editor/page-mobile.c:308
 #: ../src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "行動寬頻"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "可用"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:805
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "新的行動寬頻連線"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "已建立連線"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:820
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "您現在已連線至行動寬頻網路。"
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
 msgid "Mobile Broadband network."
 msgstr "行動寬頻網路。"
 
-#: ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:961
 msgid "You are now registered on the home network."
 msgstr "您現在已註冊至家用網路。"
 
-#: ../src/applet-device-broadband.c:965
+#: ../src/applet-device-broadband.c:967
 msgid "You are now registered on a roaming network."
 msgstr "您現在已註冊至漫遊網路。"
 
@@ -588,22 +601,22 @@
 msgid "You are now connected to the mobile broadband network."
 msgstr "您現在已連線至行動寬頻網路。"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "正在準備行動寬頻連線「%s」…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "正在設定行動寬頻連線「%s」…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "行動寬頻連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "行動寬頻連線「%s」在使用中"
@@ -663,6 +676,18 @@
 msgid "DSL authentication"
 msgstr "DSL 驗證"
 
+#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/page-bluetooth.c:313
+#: ../src/connection-editor/page-mobile.c:545
+#: ../src/libnma/nma-vpn-password-dialog.c:210
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
 #: ../src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
@@ -677,7 +702,7 @@
 msgid "(none)"
 msgstr "(無)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "無法加入新連線"
 
@@ -685,77 +710,77 @@
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: ../src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi 網路 (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi 網路 (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: ../src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi 網路"
 
-#: ../src/applet-device-wifi.c:871
+#: ../src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi 已停用"
 
-#: ../src/applet-device-wifi.c:872
+#: ../src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi 已被硬體開關停用"
 
-#: ../src/applet-device-wifi.c:933
+#: ../src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "更多網路"
 
-#: ../src/applet-device-wifi.c:1122
+#: ../src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "有 Wi-Fi 網路可用"
 
-#: ../src/applet-device-wifi.c:1123
+#: ../src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "使用網路選單來連線到 Wi-Fi 網路"
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "您現在已連線至 Wi-Fi 網路「%s」。"
 
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "正在準備 Wi-Fi 網路連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "正在設定 Wi-Fi 網路連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1348
+#: ../src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Wi-Fi 網路連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-wifi.c:1351
+#: ../src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "正在要求提供「%s」的 Wi-Fi 網路位址…"
 
-#: ../src/applet-device-wifi.c:1362
+#: ../src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi 網路連線「%s」在使用中： %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: ../src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wi-Fi 網路連線「%s」在使用中"
 
-#: ../src/applet-device-wifi.c:1385
+#: ../src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "無法使用連線"
 
@@ -763,227 +788,227 @@
 msgid "Error displaying connection information:"
 msgstr "顯示連線資訊發生錯誤："
 
-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:379
+#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
 #: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
 #: ../src/wireless-security/wireless-security.c:448
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: ../src/applet-dialogs.c:75
 msgid "Dynamic WEP"
 msgstr "動態 WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:231
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: ../src/applet-dialogs.c:152
 #, fuzzy
 msgid "More addresses"
 msgstr "地址"
 
-#: ../src/applet-dialogs.c:226
+#: ../src/applet-dialogs.c:227
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
+#: ../src/connection-editor/page-wifi-security.c:332
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/applet-dialogs.c:260
+#: ../src/applet-dialogs.c:261
 #, c-format
 msgid "%s (default)"
 msgstr "%s (預設值)"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "不明"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
 msgctxt "Address"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
 msgid "IP Address:"
 msgstr "IP 位址："
 
-#: ../src/applet-dialogs.c:369
+#: ../src/applet-dialogs.c:370
 msgid "Broadcast Address:"
 msgstr "廣播位址："
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: ../src/applet-dialogs.c:382
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:383
 msgid "Subnet Mask:"
 msgstr "子網路遮罩："
 
-#: ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:493
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "乙太網路 (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:496
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: ../src/applet-dialogs.c:503
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: ../src/applet-dialogs.c:505
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
 #: ../src/connection-editor/ce-page-team-port.ui.h:23
 #: ../src/connection-editor/ce-page-team.ui.h:48
 #: ../src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "一般"
 
-#: ../src/applet-dialogs.c:516
+#: ../src/applet-dialogs.c:517
 msgid "Interface:"
 msgstr "介面："
 
-#: ../src/applet-dialogs.c:536
+#: ../src/applet-dialogs.c:537
 msgid "Hardware Address:"
 msgstr "硬體位址："
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:551
 msgid "Driver:"
 msgstr "驅動程式："
 
-#: ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:586
 msgid "Speed:"
 msgstr "速度："
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:601
 msgid "Security:"
 msgstr "安全性："
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
 #: ../src/connection-editor/ce-page-team.ui.h:29
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
 msgid "Default Route:"
 msgstr "預設路由："
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
 #: ../src/connection-editor/ce-page-team.ui.h:30
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
 msgid "Ignored"
 msgstr "已忽略"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:816
 msgid "VPN Type:"
 msgstr "VPN 類型："
 
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:823
 msgid "VPN Gateway:"
 msgstr "VPN 閘道器："
 
-#: ../src/applet-dialogs.c:828
+#: ../src/applet-dialogs.c:829
 msgid "VPN Username:"
 msgstr "VPN 使用者名稱："
 
-#: ../src/applet-dialogs.c:834
+#: ../src/applet-dialogs.c:835
 msgid "VPN Banner:"
 msgstr "VPN 旗幟："
 
-#: ../src/applet-dialogs.c:840
+#: ../src/applet-dialogs.c:841
 msgid "Base Connection:"
 msgstr "基礎連線："
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "不明"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: ../src/applet-dialogs.c:958
 msgid "No valid active connections found!"
 msgstr "找不到有效的使用中連線！"
 
-#: ../src/applet-dialogs.c:985
-#, fuzzy
+#: ../src/applet-dialogs.c:1007
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc.\n"
-"與許多其他社群貢獻者與翻譯者"
 
-#: ../src/applet-dialogs.c:988
+#: ../src/applet-dialogs.c:1010
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "用來管理您的網路裝置與連線的通知區面板程式。"
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1012
 msgid "NetworkManager Website"
 msgstr "NetworkManager 網站"
 
-#: ../src/applet-dialogs.c:1001
+#: ../src/applet-dialogs.c:1016
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1026
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "NetworkManager 面板程式無法找到一些需要的資源（找不到 .ui 檔）。"
 
-#: ../src/applet-dialogs.c:1006
+#: ../src/applet-dialogs.c:1031
 msgid "Missing resources"
 msgstr "遺失資源"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1057
 msgid "Mobile broadband network password"
 msgstr "行動寬頻網路密碼"
 
-#: ../src/applet-dialogs.c:1040
+#: ../src/applet-dialogs.c:1066
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "連線至「%s」需要密碼。"
 
-#: ../src/applet-dialogs.c:1055
+#: ../src/applet-dialogs.c:1081
 msgid "Password:"
 msgstr "密碼："
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1363
 msgid "SIM PIN unlock required"
 msgstr "需要解鎖 SIM PIN 碼"
 
-#: ../src/applet-dialogs.c:1338
+#: ../src/applet-dialogs.c:1364
 msgid "SIM PIN Unlock Required"
 msgstr "需要解鎖 SIM PIN 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1366
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -991,25 +1016,25 @@
 msgstr "要使用行動寬頻裝置「%s」之前，需要 SIM PIN 碼。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1368
 msgid "PIN code:"
 msgstr "PIN 碼："
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1372
 msgid "Show PIN code"
 msgstr "顯示 PIN 碼"
 
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1374
 msgid "SIM PUK unlock required"
 msgstr "需要解鎖 SIM PUK 碼"
 
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1375
 msgid "SIM PUK Unlock Required"
 msgstr "需要解鎖 SIM PUK 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: ../src/applet-dialogs.c:1377
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1017,30 +1042,37 @@
 msgstr "要使用行動寬頻裝置「%s」之前，需要 SIM PUK 碼。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1379
 msgid "PUK code:"
 msgstr "PUK 碼："
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: ../src/applet-dialogs.c:1382
 msgid "New PIN code:"
 msgstr "新的 PIN 碼："
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: ../src/applet-dialogs.c:1384
 msgid "Re-enter new PIN code:"
 msgstr "重新輸入 PIN 碼："
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: ../src/applet-dialogs.c:1389
 msgid "Show PIN/PUK codes"
 msgstr "顯示 PIN/PUK 碼"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-#: ../src/connection-editor/ce-page-dcb.ui.h:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: ../src/applet-vpn-request.c:201
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "連線資訊"
+
+#: ../src/applet-vpn-request.c:251
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "無法使用連線"
+
+#: ../src/applet-vpn-request.c:259
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
@@ -1057,21 +1089,21 @@
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 #: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-list.ui.h:3
 msgid "_Add"
 msgstr ""
 
-#. Delete
 #: ../src/connection-editor/ce-ip4-routes.ui.h:5
 #: ../src/connection-editor/ce-ip6-routes.ui.h:5
 #: ../src/connection-editor/ce-page-bond.ui.h:14
 #: ../src/connection-editor/ce-page-bridge.ui.h:4
 #: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/nm-connection-list.c:711
+#: ../src/connection-editor/connection-helpers.c:772
+#: ../src/connection-editor/nm-connection-list.ui.h:4
 msgid "_Delete"
 msgstr "刪除(_D)"
 
@@ -1161,11 +1193,10 @@
 msgid "M_ode:"
 msgstr "模式(_O)："
 
-#. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
 #: ../src/connection-editor/ce-page-team.ui.h:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: ../src/connection-editor/nm-connection-list.ui.h:5
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -1218,7 +1249,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:25
 #: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 #: ../src/connection-editor/ce-page-team.ui.h:17
 #: ../src/connection-editor/ce-page-vlan.ui.h:4
 #: ../src/connection-editor/ce-page-wifi.ui.h:8
@@ -1227,7 +1258,7 @@
 
 #: ../src/connection-editor/ce-page-bond.ui.h:26
 #: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-infiniband.ui.h:7
 #: ../src/connection-editor/ce-page-team.ui.h:18
 #: ../src/connection-editor/ce-page-vlan.ui.h:5
 #: ../src/connection-editor/ce-page-wifi.ui.h:7
@@ -1260,26 +1291,72 @@
 msgstr "_Hello 時間："
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "s"
 msgstr "秒"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "啟用網路(_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:14
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "啟用 _STP (生成樹協議)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:15
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:16
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:17
 msgid "_Max age:"
 msgstr "最大時間(_M)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:18
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:19
 msgid "_Aging time:"
 msgstr "存續時間(_A)："
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:20
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:21
+msgid "Group _forward mask:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:22
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
 #: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "自動"
@@ -1539,10 +1616,20 @@
 msgstr "使用者名稱(_U)："
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
 msgid "_Service:"
 msgstr "服務(_S)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: ../src/connection-editor/ce-page-dsl.ui.h:5
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:3
 #: ../src/wireless-security/ws-leap.ui.h:3
@@ -1550,7 +1637,11 @@
 msgid "Sho_w password"
 msgstr "顯示密碼(_W)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-dsl.ui.h:6
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:7
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
 #: ../src/libnma/nma-vpn-password-dialog.c:97
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
@@ -1561,13 +1652,29 @@
 msgid "_Password:"
 msgstr "密碼(_P)："
 
+#: ../src/connection-editor/ce-page-dsl.ui.h:8
+msgid "PPP _interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:9
+msgid "P_arent interface:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:10
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:11
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
 #: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:1
 msgid "Automatic"
 msgstr "自動"
@@ -1613,7 +1720,7 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: ../src/connection-editor/page-ip6.c:155
 msgid "Ignore"
 msgstr "忽略"
 
@@ -1621,7 +1728,7 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
 #: ../src/connection-editor/page-ip4.c:168
-#: ../src/connection-editor/page-ip6.c:185
+#: ../src/connection-editor/page-ip6.c:191
 msgid "Manual"
 msgstr "手動"
 
@@ -1630,7 +1737,7 @@
 msgstr "連接埠(_P)："
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 #: ../src/connection-editor/ce-page-wifi.ui.h:9
 #, fuzzy
 msgid "_Device:"
@@ -1780,20 +1887,20 @@
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "傳輸模式(_T)："
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
 msgid "Connected"
 msgstr "成功連線"
 
+#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+msgid "_Transport mode:"
+msgstr "傳輸模式(_T)："
+
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
 msgid "IPIP"
 msgstr ""
@@ -1831,40 +1938,39 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#, fuzzy
-msgid "Device name"
-msgstr "裝置名稱 + 編號"
+#: ../src/connection-editor/ce-page-macsec.ui.h:6
+msgid "Device name:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#, fuzzy
-msgid "Parent device"
-msgstr "有線網路"
+#: ../src/connection-editor/ce-page-macsec.ui.h:8
+msgid "Parent device:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#, fuzzy
-msgid "Mode"
-msgstr "模式(_M)："
+#: ../src/connection-editor/ce-page-macsec.ui.h:16
+msgid "Mode:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP"
+msgid "Local IP:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP"
+msgid "Remote IP:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key"
+msgid "Input key:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key"
+msgid "Output key:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-#, fuzzy
-msgid "MTU"
-msgstr "_MTU："
+msgid "MTU:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
@@ -1879,12 +1985,12 @@
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
 #: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: ../src/connection-editor/page-ip6.c:211
 msgid "Shared to other computers"
 msgstr "分享給其他電腦"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid "_Method:"
 msgstr "方法(_M)："
 
@@ -1899,7 +2005,7 @@
 "別，請在此輸入。"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1910,16 +2016,16 @@
 msgstr "D_HCP 用戶端 ID："
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 #: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:335
+#: ../src/connection-editor/page-ip6.c:346
 msgid "S_earch domains:"
 msgstr "搜尋網域(_E)："
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:16
 #: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:326
+#: ../src/connection-editor/page-ip6.c:337
 msgid "DNS ser_vers:"
 msgstr "_DNS 伺服器："
 
@@ -1944,11 +2050,12 @@
 "許連線完成。"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:22
 msgid "_Routes…"
 msgstr "路由(_R)…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-macsec.ui.h:3
 #: ../src/connection-editor/page-ip4.c:198
 msgid "Disabled"
 msgstr "已停用"
@@ -1961,7 +2068,15 @@
 msgid "Enabled (prefer temporary address)"
 msgstr "啟用 (偏好暫時位址)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "EUI64"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Stable privacy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses. Link-local addresses will "
@@ -1970,15 +2085,19 @@
 "網域名稱伺服器的 IP 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的"
 "位址。Link-local 位址會自動設定到連線中的介面。"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "I_Pv6 隱私擴充功能："
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "IPv6 address _generation mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "需要 IPv_6 addressing 才可完成此連線"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1986,6 +2105,94 @@
 "當連至可使用 IPv4 的網路時，若 IPv6 配置失敗，不過 IPv4 配置卻成功的話，請允"
 "許連線完成。"
 
+#: ../src/connection-editor/ce-page-macsec.ui.h:1
+msgid "PSK"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:2
+#: ../src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:4
+msgid "Check"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:5
+msgid "Strict"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:7
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:9
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:10
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:11
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:12
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:13
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:14
+msgid "CKN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:15
+msgid "CAK:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:17
+msgid "Keys:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:18
+msgid "Parameters:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:19
+msgid "Validation:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:20
+msgid "SCI port:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:21
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:22
+msgid "Encrypt"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:23
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-macsec.ui.h:24
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:26
 msgid "Basic"
@@ -2073,41 +2280,41 @@
 msgstr "傳送 PPP _echo 封包"
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "方法(_M)："
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
 #: ../src/connection-editor/ce-page-team.ui.h:25
 #, fuzzy
 msgid "None"
 msgstr "沒有"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: ../src/connection-editor/ce-page-proxy.ui.h:3
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: ../src/connection-editor/ce-page-proxy.ui.h:4
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: ../src/connection-editor/ce-page-proxy.ui.h:5
 msgid "PAC URL:"
 msgstr ""
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:6
+msgid "PAC script:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-proxy.ui.h:7
 msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
 #: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "從檔案匯入團隊組態(_I)…"
 
+#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#, fuzzy
+msgid "Method:"
+msgstr "方法(_M)："
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:1
 #: ../src/connection-editor/ce-page-team.ui.h:19
 #, fuzzy
@@ -2155,76 +2362,76 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:10
+msgid "Active-Backup runner options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:11
 #, fuzzy
 msgid "_Port priority:"
 msgstr "優先順序(_P)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
-msgstr ""
-
 #: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:82
-msgid ""
-"Validate received ARP packets on active ports. If this is not checked, all "
-"incoming ARP packets will be considered as a good reply."
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
 #: ../src/connection-editor/ce-page-team.ui.h:44
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: ../src/connection-editor/ce-page-team-port.ui.h:13
 msgid "Port priority. The higher number means higher priority."
 msgstr ""
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:14
+msgid "Port _sticky"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-team-port.ui.h:15
-msgid "Active-Backup runner options"
+#: ../src/connection-editor/ce-page-team.ui.h:82
+msgid ""
+"Validate received ARP packets on active ports. If this is not checked, all "
+"incoming ARP packets will be considered as a good reply."
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:16
+msgid "LACP runner options"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:17
 #, fuzzy
 msgid "_LACP port priority:"
 msgstr "優先順序(_P)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: ../src/connection-editor/ce-page-team-port.ui.h:18
 #, fuzzy
 msgid "LACP port _key:"
 msgstr "私密金鑰(_K)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: ../src/connection-editor/ce-page-team-port.ui.h:19
 #: ../src/connection-editor/ce-page-team.ui.h:43
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
+#: ../src/connection-editor/ce-page-team-port.ui.h:20
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: ../src/connection-editor/ce-page-team-port.ui.h:21
 #: ../src/connection-editor/ce-page-team.ui.h:45
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
+#: ../src/connection-editor/ce-page-team-port.ui.h:22
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
-msgid "LACP runner options"
-msgstr ""
-
 #: ../src/connection-editor/ce-page-team-port.ui.h:24
 #: ../src/connection-editor/ce-page-team.ui.h:70
 msgid "_Link watcher:"
@@ -2417,14 +2624,14 @@
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:104
+#: ../src/connection-editor/connection-helpers.c:105
 #: ../src/connection-editor/page-ethernet.c:351
 #: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "有線網路"
 
 #: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/connection-helpers.c:120
 #: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
 #: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
@@ -2686,6 +2893,7 @@
 msgid "SS_ID:"
 msgstr "SS_ID："
 
+#: ../src/connection-editor/ce-polkit.c:63
 #: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
@@ -2743,58 +2951,63 @@
 "在大多數情況下，網路供應者的 PPP 伺服器會支援所有的驗證方法。如果連線失敗，請"
 "嘗試停用某些方法的支援。"
 
-#: ../src/connection-editor/connection-helpers.c:105
+#: ../src/connection-editor/connection-helpers.c:106
 #: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
+#: ../src/connection-editor/connection-helpers.c:114
 #: ../src/connection-editor/page-bluetooth.c:123
 #: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "藍牙"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
-
 #: ../src/connection-editor/connection-helpers.c:115
+#: ../src/connection-editor/page-dsl.c:201
+msgid "DSL/PPPoE"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
 #: ../src/connection-editor/page-infiniband.c:148
 #: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:117
 #: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
 #: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "繫結"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:118
+#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
 #: ../src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "團隊"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-bridge.c:212
+#: ../src/connection-editor/connection-helpers.c:119
+#: ../src/connection-editor/page-bridge.c:233
 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "橋接"
 
-#: ../src/connection-editor/connection-helpers.c:120
+#: ../src/connection-editor/connection-helpers.c:121
 #: ../src/connection-editor/page-ip-tunnel.c:176
 msgid "IP tunnel"
 msgstr ""
 
 #: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
+#: ../src/connection-editor/page-macsec.c:190
+msgid "MACsec"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:124
+#: ../src/connection-editor/connection-helpers.c:398
 #: ../src/connection-editor/page-vpn.c:96
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:205
+#: ../src/connection-editor/connection-helpers.c:207
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2804,11 +3017,11 @@
 "\n"
 "錯誤：沒有 VPN 服務類型。"
 
-#: ../src/connection-editor/connection-helpers.c:217
+#: ../src/connection-editor/connection-helpers.c:219
 msgid "Cannot import VPN connection"
 msgstr "無法匯入 VPN 網路連線"
 
-#: ../src/connection-editor/connection-helpers.c:219
+#: ../src/connection-editor/connection-helpers.c:221
 #, fuzzy, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2820,47 +3033,54 @@
 "\n"
 "錯誤：%s。"
 
-#: ../src/connection-editor/connection-helpers.c:220
+#: ../src/connection-editor/connection-helpers.c:222
 #, fuzzy
 msgid "unknown error"
 msgstr "不明的錯誤"
 
-#: ../src/connection-editor/connection-helpers.c:303
+#: ../src/connection-editor/connection-helpers.c:305
 #: ../src/connection-editor/page-proxy.c:118
 #: ../src/connection-editor/page-team.c:341
 #: ../src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "選擇要匯入的檔案"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: ../src/connection-editor/connection-helpers.c:309
+#: ../src/connection-editor/page-proxy.c:122
+#: ../src/connection-editor/page-team.c:345
+#: ../src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:340
 msgid "Hardware"
 msgstr "硬體"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: ../src/connection-editor/connection-helpers.c:367
 msgid "Virtual"
 msgstr "虛擬"
 
-#: ../src/connection-editor/connection-helpers.c:514
 #: ../src/connection-editor/connection-helpers.c:516
+#: ../src/connection-editor/connection-helpers.c:518
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "匯入已儲存的 VPN 組態…"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: ../src/connection-editor/connection-helpers.c:548
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "由於不明的錯誤使連線編輯器對話盒無法初始化。"
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: ../src/connection-editor/connection-helpers.c:557
 msgid "Could not create new connection"
 msgstr "無法建立新連線"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: ../src/connection-editor/connection-helpers.c:720
 msgid "Connection delete failed"
 msgstr "刪除連線失敗"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: ../src/connection-editor/connection-helpers.c:768
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "您確定要刪除連線 %s ？"
@@ -2868,7 +3088,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:697
 #: ../src/connection-editor/ip6-routes-dialog.c:718
 #: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: ../src/connection-editor/page-ip6.c:1118
 msgid "Address"
 msgstr "地址"
 
@@ -2880,7 +3100,7 @@
 #: ../src/connection-editor/ip4-routes-dialog.c:735
 #: ../src/connection-editor/ip6-routes-dialog.c:756
 #: ../src/connection-editor/page-ip4.c:1174
-#: ../src/connection-editor/page-ip6.c:1133
+#: ../src/connection-editor/page-ip6.c:1156
 msgid "Gateway"
 msgstr "通訊閘"
 
@@ -2890,227 +3110,240 @@
 msgstr "度量 (Metric)"
 
 #: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: ../src/connection-editor/page-ip6.c:1137
 msgid "Prefix"
 msgstr "前綴"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: ../src/connection-editor/nm-connection-editor.c:109
 #, c-format
 msgid "Editing %s"
 msgstr "編輯 %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: ../src/connection-editor/nm-connection-editor.c:113
 msgid "Editing un-named connection"
 msgstr "編輯未命名的連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: ../src/connection-editor/nm-connection-editor.c:133
 #, fuzzy
 msgid "Missing connection name"
 msgstr "連線名稱(_N)："
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: ../src/connection-editor/nm-connection-editor.c:353
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "初始化編輯器時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: ../src/connection-editor/nm-connection-editor.c:360
+#: ../src/connection-editor/nm-connection-list.c:443
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "新增連線失敗"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: ../src/connection-editor/nm-connection-editor.c:375
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: ../src/connection-editor/nm-connection-editor.c:451
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "連線編輯器找不到一些需要的資源（找不到 .ui 檔）。"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: ../src/connection-editor/nm-connection-editor.c:579
 msgid "Save any changes made to this connection."
 msgstr "儲存任何對這個連線進行的變更。"
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: ../src/connection-editor/nm-connection-editor.c:580
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "驗證以儲存這個連線給此電腦上的所有使用者。"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not create connection"
 msgstr "無法建立連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: ../src/connection-editor/nm-connection-editor.c:596
 msgid "Could not edit connection"
 msgstr "無法編輯連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: ../src/connection-editor/nm-connection-editor.c:598
 msgid "Unknown error creating connection editor dialog."
 msgstr "建立連線編輯器對話盒時發生不明錯誤。"
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: ../src/connection-editor/nm-connection-editor.c:739
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:758
+#: ../src/connection-editor/nm-connection-editor.c:759
 msgid "Error initializing editor"
 msgstr "初始化編輯器時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: ../src/connection-editor/nm-connection-editor.c:1157
 msgid "Connection add failed"
 msgstr "新增連線失敗"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "將這設為 True，以停用在 EAP 認證中關於 CA 證書的警告。"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "連線名稱(_N)："
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 #, fuzzy
 msgid "_Export…"
 msgstr "匯出(_X)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: ../src/connection-editor/nm-connection-list.c:151
 msgid "never"
 msgstr "永不"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:173
 msgid "now"
 msgstr "現在"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: ../src/connection-editor/nm-connection-list.c:180
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分鐘以前"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: ../src/connection-editor/nm-connection-list.c:184
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小時以前"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:196
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以前"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: ../src/connection-editor/nm-connection-list.c:202
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 個月以前"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: ../src/connection-editor/nm-connection-list.c:206
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年以前"
 
-#: ../src/connection-editor/nm-connection-list.c:635
+#: ../src/connection-editor/nm-connection-list.c:445
+msgid "Connection cannot be deleted"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:448
+msgid "Select a connection to edit"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:450
+msgid "Select a connection to delete"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:785
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: ../src/connection-editor/nm-connection-list.c:798
 msgid "Last Used"
 msgstr "最後使用的"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: ../src/connection-editor/nm-connection-list.c:836
 msgid "Edit the selected connection"
 msgstr "編輯選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: ../src/connection-editor/nm-connection-list.c:837
 msgid "Authenticate to edit the selected connection"
 msgstr "驗證以編輯選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: ../src/connection-editor/nm-connection-list.c:842
 msgid "Delete the selected connection"
 msgstr "刪除選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: ../src/connection-editor/nm-connection-list.c:843
 msgid "Authenticate to delete the selected connection"
 msgstr "驗證以刪除選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: ../src/connection-editor/nm-connection-list.c:1048
+#: ../src/connection-editor/nm-connection-list.c:1051
 msgid "Error creating connection"
 msgstr "建立連線時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:1049
 msgid "No VPN plugins are installed."
 msgstr "尚未安裝任何 VPN 外掛程式。"
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:1052
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "不知道如何建立「%s」連線"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: ../src/connection-editor/nm-connection-list.c:1085
 msgid "Error editing connection"
 msgstr "編輯連線時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: ../src/connection-editor/nm-connection-list.c:1086
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "找不到 UUID「%s」的連線"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: ../src/connection-editor/nm-connection-list.ui.h:2
+msgid "Add a new connection"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:116
 msgid "802.1X Security"
 msgstr "802.1X 防護"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: ../src/connection-editor/page-8021x-security.c:118
 msgid "Could not load 802.1X Security user interface."
 msgstr "無法載入 802.1X 安全性使用者介面。"
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: ../src/connection-editor/page-8021x-security.c:132
 msgid "Use 802.1_X security for this connection"
 msgstr "在這個連線使用 802.1_X 防護"
 
@@ -3166,11 +3399,11 @@
 msgid "Bond connection %d"
 msgstr "繫結的連線 %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:236
 msgid "Could not load bridge user interface."
 msgstr "無法載入橋接的使用者介面。"
 
-#: ../src/connection-editor/page-bridge.c:317
+#: ../src/connection-editor/page-bridge.c:352
 #, c-format
 msgid "Bridge connection %d"
 msgstr "橋接的連線 %d"
@@ -3194,11 +3427,15 @@
 msgid "Could not load DCB user interface."
 msgstr "無法載入 DCB 使用者介面。"
 
-#: ../src/connection-editor/page-dsl.c:129
+#: ../src/connection-editor/page-dsl.c:203
 msgid "Could not load DSL user interface."
 msgstr "無法載入 DSL 使用者介面。"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: ../src/connection-editor/page-dsl.c:298
+msgid "missing parent interface"
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:343
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 連線 %d"
@@ -3298,27 +3535,27 @@
 msgstr "線網路連線 %d"
 
 #: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic (VPN)"
 msgstr "自動 (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN) addresses only"
 msgstr "只用自動 (VPN) 位址"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip6.c:143
 msgid "Automatic, addresses only"
 msgstr "自動，僅限位址"
 
 #: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:139
 msgid "Automatic (PPPoE)"
 msgstr "自動 (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE) addresses only"
 msgstr "只用自動 (PPPoE) 位址"
 
@@ -3331,17 +3568,17 @@
 msgstr "只用自動 (DHCP) 位址"
 
 #: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Link-Local Only"
 msgstr "只有本機連線"
 
 #: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: ../src/connection-editor/page-ip6.c:335
 msgid "Additional DNS ser_vers:"
 msgstr "額外的 _DNS 伺服器："
 
 #: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: ../src/connection-editor/page-ip6.c:344
 msgid "Additional s_earch domains:"
 msgstr "額外的搜尋網域(_E)："
 
@@ -3378,43 +3615,52 @@
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: ../src/connection-editor/page-ip6.c:179
 msgid "Automatic, DHCP only"
 msgstr "自動，僅使用 DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: ../src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "為 %s 編輯 IPv6 路由"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: ../src/connection-editor/page-ip6.c:1208
 msgid "IPv6 Settings"
 msgstr "IPv6 設定"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: ../src/connection-editor/page-ip6.c:1210
 msgid "Could not load IPv6 user interface."
 msgstr "無法載入 IPv6 使用者介面。"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: ../src/connection-editor/page-ip6.c:1302
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: ../src/connection-editor/page-ip6.c:1310
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: ../src/connection-editor/page-ip6.c:1319
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: ../src/connection-editor/page-ip6.c:1361
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
+#: ../src/connection-editor/page-macsec.c:192
+msgid "Could not load MACsec user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-macsec.c:331
+#, c-format
+msgid "MACSEC connection %d"
+msgstr ""
+
 #: ../src/connection-editor/page-master.c:247
 #: ../src/connection-editor/page-master.c:258
 msgid "Duplicate slaves"
@@ -3468,38 +3714,34 @@
 msgstr "我的供應商使用 C_DMA 為主的技術（例如 1xRTT、EVDO）"
 
 #: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: ../src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
 #: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: ../src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
 #: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: ../src/wireless-security/eap-method-ttls.c:287
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: ../src/wireless-security/eap-method-fast.c:282
+#: ../src/wireless-security/eap-method-peap.c:299
+#: ../src/wireless-security/eap-method-ttls.c:317
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: ../src/wireless-security/eap-method-ttls.c:302
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -3536,11 +3778,11 @@
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "錯誤：檔案不含有效的 JSON 組態"
 
-#: ../src/connection-editor/page-team.c:1156
+#: ../src/connection-editor/page-team.c:1034
 msgid "Could not load team user interface."
 msgstr "無法載入團隊使用者介面。"
 
-#: ../src/connection-editor/page-team.c:1253
+#: ../src/connection-editor/page-team.c:1131
 #, c-format
 msgid "Team connection %d"
 msgstr "團隊連線 %d"
@@ -3548,11 +3790,11 @@
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: ../src/connection-editor/page-team-port.c:655
 msgid "Team Port"
 msgstr "團隊連接埠"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: ../src/connection-editor/page-team-port.c:657
 msgid "Could not load team port user interface."
 msgstr "無法載入團隊連接埠使用者介面。"
 
@@ -3662,48 +3904,48 @@
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 連線 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
+#: ../src/connection-editor/page-wifi-security.c:358
 #: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-位元 金鑰 (Hex 或 ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
+#: ../src/connection-editor/page-wifi-security.c:368
 #: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-位元 密語"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: ../src/connection-editor/page-wifi-security.c:394
 msgid "Dynamic WEP (802.1X)"
 msgstr "動態 WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
+#: ../src/connection-editor/page-wifi-security.c:407
 #: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 個人版"
 
-#: ../src/connection-editor/page-wifi-security.c:418
+#: ../src/connection-editor/page-wifi-security.c:420
 #: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 企業版"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: ../src/connection-editor/page-wifi-security.c:463
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "無法載入 Wi-Fi 安全性使用者介面；失去 Wi-Fi 設定值。"
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: ../src/connection-editor/page-wifi-security.c:474
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi 安全性"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: ../src/connection-editor/page-wifi-security.c:476
 msgid "Could not load Wi-Fi security user interface."
 msgstr "無法載入 Wi-Fi 安全性使用者介面。"
 
-#: ../src/connection-editor/page-wifi-security.c:558
+#: ../src/connection-editor/page-wifi-security.c:560
 #, c-format
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
+#: ../src/connection-editor/page-wifi-security.c:566
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
@@ -3754,35 +3996,39 @@
 msgid "Connection Information"
 msgstr "連線資訊"
 
+#: ../src/info.ui.h:2
+msgid "_Close"
+msgstr ""
+
 #: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "啟用網路連線"
 
 #: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
 #, fuzzy
 msgid "No certificate set"
 msgstr "不需要 CA 憑證(_R)"
 
 #: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
 msgid "No key set"
 msgstr ""
 
 #: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "選擇 CA 憑證"
 
 #: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
 #, fuzzy, c-format
 msgid "%s private _key:"
 msgstr "私密金鑰(_K)："
 
 #: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
 #, fuzzy, c-format
 msgid "%s key _password:"
 msgstr "私密金鑰密碼(_P)："
@@ -3793,7 +4039,7 @@
 msgstr "選擇 CA 憑證"
 
 #: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
 msgid "%s _certificate:"
 msgstr "使用者憑證(_U)："
@@ -3995,47 +4241,47 @@
 msgid "New Mobile Broadband Connection"
 msgstr "新的行動寬頻連線"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: ../src/libnma/nma-cert-chooser-button.c:165
 #, fuzzy
 msgid "(None)"
 msgstr "(無)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: ../src/libnma/nma-cert-chooser-button.c:173
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: ../src/libnma/nma-cert-chooser-button.c:174
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "C_A 憑證："
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
+#: ../src/libnma/nma-cert-chooser-button.c:193
 #: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "不明"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: ../src/libnma/nma-cert-chooser-button.c:215
+#: ../src/libnma/nma-cert-chooser-button.c:245
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: ../src/libnma/nma-cert-chooser-button.c:216
+#: ../src/libnma/nma-cert-chooser-button.c:246
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: ../src/libnma/nma-cert-chooser-button.c:472
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "選擇 CA 憑證"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
 msgid "%s certificate _password:"
 msgstr "使用者憑證(_U)："
@@ -4102,8 +4348,8 @@
 msgid "_Tertiary Password:"
 msgstr "第二密碼(_S)："
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: ../src/libnma/nma-vpn-password-dialog.c:238
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "顯示密碼(_O)"
 
@@ -4132,45 +4378,45 @@
 msgid "Dynamic WEP (802.1x)"
 msgstr "動態 WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "需要密碼或是加密金鑰來存取 Wi-Fi 網路「%s」。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi 網路連線需要驗證"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi 網路連線需要驗證"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "建立新的 Wi-Fi 網路"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "新的 Wi-Fi 網路"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "輸入您要建立的 Wi-Fi 網路的名稱。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "連接到隱藏的 Wi-Fi 網路"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "隱藏的 Wi-Fi 網路"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4320,25 +4566,25 @@
 msgid "Roaming network"
 msgstr "漫遊網路"
 
-#: ../src/mobile-helpers.c:331
+#: ../src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "SIM 卡「%s」在「%s」的 PIN 碼"
 
-#: ../src/mobile-helpers.c:464
+#: ../src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "需要 PIN 碼"
 
-#: ../src/mobile-helpers.c:472
+#: ../src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "這個行動寬頻裝置需要 PIN 碼"
 
-#: ../src/mobile-helpers.c:622
+#: ../src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "行動寬頻連線「%s」在使用中：(%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: ../src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "漫遊"
 
@@ -4348,12 +4594,12 @@
 msgid "%s connection"
 msgstr "%s 連線"
 
-#: ../src/utils/utils.c:563
+#: ../src/utils/utils.c:565
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: ../src/utils/utils.c:577
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER、PEM 或是 PKCS#12 私人金鑰 (*.der, *.pem, *.p12, *.key)"
 
@@ -4361,39 +4607,35 @@
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: ../src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "不需要 CA 憑證(_R)"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: ../src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: ../src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: ../src/wireless-security/eap-method-fast.c:267
+#: ../src/wireless-security/eap-method-peap.c:329
+#: ../src/wireless-security/eap-method-ttls.c:379
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:405
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "選擇一個 PAC 檔案…"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: ../src/wireless-security/eap-method-fast.c:412
 msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: ../src/wireless-security/eap-method-fast.c:416
 msgid "All files"
 msgstr "所有檔案"
 
@@ -4411,7 +4653,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:4
 #: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
 msgid "Anony_mous identity:"
 msgstr "匿名識別(_M)："
 
@@ -4421,7 +4663,7 @@
 
 #: ../src/wireless-security/eap-method-fast.ui.h:6
 #: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
 msgid "_Inner authentication:"
 msgstr "內部驗證(_I)："
 
@@ -4437,27 +4679,12 @@
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: ../src/wireless-security/eap-method-peap.c:314
+#: ../src/wireless-security/eap-method-ttls.c:364
 #: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "選擇憑證授權單位 (CA) 憑證…"
-
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Version 0"
 msgstr "版本 0"
@@ -4467,20 +4694,27 @@
 msgstr "版本 1"
 
 #: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A 憑證："
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
 #: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 憑證(_R)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:6
 msgid "PEAP _version:"
 msgstr "PEAP 版本(_V)："
 
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
+msgid "_Domain:"
+msgstr ""
+
 #: ../src/wireless-security/eap-method-simple.c:75
 msgid "missing EAP username"
 msgstr ""
@@ -4493,46 +4727,28 @@
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: ../src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "不需要 CA 憑證(_R)"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: ../src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: ../src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "不需要 CA 憑證(_R)"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
 #: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "識別(_D)："
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: ../src/wireless-security/eap-method-ttls.c:333
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
@@ -4606,17 +4822,17 @@
 msgstr ""
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (預設值)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Open System"
 msgstr "開放系統"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "Shared Key"
 msgstr "共享金鑰"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "1 (Default)"
+msgstr "1 (預設值)"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "_Key:"
 msgstr "金鑰(_K)："
@@ -4643,618 +4859,3 @@
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "類型(_T)："
-
-#, fuzzy
-#~ msgid "NetworkManager for GNOME"
-#~ msgstr "NetworkManager 面板程式"
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection '%s' disconnected because the VPN service stopped."
-#~ msgstr ""
-#~ "\n"
-#~ "VPN 連線「%s」失敗，因為 VPN 服務已停止。"
-
-#~ msgid ""
-#~ "\n"
-#~ "The VPN connection '%s' disconnected."
-#~ msgstr ""
-#~ "\n"
-#~ "VPN 連線「%s」已斷線。"
-
-#~ msgid "_Disconnect VPN"
-#~ msgstr "與 VPN 斷線(_D)"
-
-#~ msgid "New Mobile Broadband connection..."
-#~ msgstr "新的行動寬頻連線…"
-
-#~ msgid "_Connect to Hidden Wi-Fi Network..."
-#~ msgstr "連接到隱藏的 Wi-Fi 網路(_C)…"
-
-#~ msgid "Create _New Wi-Fi Network..."
-#~ msgstr "建立新的 Wi-Fi 網路(_N)…"
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "15"
-#~ msgstr "15"
-
-#~ msgid "Aut_onegotiate"
-#~ msgstr "自動協議(_O)"
-
-#~ msgid "_Export..."
-#~ msgstr "匯出(_E)…"
-
-#~ msgid "FirewallD is not running."
-#~ msgstr "FirewallD 沒有執行。"
-
-#~ msgid "New..."
-#~ msgstr "新增…"
-
-#, fuzzy
-#~ msgid "invalid EAP-TLS CA certificate: %s"
-#~ msgstr "C_A 憑證："
-
-#~ msgid "Unencrypted private keys are insecure"
-#~ msgstr "未加密的私密金鑰是不安全的"
-
-#~ msgid ""
-#~ "The selected private key does not appear to be protected by a password.  "
-#~ "This could allow your security credentials to be compromised.  Please "
-#~ "select a password-protected private key.\n"
-#~ "\n"
-#~ "(You can password-protect your private key with openssl)"
-#~ msgstr ""
-#~ "所選擇的私密金鑰似乎沒有密碼保護。 這可能會導致不安全的後果。請選擇用密碼"
-#~ "保護的私密金鑰。\n"
-#~ "\n"
-#~ "（您可以使用 openssl 來加密您的私密金鑰）"
-
-#~ msgid "Choose your personal certificate..."
-#~ msgstr "選擇您的個人憑證…"
-
-#~ msgid "Choose your private key..."
-#~ msgstr "選擇您的私密金鑰…"
-
-#~ msgid "Enable WiMA_X Mobile Broadband"
-#~ msgstr "啟用 WiMA_X 行動寬頻"
-
-#~ msgid "_Help"
-#~ msgstr "求助(_H)"
-
-#~ msgid "You are now connected to the bonded network."
-#~ msgstr "您現在已連線至繫結的網路。"
-
-#~ msgid "Preparing bond connection '%s'..."
-#~ msgstr "正在準備繫結的連線「%s」…"
-
-#~ msgid "Configuring bond connection '%s'..."
-#~ msgstr "正在設定繫結的連線「%s」…"
-
-#~ msgid "User authentication required for bond connection '%s'..."
-#~ msgstr "繫結的連線「%s」需要使用者驗證…"
-
-#~ msgid "Requesting address for '%s'..."
-#~ msgstr "正在要求「%s」的網路位址…"
-
-#~ msgid "Bond connection '%s' active"
-#~ msgstr "繫結的連線「%s」在使用中"
-
-#~ msgid "You are now connected to the bridged network."
-#~ msgstr "您現在已連線至橋接的網路。"
-
-#~ msgid "Preparing bridge connection '%s'..."
-#~ msgstr "正在準備橋接的網路連線「%s」…"
-
-#~ msgid "Configuring bridge connection '%s'..."
-#~ msgstr "正在設定橋接的網路連線「%s」…"
-
-#~ msgid "User authentication required for bridge connection '%s'..."
-#~ msgstr "橋接的連線「%s」需要使用者驗證…"
-
-#~ msgid "Bridge connection '%s' active"
-#~ msgstr "橋接的連線「%s」在使用中"
-
-#~ msgid "New Mobile Broadband (CDMA) connection..."
-#~ msgstr "新的行動寬頻 (CDMA) 連線…"
-
-#~ msgid "You are now connected to the CDMA network."
-#~ msgstr "您現在已連線至 CDMA 網路。"
-
-#~ msgid "CDMA network."
-#~ msgstr "CDMA 網路。"
-
-#~ msgid "New Mobile Broadband (GSM) connection..."
-#~ msgstr "新的行動寬頻 (GSM) 連線…"
-
-#~ msgid "You are now connected to the GSM network."
-#~ msgstr "您現在已連線至 GSM 網路。"
-
-#~ msgid "GSM network."
-#~ msgstr "GSM 網路。"
-
-#~ msgid "Auto InfiniBand"
-#~ msgstr "自動 InfiniBand"
-
-#~ msgid "InfiniBand Networks (%s)"
-#~ msgstr "InfiniBand 網路 (%s)"
-
-#~ msgid "InfiniBand Network (%s)"
-#~ msgstr "InfiniBand 網路 (%s)"
-
-#~ msgid "InfiniBand Networks"
-#~ msgstr "InfiniBand 網路"
-
-#~ msgid "InfiniBand Network"
-#~ msgstr "InfiniBand 網路"
-
-#~ msgid "You are now connected to the InfiniBand network."
-#~ msgstr "您現在已連線至 InfiniBand 網路。"
-
-#~ msgid "Preparing InfiniBand connection '%s'..."
-#~ msgstr "正在準備 InfiniBand 連線「%s」…"
-
-#~ msgid "Configuring InfiniBand connection '%s'..."
-#~ msgstr "正在設定 InfiniBand 連線「%s」…"
-
-#~ msgid "User authentication required for InfiniBand connection '%s'..."
-#~ msgstr "InfiniBand 連線「%s」需要使用者驗證…"
-
-#~ msgid "InfiniBand connection '%s' active"
-#~ msgstr "InfiniBand 連線「%s」在使用中"
-
-#~ msgid "You are now connected to the teamed network."
-#~ msgstr "您現在已連線至團隊網路。"
-
-#~ msgid "Preparing team connection '%s'..."
-#~ msgstr "正在準備團隊的網路連線「%s」…"
-
-#~ msgid "Configuring team connection '%s'..."
-#~ msgstr "正在設定團隊的網路連線「%s」…"
-
-#~ msgid "User authentication required for team connection '%s'..."
-#~ msgstr "團隊連線「%s」需要使用者驗證…"
-
-#~ msgid "Team connection '%s' active"
-#~ msgstr "團隊連線「%s」在使用中"
-
-#~ msgid "You are now connected to the VLAN."
-#~ msgstr "您現在已連線至 VLAN 網路。"
-
-#~ msgid "Preparing VLAN connection '%s'..."
-#~ msgstr "正在啟動 VLAN 連線「%s」…"
-
-#~ msgid "Configuring VLAN connection '%s'..."
-#~ msgstr "正在啟動 VLAN 連線「%s」…"
-
-#~ msgid "User authentication required for VLAN connection '%s'..."
-#~ msgstr "VLAN 連線「%s」需要使用者驗證…"
-
-#~ msgid "VLAN connection '%s' active"
-#~ msgstr "VLAN 連線「%s」在使用中"
-
-#~ msgid "WiMAX Mobile Broadband (%s)"
-#~ msgstr "WiMAX 行動寬頻 (%s)"
-
-#~ msgid "WiMAX Mobile Broadband"
-#~ msgstr "WiMAX 行動寬頻"
-
-#~ msgid "WiMAX is disabled"
-#~ msgstr "WiMAX 已停用"
-
-#~ msgid "WiMAX is disabled by hardware switch"
-#~ msgstr "WiMAX 已被硬體開關停用"
-
-#~ msgid "You are now connected to the WiMAX network."
-#~ msgstr "您現在已連線至 WiMAX 網路。"
-
-#~ msgid "%d dB"
-#~ msgstr "%d dB"
-
-#~ msgctxt "WiMAX CINR"
-#~ msgid "unknown"
-#~ msgstr "不明"
-
-#~ msgctxt "WiMAX Base Station ID"
-#~ msgid "unknown"
-#~ msgstr "不明"
-
-#~ msgid "WiMAX (%s)"
-#~ msgstr "WiMAX (%s)"
-
-#~ msgid "CINR:"
-#~ msgstr "CINR："
-
-#~ msgid "BSID:"
-#~ msgstr "BSID："
-
-#~ msgid "_Device MAC address:"
-#~ msgstr "裝置的 MAC 位址(_D)："
-
-#~ msgid "Any"
-#~ msgstr "任何"
-
-#~ msgid "3G (UMTS/HSPA)"
-#~ msgstr "3G (UMTS/HSPA)"
-
-#~ msgid "2G (GPRS/EDGE)"
-#~ msgstr "2G (GPRS/EDGE)"
-
-#~ msgid "Prefer 3G (UMTS/HSPA)"
-#~ msgstr "偏好 3G (UMTS/HSPA)"
-
-#~ msgid "Prefer 2G (GPRS/EDGE)"
-#~ msgstr "偏好 2G (GPRS/EDGE)"
-
-#~ msgid "Prefer 4G (LTE)"
-#~ msgstr "偏好 4G (LTE)"
-
-#~ msgid "Use only 4G (LTE)"
-#~ msgstr "只使用 4G (LTE)"
-
-#~ msgid "I_mport team configuration from a file..."
-#~ msgstr "從檔案匯入團隊組態(_M)…"
-
-#~ msgid "Infrastructure"
-#~ msgstr "基礎架構"
-
-#~ msgid "WiMAX"
-#~ msgstr "WiMAX"
-
-#~ msgid "Error saving connection"
-#~ msgstr "儲存連線時錯誤"
-
-#~ msgid "The property '%s' / '%s' is invalid: %d"
-#~ msgstr "屬性「%s」/「%s」是無效的：%d"
-
-#~ msgid "Automatic (PPP)"
-#~ msgstr "自動 (PPP)"
-
-#~ msgid "Automatic (PPP) addresses only"
-#~ msgstr "只用自動 (PPP) 位址"
-
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "無法載入 WiMAX 使用者介面。"
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX 連線 %d"
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
-#~ "%s)."
-#~ msgstr "無法進行藍牙的配置（無法連至 D-Bus：(%s) %s）。"
-
-#~ msgid ""
-#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
-#~ "%s)."
-#~ msgstr "無法進行藍牙的配置（找不到 NetworkManager：(%s) %s）。"
-
-#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
-#~ msgstr "使用手機作為網路裝置（PAN/NAP）"
-
-#~ msgid "Access the Internet using your mobile phone (DUN)"
-#~ msgstr "使用手機存取網際網路（DUN）"
-
-#~ msgid "Error: %s"
-#~ msgstr "錯誤：%s"
-
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "無法建立 DUN 連線：%s"
-
-#~ msgid "Your phone is now ready to use!"
-#~ msgstr "您的電話現在已經可以使用！"
-
-#~ msgid "Mobile wizard was canceled"
-#~ msgstr "行動精靈已經取消"
-
-#~ msgid "Unknown phone device type (not GSM or CDMA)"
-#~ msgstr "不明的電話裝置類型（非 GSM 或 CDMA）"
-
-#~ msgid "unknown modem type."
-#~ msgstr "不明的數據機類型。"
-
-#~ msgid "failed to connect to the phone."
-#~ msgstr "無法連線至電話。"
-
-#~ msgid "error getting bus connection"
-#~ msgstr "取得匯流排連線時發生錯誤"
-
-#~ msgid "unexpectedly disconnected from the phone."
-#~ msgstr "電話無預期離線。"
-
-#~ msgid "timed out detecting phone details."
-#~ msgstr "在時間內偵測不到電話的詳細資料。"
-
-#~ msgid "Detecting phone configuration..."
-#~ msgstr "偵測電話的配置…"
-
-#~ msgid ""
-#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-#~ "Networking connection."
-#~ msgstr "預設的藍牙配接卡必須在設定撥接網路連線前啟用。"
-
-#~ msgid "Failed to create PAN connection: %s"
-#~ msgstr "無法建立 PAN 連線：%s"
-
-#~ msgid "%s Network"
-#~ msgstr "%s 網路"
-
-#~ msgid "Primary DNS:"
-#~ msgstr "主要 DNS："
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "次要 DNS："
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "第三 DNS："
-
-#~ msgid "_Save..."
-#~ msgstr "儲存(_S)…"
-
-#~ msgid "_Edit..."
-#~ msgstr "編輯(_E)…"
-
-#~ msgid "_Delete..."
-#~ msgstr "刪除(_D)…"
-
-#~ msgid "No Certificate Authority certificate chosen"
-#~ msgstr "未選擇任何憑證授權單位 (CA) 憑證"
-
-#~ msgid ""
-#~ "Not using a Certificate Authority (CA) certificate can result in "
-#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
-#~ "a Certificate Authority certificate?"
-#~ msgstr ""
-#~ "不使用憑證中心 (CA) 的憑證會造成連線不安全、流氓 Wi-Fi 網路 (可能被竊取、"
-#~ "劫聽之意)。是否要選擇一個憑證中心的憑證？"
-
-#~ msgid "Yes"
-#~ msgstr "是"
-
-#~ msgid "Only on activation"
-#~ msgstr "只在生效時"
-
-#~ msgid "No"
-#~ msgstr "否"
-
-#~ msgid "ModemManager is not running"
-#~ msgstr "ModemManager 未有運行"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "自動連線(_A)"
-
-#~ msgid "A_vailable to all users"
-#~ msgstr "所有使用者皆可用"
-
-#~ msgid "An unknown error occurred."
-#~ msgstr "發生不明的錯誤。"
-
-#~ msgid "Could not edit new connection"
-#~ msgstr "無法編輯新連線"
-
-#~ msgid "Wireless Networks (%s)"
-#~ msgstr "無線網路 (%s)"
-
-#~ msgid "Wireless Network (%s)"
-#~ msgstr "無線網路 (%s)"
-
-#~ msgid "Wireless Network"
-#~ msgid_plural "Wireless Networks"
-#~ msgstr[0] "無線網路"
-
-#~ msgid "wireless is disabled"
-#~ msgstr "無線網路已停用"
-
-#~ msgid "wireless is disabled by hardware switch"
-#~ msgstr "無線網路已被硬體開關停用"
-
-#~ msgid "Preparing wireless network connection '%s'..."
-#~ msgstr "正在準備無線網路連線「%s」…"
-
-#~ msgid "Configuring wireless network connection '%s'..."
-#~ msgstr "正在設定無線網路連線「%s」…"
-
-#~ msgid "Requesting a wireless network address for '%s'..."
-#~ msgstr "正在要求無線網路「%s」提供網路位址…"
-
-#~ msgid "Wireless network connection '%s' active"
-#~ msgstr "無線網路連線「%s」在使用中"
-
-#~ msgid "Could not load Wired Security security user interface."
-#~ msgstr "無法載入 Wired Security 安全使用者介面。"
-
-#~ msgid "Wireless"
-#~ msgstr "無線網路"
-
-#~ msgid "Wireless connection %d"
-#~ msgstr "無線網路連線 %d"
-
-#~ msgid "_Import"
-#~ msgstr "匯入(_I)"
-
-#~ msgid "Could not edit imported connection"
-#~ msgstr "無法編輯匯入的連線"
-
-#~ msgid "No VPN plugin available. Please install one to enable this button."
-#~ msgstr "沒有 VPN 外掛程式可用。請安裝其中一種以啟用這個按鈕。"
-
-#~ msgid "Don't know how to edit '%s' connections"
-#~ msgstr "不知道如何編輯「%s」連線"
-
-#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-#~ msgstr "無法進行藍牙的配置（無法建立 D-Bus proxy）。"
-
-#~ msgid "_Security:"
-#~ msgstr "安全性(_S)："
-
-#~ msgid "Disconnected - you are now offline"
-#~ msgstr "未連線 - 您現在是離線"
-
-#~ msgid "Wireless network"
-#~ msgstr "無線網路"
-
-#~ msgid "Ethernet network"
-#~ msgstr "乙太網路"
-
-#~ msgid "Modem network"
-#~ msgstr "數據機網路"
-
-#~ msgid "Mobile Broadband network"
-#~ msgstr "行動寬頻網路"
-
-#~ msgid "CDMA network"
-#~ msgstr "CDMA 網路"
-
-#~ msgid "Wired network"
-#~ msgstr "有線網路"
-
-#~ msgid "WiMAX network"
-#~ msgstr "WiMAX 網路"
-
-#~ msgid "Enter a name for the wireless network you wish to create."
-#~ msgstr "輸入您要建立的無線網路的名稱。"
-
-#~ msgid "New wireless network"
-#~ msgstr "新的無線網路"
-
-#~ msgid "Wired Network"
-#~ msgstr "有線網路"
-
-#~ msgid "Wired Networks"
-#~ msgstr "有線網路"
-
-#~ msgid "Enable _Wireless"
-#~ msgstr "啟用無線網路(_W)"
-
-#~ msgid "Create New Wireless Network"
-#~ msgstr "建立新的無線網路"
-
-#~ msgid "Wired network connection '%s' active"
-#~ msgstr "有線網路連線「%s」在使用中"
-
-#~ msgid "Wireless Networks Available"
-#~ msgstr "可用的無線網路"
-
-#~ msgid "Wireless network connection '%s' active: %s (%d%%)"
-#~ msgstr "無線網路連線「%s」在使用中： %s (%d%%)"
-
-#~ msgid "Could not load wired user interface."
-#~ msgstr "無法載入有線網路使用者介面。"
-
-#~ msgid "Could not load WiFi user interface."
-#~ msgstr "無法載入 WiFi 使用者介面。"
-
-#~ msgid "Could not load WiFi security user interface; missing WiFi setting."
-#~ msgstr "無法載入 WiFi 防護使用者介面；失去 WiFi 設定值。"
-
-#~ msgid "Could not load WiFi security user interface."
-#~ msgstr "無法載入 WiFi 防護使用者介面。"
-
-#~ msgid "Wireless Security"
-#~ msgstr "無線網路防護"
-
-#~ msgid "Error creating connection editor dialog."
-#~ msgstr "建立連線編輯器對話盒時發生錯誤。"
-
-#~ msgid "Wired 802.1X authentication"
-#~ msgstr "有線網路 802.1X 驗證"
-
-#~ msgid ""
-#~ "Passwords or encryption keys are required to access the wireless network "
-#~ "'%s'."
-#~ msgstr "需要密碼或是加密金鑰來存取無線網路「%s」。"
-
-#~ msgid "Wireless Network Authentication Required"
-#~ msgstr "無線網路驗證要求"
-
-#~ msgid "Authentication required by wireless network"
-#~ msgstr "無線網路所需要的驗證"
-
-#~ msgid "Connect to Hidden Wireless Network"
-#~ msgstr "連接到隱藏的無線網路"
-
-#~ msgid "Hidden wireless network"
-#~ msgstr "隱藏的無線網路"
-
-#~ msgid ""
-#~ "Enter the name and security details of the hidden wireless network you "
-#~ "wish to connect to."
-#~ msgstr "輸入您要連接的隱藏無線網路的名稱與安全性詳細資料。"
-
-#~ msgid "Wireless _adapter:"
-#~ msgstr "無線網路卡(_A)："
-
-#~ msgid ""
-#~ "This option locks this connection to the wireless access point (AP) "
-#~ "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-#~ msgstr ""
-#~ "此選項會將此連線鎖定至在此所輸入的 BSSID 所指定的無限存取點（AP）。例如："
-#~ "00:11:22:33:44:55"
-
-#~ msgid "_DNS servers:"
-#~ msgstr "_DNS 伺服器："
-
-#~ msgid "Preparing wired network connection '%s'..."
-#~ msgstr "正在準備有線網路連線「%s」…"
-
-#~ msgid "User authentication required for wired network connection '%s'..."
-#~ msgstr "有線網路連線「%s」需要使用者驗證…"
-
-#~ msgid "Requesting a wired network address for '%s'..."
-#~ msgstr "正要求有線網路「%s」提供網路位址…"
-
-#~ msgid "_Connect to Hidden Wireless Network..."
-#~ msgstr "連接到隱藏的無線網路(_C)…"
-
-#~ msgid "Create _New Wireless Network..."
-#~ msgstr "建立新的無線網路(_N)…"
-
-#~ msgid "Use the network menu to connect to a wireless network"
-#~ msgstr "使用網路選單來連線到無線網路"
-
-#~ msgid "User authentication required for wireless network '%s'..."
-#~ msgstr "無線網路「%s」要求使用者驗證…"
-
-#~ msgid ""
-#~ "Not using a Certificate Authority (CA) certificate can result in "
-#~ "connections to insecure, rogue wireless networks.  Would you like to "
-#~ "choose a Certificate Authority certificate?"
-#~ msgstr ""
-#~ "不使用憑證中心 (CA) 的憑證會造成連線不安全、流氓無線網路 (可能被竊取、劫聽"
-#~ "之意) 。是否要選擇一個憑證中心的憑證？"
-
-#~ msgid ""
-#~ "Set this to true to disable notifications when wireless networks are "
-#~ "available."
-#~ msgstr "將這設為 True，以停用有無線網路可用。"
-
-#~ msgid "Additional _DNS servers:"
-#~ msgstr "額外的 _DNS 伺服器："
-
-#~ msgid "Wireless _security:"
-#~ msgstr "無線網路安全(_W)："
diff -Nru network-manager-applet-1.8.4/shared/meson.build network-manager-applet-1.8.10/shared/meson.build
--- network-manager-applet-1.8.4/shared/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/shared/meson.build	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1,11 @@
+shared_inc = include_directories('.')
+
+shared_base_sources = files(
+  'nm-utils/nm-shared-utils.c',
+)
+
+shared_sources = shared_base_sources + files(
+  'nm-utils/nm-compat.c',
+)
+
+shared_legacy_sources = shared_base_sources
diff -Nru network-manager-applet-1.8.4/shared/nm-utils/nm-compat.c network-manager-applet-1.8.10/shared/nm-utils/nm-compat.c
--- network-manager-applet-1.8.4/shared/nm-utils/nm-compat.c	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/shared/nm-utils/nm-compat.c	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1,88 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2017 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include "nm-compat.h"
+
+/*****************************************************************************/
+
+static void
+_get_keys_cb (const char *key, const char *val, gpointer user_data)
+{
+	GPtrArray *a = user_data;
+
+	g_ptr_array_add (a, g_strdup (key));
+}
+
+static const char **
+_get_keys (NMSettingVpn *setting,
+           gboolean is_secrets,
+           guint *out_length)
+{
+	guint len;
+	const char **keys = NULL;
+	gs_unref_ptrarray GPtrArray *a = NULL;
+
+	nm_assert (NM_IS_SETTING_VPN (setting));
+
+	a = g_ptr_array_new ();
+	if (is_secrets)
+		nm_setting_vpn_foreach_secret (setting, _get_keys_cb, a);
+	else
+		nm_setting_vpn_foreach_data_item (setting, _get_keys_cb, a);
+	len = a->len;
+
+	if (a->len) {
+		g_ptr_array_sort (a, nm_strcmp_p);
+		g_ptr_array_add (a, NULL);
+		keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE);
+
+		/* we need to cache the keys *somewhere*. */
+		g_object_set_qdata_full (G_OBJECT (setting),
+		                         is_secrets
+		                         ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys")
+		                         : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"),
+		                         keys,
+		                         (GDestroyNotify) g_strfreev);
+	}
+
+	NM_SET_OUT (out_length, len);
+	return keys;
+}
+
+const char **
+_nm_setting_vpn_get_data_keys (NMSettingVpn *setting,
+                               guint *out_length)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VPN (setting), NULL);
+
+	return _get_keys (setting, FALSE, out_length);
+}
+
+const char **
+_nm_setting_vpn_get_secret_keys (NMSettingVpn *setting,
+                                 guint *out_length)
+{
+	g_return_val_if_fail (NM_IS_SETTING_VPN (setting), NULL);
+
+	return _get_keys (setting, TRUE, out_length);
+}
diff -Nru network-manager-applet-1.8.4/shared/nm-utils/nm-compat.h network-manager-applet-1.8.10/shared/nm-utils/nm-compat.h
--- network-manager-applet-1.8.4/shared/nm-utils/nm-compat.h	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/shared/nm-utils/nm-compat.h	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1,53 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2017 Red Hat, Inc.
+ */
+
+#ifndef __NM_COMPAT_H__
+#define __NM_COMPAT_H__
+
+#include "nm-setting-vpn.h"
+
+const char **_nm_setting_vpn_get_data_keys (NMSettingVpn *setting,
+                                            guint *out_length);
+
+const char **_nm_setting_vpn_get_secret_keys (NMSettingVpn *setting,
+                                              guint *out_length);
+
+#if NM_CHECK_VERSION (1, 11, 0)
+#define nm_setting_vpn_get_data_keys(setting, out_length) \
+	({ \
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
+		nm_setting_vpn_get_data_keys (setting, out_length); \
+		G_GNUC_END_IGNORE_DEPRECATIONS \
+	})
+#define nm_setting_vpn_get_secret_keys(setting, out_length) \
+	({ \
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
+		nm_setting_vpn_get_secret_keys (setting, out_length); \
+		G_GNUC_END_IGNORE_DEPRECATIONS \
+	})
+#else
+#define nm_setting_vpn_get_data_keys(setting, out_length) \
+	_nm_setting_vpn_get_data_keys (setting, out_length)
+#define nm_setting_vpn_get_secret_keys(setting, out_length) \
+	_nm_setting_vpn_get_secret_keys (setting, out_length)
+#endif
+
+#endif /* __NM_COMPAT_H__ */
diff -Nru network-manager-applet-1.8.4/shared/nm-utils/nm-glib.h network-manager-applet-1.8.10/shared/nm-utils/nm-glib.h
--- network-manager-applet-1.8.4/shared/nm-utils/nm-glib.h	2017-09-07 16:11:44.000000000 +0000
+++ network-manager-applet-1.8.10/shared/nm-utils/nm-glib.h	2017-12-19 11:44:30.000000000 +0000
@@ -452,4 +452,33 @@
 }
 #define g_variant_new_take_string _nm_g_variant_new_take_string
 
+#if !GLIB_CHECK_VERSION(2, 38, 0)
+_nm_printf (1, 2)
+static inline GVariant *
+_nm_g_variant_new_printf (const char *format_string, ...)
+{
+	char *string;
+	va_list ap;
+
+	g_return_val_if_fail (format_string, NULL);
+
+	va_start (ap, format_string);
+	string = g_strdup_vprintf (format_string, ap);
+	va_end (ap);
+
+	return g_variant_new_take_string (string);
+}
+#define g_variant_new_printf(...) _nm_g_variant_new_printf(__VA_ARGS__)
+#else
+#define g_variant_new_printf(...) \
+	({ \
+		GVariant *_v; \
+		\
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
+		_v = g_variant_new_printf (__VA_ARGS__); \
+		G_GNUC_END_IGNORE_DEPRECATIONS \
+		_v; \
+	})
+#endif
+
 #endif  /* __NM_GLIB_H__ */
diff -Nru network-manager-applet-1.8.4/shared/nm-utils/nm-macros-internal.h network-manager-applet-1.8.10/shared/nm-utils/nm-macros-internal.h
--- network-manager-applet-1.8.4/shared/nm-utils/nm-macros-internal.h	2017-09-07 16:11:44.000000000 +0000
+++ network-manager-applet-1.8.10/shared/nm-utils/nm-macros-internal.h	2017-12-19 11:44:30.000000000 +0000
@@ -26,20 +26,41 @@
 #include 
 #include 
 
-#include "nm-glib.h"
+#define _nm_packed           __attribute__ ((packed))
+#define _nm_unused           __attribute__ ((unused))
+#define _nm_pure             __attribute__ ((pure))
+#define _nm_const            __attribute__ ((const))
+#define _nm_printf(a,b)      __attribute__ ((__format__ (__printf__, a, b)))
+#define _nm_align(s)         __attribute__ ((aligned (s)))
+#define _nm_alignof(type)    __alignof (type)
+#define _nm_alignas(type)    _nm_align (_nm_alignof (type))
+
+/*****************************************************************************/
+
+#ifdef thread_local
+#define _nm_thread_local thread_local
+/*
+ * Don't break on glibc < 2.16 that doesn't define __STDC_NO_THREADS__
+ * see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53769
+ */
+#elif __STDC_VERSION__ >= 201112L && !(defined(__STDC_NO_THREADS__) || (defined(__GNU_LIBRARY__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 16))
+#define _nm_thread_local _Thread_local
+#else
+#define _nm_thread_local __thread
+#endif
 
 /*****************************************************************************/
 
-#define _nm_packed __attribute__ ((packed))
-#define _nm_unused __attribute__ ((unused))
-#define _nm_pure   __attribute__ ((pure))
-#define _nm_const  __attribute__ ((const))
-#define _nm_printf(a,b) __attribute__ ((__format__ (__printf__, a, b)))
+#include "nm-glib.h"
+
+/*****************************************************************************/
 
 #define nm_offsetofend(t,m) (G_STRUCT_OFFSET (t,m) + sizeof (((t *) NULL)->m))
 
 #define nm_auto(fcn) __attribute__ ((cleanup(fcn)))
 
+static inline int nm_close (int fd);
+
 /**
  * nm_auto_free:
  *
@@ -49,6 +70,30 @@
 GS_DEFINE_CLEANUP_FUNCTION(void*, _nm_auto_free_impl, free)
 
 static inline void
+nm_free_secret (char *secret)
+{
+	if (secret) {
+		memset (secret, 0, strlen (secret));
+		g_free (secret);
+	}
+}
+
+static inline void
+_nm_auto_free_secret_impl (char **v)
+{
+	nm_free_secret (*v);
+}
+
+/**
+ * nm_auto_free_secret:
+ *
+ * Call g_free() on a variable location when it goes out of scope.
+ * Also, previously, calls memset(loc, 0, strlen(loc)) to clear out
+ * the secret.
+ */
+#define nm_auto_free_secret nm_auto(_nm_auto_free_secret_impl)
+
+static inline void
 _nm_auto_unset_gvalue_impl (GValue *v)
 {
 	g_value_unset (v);
@@ -77,7 +122,7 @@
 	if (*pfd >= 0) {
 		int errsv = errno;
 
-		(void) close (*pfd);
+		(void) nm_close (*pfd);
 		errno = errsv;
 	}
 }
@@ -242,31 +287,137 @@
 
 /*****************************************************************************/
 
-#if (defined (__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 9 ))) || (defined (__clang__))
+#ifndef _NM_CC_SUPPORT_AUTO_TYPE
+#if (defined (__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9 )))
+#define _NM_CC_SUPPORT_AUTO_TYPE 1
+#else
+#define _NM_CC_SUPPORT_AUTO_TYPE 0
+#endif
+#endif
+
+#ifndef _NM_CC_SUPPORT_GENERIC
+#if (defined (__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9 ))) || (defined (__clang__))
 #define _NM_CC_SUPPORT_GENERIC 1
 #else
 #define _NM_CC_SUPPORT_GENERIC 0
 #endif
+#endif
+
+#if _NM_CC_SUPPORT_AUTO_TYPE
+#define _nm_auto_type __auto_type
+#endif
 
 #if _NM_CC_SUPPORT_GENERIC
-#define _NM_CONSTCAST(type, obj) \
-	(_Generic ((obj), \
-	           void *           : ((type *) (obj)), \
-	           void *const      : ((type *) (obj)), \
-	           const void *     : ((const type *) (obj)), \
-	           const void *const: ((const type *) (obj)), \
-	           const type *     : (obj), \
-	           const type *const: (obj), \
-	           type *           : (obj), \
-	           type *const      : (obj)))
+#define _NM_CONSTCAST_FULL_1(type, obj_expr, obj) \
+	(_Generic ((obj_expr), \
+	           const void        *const: ((const type *) (obj)), \
+	           const void        *     : ((const type *) (obj)), \
+	                 void        *const: ((      type *) (obj)), \
+	                 void        *     : ((      type *) (obj)), \
+	           const type        *const: ((const type *) (obj)), \
+	           const type        *     : ((const type *) (obj)), \
+	                 type        *const: ((      type *) (obj)), \
+	                 type        *     : ((      type *) (obj))))
+#define _NM_CONSTCAST_FULL_2(type, obj_expr, obj, alias_type2) \
+	(_Generic ((obj_expr), \
+	           const void        *const: ((const type *) (obj)), \
+	           const void        *     : ((const type *) (obj)), \
+	                 void        *const: ((      type *) (obj)), \
+	                 void        *     : ((      type *) (obj)), \
+	           const alias_type2 *const: ((const type *) (obj)), \
+	           const alias_type2 *     : ((const type *) (obj)), \
+	                 alias_type2 *const: ((      type *) (obj)), \
+	                 alias_type2 *     : ((      type *) (obj)), \
+	           const type        *const: ((const type *) (obj)), \
+	           const type        *     : ((const type *) (obj)), \
+	                 type        *const: ((      type *) (obj)), \
+	                 type        *     : ((      type *) (obj))))
+#define _NM_CONSTCAST_FULL_3(type, obj_expr, obj, alias_type2, alias_type3) \
+	(_Generic ((obj_expr), \
+	           const void        *const: ((const type *) (obj)), \
+	           const void        *     : ((const type *) (obj)), \
+	                 void        *const: ((      type *) (obj)), \
+	                 void        *     : ((      type *) (obj)), \
+	           const alias_type2 *const: ((const type *) (obj)), \
+	           const alias_type2 *     : ((const type *) (obj)), \
+	                 alias_type2 *const: ((      type *) (obj)), \
+	                 alias_type2 *     : ((      type *) (obj)), \
+	           const alias_type3 *const: ((const type *) (obj)), \
+	           const alias_type3 *     : ((const type *) (obj)), \
+	                 alias_type3 *const: ((      type *) (obj)), \
+	                 alias_type3 *     : ((      type *) (obj)), \
+	           const type        *const: ((const type *) (obj)), \
+	           const type        *     : ((const type *) (obj)), \
+	                 type        *const: ((      type *) (obj)), \
+	                 type        *     : ((      type *) (obj))))
+#define _NM_CONSTCAST_FULL_4(type, obj_expr, obj, alias_type2, alias_type3, alias_type4) \
+	(_Generic ((obj_expr), \
+	           const void        *const: ((const type *) (obj)), \
+	           const void        *     : ((const type *) (obj)), \
+	                 void        *const: ((      type *) (obj)), \
+	                 void        *     : ((      type *) (obj)), \
+	           const alias_type2 *const: ((const type *) (obj)), \
+	           const alias_type2 *     : ((const type *) (obj)), \
+	                 alias_type2 *const: ((      type *) (obj)), \
+	                 alias_type2 *     : ((      type *) (obj)), \
+	           const alias_type3 *const: ((const type *) (obj)), \
+	           const alias_type3 *     : ((const type *) (obj)), \
+	                 alias_type3 *const: ((      type *) (obj)), \
+	                 alias_type3 *     : ((      type *) (obj)), \
+	           const alias_type4 *const: ((const type *) (obj)), \
+	           const alias_type4 *     : ((const type *) (obj)), \
+	                 alias_type4 *const: ((      type *) (obj)), \
+	                 alias_type4 *     : ((      type *) (obj)), \
+	           const type        *const: ((const type *) (obj)), \
+	           const type        *     : ((const type *) (obj)), \
+	                 type        *const: ((      type *) (obj)), \
+	                 type        *     : ((      type *) (obj))))
+#define _NM_CONSTCAST_FULL_x(type, obj_expr, obj, n, ...)   (_NM_CONSTCAST_FULL_##n (type, obj_expr, obj,                        ##__VA_ARGS__))
+#define _NM_CONSTCAST_FULL_y(type, obj_expr, obj, n, ...)   (_NM_CONSTCAST_FULL_x   (type, obj_expr, obj, n,                     ##__VA_ARGS__))
+#define NM_CONSTCAST_FULL(   type, obj_expr, obj,    ...)   (_NM_CONSTCAST_FULL_y   (type, obj_expr, obj, NM_NARG (dummy, ##__VA_ARGS__), ##__VA_ARGS__))
 #else
-/* _NM_CONSTCAST() is there to preserve constness of a pointer.
- * It uses C11's _Generic(). If that is not supported, we fall back
- * to casting away constness. So, with _Generic, we get some additional
- * static type checking by preserving constness, without, we cast it
- * to a non-const pointer. */
-#define _NM_CONSTCAST(type, obj) \
-	((type *) (obj))
+#define NM_CONSTCAST_FULL(   type, obj_expr, obj,    ...)   ((type *) (obj))
+#endif
+
+#define NM_CONSTCAST(type, obj, ...) \
+	NM_CONSTCAST_FULL(type, (obj), (obj), ##__VA_ARGS__)
+
+#define NM_GOBJECT_CAST(type, obj, is_check, ...) \
+	({ \
+		const void *_obj = (obj); \
+		\
+		nm_assert (_obj || (is_check (_obj))); \
+		NM_CONSTCAST_FULL (type, (obj), _obj, GObject, ##__VA_ARGS__); \
+	})
+
+#define NM_GOBJECT_CAST_NON_NULL(type, obj, is_check, ...) \
+	({ \
+		const void *_obj = (obj); \
+		\
+		nm_assert (is_check (_obj)); \
+		NM_CONSTCAST_FULL (type, (obj), _obj, GObject, ##__VA_ARGS__); \
+	})
+
+#if _NM_CC_SUPPORT_GENERIC
+/* returns @value, if the type of @value matches @type.
+ * This requires support for C11 _Generic(). If no support is
+ * present, this returns @value directly.
+ *
+ * It's useful to check the let the compiler ensure that @value is
+ * of a certain type. */
+#define _NM_ENSURE_TYPE(type, value) (_Generic ((value), type: (value)))
+#else
+#define _NM_ENSURE_TYPE(type, value) (value)
+#endif
+
+#if _NM_CC_SUPPORT_GENERIC
+#define NM_PROPAGATE_CONST(test_expr, ptr) \
+	(_Generic ((test_expr), \
+	           const typeof (*(test_expr)) *: ((const typeof (*(ptr)) *) (ptr)), \
+	                                 default: (_Generic ((test_expr), \
+	                                                     typeof (*(test_expr)) *: (ptr)))))
+#else
+#define NM_PROPAGATE_CONST(test_expr, ptr) (ptr)
 #endif
 
 /*****************************************************************************/
@@ -410,21 +561,6 @@
 
 /*****************************************************************************/
 
-static inline guint
-NM_HASH_COMBINE (guint h, guint val)
-{
-	/* see g_str_hash() for reasons */
-	return (h << 5) + h + val;
-}
-
-static inline guint
-NM_HASH_COMBINE_UINT64 (guint h, guint64 val)
-{
-	return NM_HASH_COMBINE (h, (((guint) val) & 0xFFFFFFFFu) + ((guint) (val >> 32)));
-}
-
-/*****************************************************************************/
-
 /* NM_CACHED_QUARK() returns the GQuark for @string, but caches
  * it in a static variable to speed up future lookups.
  *
@@ -563,39 +699,17 @@
 
 /*****************************************************************************/
 
-/* these are implemented as a macro, because they accept self
- * as both (type*) and (const type*), and return a const
- * private pointer accordingly. */
-#define __NM_GET_PRIVATE(self, type, is_check, addrop) \
-	({ \
-		/* preserve the const-ness of self. Unfortunately, that
-		 * way, @self cannot be a void pointer */ \
-		typeof (self) _self = (self); \
-		\
-		/* Get compiler error if variable is of wrong type */ \
-		_nm_unused const type *const _self2 = (_self); \
-		\
-		nm_assert (is_check (_self)); \
-		( addrop ( _NM_CONSTCAST (type, _self)->_priv) ); \
-	})
-
-#define _NM_GET_PRIVATE(self, type, is_check)     __NM_GET_PRIVATE(self, type, is_check, &)
-#define _NM_GET_PRIVATE_PTR(self, type, is_check) __NM_GET_PRIVATE(self, type, is_check,  )
-
-#define __NM_GET_PRIVATE_VOID(self, type, is_check, result_cmd) \
+#define _NM_GET_PRIVATE(self, type, is_check, ...) (&(NM_GOBJECT_CAST_NON_NULL (type, (self), is_check, ##__VA_ARGS__)->_priv))
+#if _NM_CC_SUPPORT_AUTO_TYPE
+#define _NM_GET_PRIVATE_PTR(self, type, is_check, ...) \
 	({ \
-		/* (self) can be any non-const pointer. It will be cast to "type *".
-		 * We don't explicitly cast but assign first to (void *) which
-		 * will fail if @self is pointing to const. */ \
-		void *const _self1 = (self); \
-		type *const _self = _self1; \
+		_nm_auto_type _self = NM_GOBJECT_CAST_NON_NULL (type, (self), is_check, ##__VA_ARGS__); \
 		\
-		nm_assert (is_check (_self)); \
-		( result_cmd ); \
+		NM_PROPAGATE_CONST (_self, _self->_priv); \
 	})
-
-#define _NM_GET_PRIVATE_VOID(self, type, is_check)     __NM_GET_PRIVATE_VOID(self, type, is_check, &_self->_priv)
-#define _NM_GET_PRIVATE_PTR_VOID(self, type, is_check) __NM_GET_PRIVATE_VOID(self, type, is_check,  _self->_priv)
+#else
+#define _NM_GET_PRIVATE_PTR(self, type, is_check, ...) (NM_GOBJECT_CAST_NON_NULL (type, (self), is_check, ##__VA_ARGS__)->_priv)
+#endif
 
 /*****************************************************************************/
 
@@ -619,6 +733,36 @@
 		g_object_unref (obj);
 }
 
+/* Assigns GObject @obj to destination @pdst, and takes an additional ref.
+ * The previous value of @pdst is unrefed.
+ *
+ * It makes sure to first increase the ref-count of @obj, and handles %NULL
+ * @obj correctly.
+ * */
+#define nm_g_object_ref_set(pp, obj) \
+	({ \
+		typeof (*(pp)) *const _pp = (pp); \
+		typeof (**_pp) *const _obj = (obj); \
+		typeof (**_pp) *_p; \
+		gboolean _changed = FALSE; \
+		\
+		if (   _pp \
+		    && ((_p = *_pp) != _obj)) { \
+			if (_obj) { \
+				nm_assert (G_IS_OBJECT (_obj)); \
+				 g_object_ref (_obj); \
+			} \
+			if (_p) { \
+				nm_assert (G_IS_OBJECT (_p)); \
+				*_pp = NULL; \
+				g_object_unref (_p); \
+			} \
+			*_pp = _obj; \
+			_changed = TRUE; \
+		} \
+		_changed; \
+	})
+
 /* basically, replaces
  *   g_clear_pointer (&location, g_free)
  * with
@@ -631,13 +775,32 @@
 #define nm_clear_g_free(pp) \
 	({  \
 		typeof (*(pp)) *_pp = (pp); \
-		typeof (**_pp) *_p = *_pp; \
+		typeof (**_pp) *_p; \
+		gboolean _changed = FALSE; \
 		\
-		if (_p) { \
+		if (  _pp \
+		    && (_p = *_pp)) { \
 			*_pp = NULL; \
 			g_free (_p); \
+			_changed = TRUE; \
+		} \
+		_changed; \
+	})
+
+#define nm_clear_g_object(pp) \
+	({ \
+		typeof (*(pp)) *_pp = (pp); \
+		typeof (**_pp) *_p; \
+		gboolean _changed = FALSE; \
+		\
+		if (   _pp \
+		    && (_p = *_pp)) { \
+			nm_assert (G_IS_OBJECT (_p)); \
+			*_pp = NULL; \
+			g_object_unref (_p); \
+			_changed = TRUE; \
 		} \
-		!!_p; \
+		_changed; \
 	})
 
 static inline gboolean
@@ -809,6 +972,33 @@
 	return str ? g_strstrip (str) : NULL;
 }
 
+static inline const char *
+nm_strstrip_avoid_copy (const char *str, char **str_free)
+{
+	gsize l;
+	char *s;
+
+	nm_assert (str_free && !*str_free);
+
+	if (!str)
+		return NULL;
+
+	str = nm_str_skip_leading_spaces (str);
+	l = strlen (str);
+	if (   l == 0
+	    || !g_ascii_isspace (str[l - 1]))
+		return str;
+	while (   l > 0
+	       && g_ascii_isspace (str[l - 1]))
+		l--;
+
+	s = g_new (char, l + 1);
+	memcpy (s, str, l);
+	s[l] = '\0';
+	*str_free = s;
+	return s;
+}
+
 /* g_ptr_array_sort()'s compare function takes pointers to the
  * value. Thus, you cannot use strcmp directly. You can use
  * nm_strcmp_p().
@@ -982,6 +1172,28 @@
 		_buf; \
 	})
 
+/* aims to alloca() a buffer and fill it with printf(format, name).
+ * Note that format must not contain any format specifier except
+ * "%s".
+ * If the resulting string would be too large for stack allocation,
+ * it allocates a buffer with g_malloc() and assigns it to *p_val_to_free. */
+#define nm_construct_name_a(format, name, p_val_to_free) \
+	({ \
+		const char *const _name = (name); \
+		char **const _p_val_to_free = (p_val_to_free); \
+		const gsize _name_len = strlen (_name); \
+		char *_buf2; \
+		\
+		nm_assert (_p_val_to_free && !*_p_val_to_free); \
+		if (NM_STRLEN (format) + _name_len < 200) \
+			_buf2 = nm_sprintf_bufa (NM_STRLEN (format) + _name_len, format, _name); \
+		else { \
+			_buf2 = g_strdup_printf (format, _name); \
+			*_p_val_to_free = _buf2; \
+		} \
+		(const char *) _buf2; \
+	})
+
 /*****************************************************************************/
 
 /**
@@ -1057,4 +1269,34 @@
 
 /*****************************************************************************/
 
+static inline int
+nm_steal_fd (int *p_fd)
+{
+	int fd;
+
+	if (   p_fd
+	    && ((fd = *p_fd) >= 0)) {
+		*p_fd = -1;
+		return fd;
+	}
+	return -1;
+}
+
+/**
+ * nm_close:
+ *
+ * Like close() but throws an assertion if the input fd is
+ * invalid.  Closing an invalid fd is a programming error, so
+ * it's better to catch it early.
+ */
+static inline int
+nm_close (int fd)
+{
+	int r;
+
+	r = close (fd);
+	nm_assert (r != -1 || fd < 0 || errno != EBADF);
+	return r;
+}
+
 #endif /* __NM_MACROS_INTERNAL_H__ */
diff -Nru network-manager-applet-1.8.4/shared/nm-utils/nm-shared-utils.c network-manager-applet-1.8.10/shared/nm-utils/nm-shared-utils.c
--- network-manager-applet-1.8.4/shared/nm-utils/nm-shared-utils.c	2017-09-07 16:11:44.000000000 +0000
+++ network-manager-applet-1.8.10/shared/nm-utils/nm-shared-utils.c	2017-12-19 11:44:30.000000000 +0000
@@ -25,6 +25,8 @@
 
 #include 
 #include 
+#include 
+#include 
 
 /*****************************************************************************/
 
@@ -32,6 +34,10 @@
 
 /*****************************************************************************/
 
+const NMIPAddr nm_ip_addr_zero = { 0 };
+
+/*****************************************************************************/
+
 void
 nm_utils_strbuf_append_c (char **buf, gsize *len, char c)
 {
@@ -112,6 +118,162 @@
 /*****************************************************************************/
 
 /**
+ * nm_strquote:
+ * @buf: the output buffer of where to write the quoted @str argument.
+ * @buf_len: the size of @buf.
+ * @str: (allow-none): the string to quote.
+ *
+ * Writes @str to @buf with quoting. The resulting buffer
+ * is always NUL terminated, unless @buf_len is zero.
+ * If @str is %NULL, it writes "(null)".
+ *
+ * If @str needs to be truncated, the closing quote is '^' instead
+ * of '"'.
+ *
+ * This is similar to nm_strquote_a(), which however uses alloca()
+ * to allocate a new buffer. Also, here @buf_len is the size of @buf,
+ * while nm_strquote_a() has the number of characters to print. The latter
+ * doesn't include the quoting.
+ *
+ * Returns: the input buffer with the quoted string.
+ */
+const char *
+nm_strquote (char *buf, gsize buf_len, const char *str)
+{
+	const char *const buf0 = buf;
+
+	if (!str) {
+		nm_utils_strbuf_append_str (&buf, &buf_len, "(null)");
+		goto out;
+	}
+
+	if (G_UNLIKELY (buf_len <= 2)) {
+		switch (buf_len) {
+		case 2:
+			*(buf++) = '^';
+			/* fall-through */
+		case 1:
+			*(buf++) = '\0';
+			break;
+		}
+		goto out;
+	}
+
+	*(buf++) = '"';
+	buf_len--;
+
+	nm_utils_strbuf_append_str (&buf, &buf_len, str);
+
+	/* if the string was too long we indicate truncation with a
+	 * '^' instead of a closing quote. */
+	if (G_UNLIKELY (buf_len <= 1)) {
+		switch (buf_len) {
+		case 1:
+			buf[-1] = '^';
+			break;
+		case 0:
+			buf[-2] = '^';
+			break;
+		default:
+			nm_assert_not_reached ();
+			break;
+		}
+	} else {
+		nm_assert (buf_len >= 2);
+		*(buf++) = '"';
+		*(buf++) = '\0';
+	}
+
+out:
+	return buf0;
+}
+
+/*****************************************************************************/
+
+char _nm_utils_to_string_buffer[];
+
+void
+nm_utils_to_string_buffer_init (char **buf, gsize *len)
+{
+	if (!*buf) {
+		*buf = _nm_utils_to_string_buffer;
+		*len = sizeof (_nm_utils_to_string_buffer);
+	}
+}
+
+gboolean
+nm_utils_to_string_buffer_init_null (gconstpointer obj, char **buf, gsize *len)
+{
+	nm_utils_to_string_buffer_init (buf, len);
+	if (!obj) {
+		g_strlcpy (*buf, "(null)", *len);
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/*****************************************************************************/
+
+const char *
+nm_utils_flags2str (const NMUtilsFlags2StrDesc *descs,
+                    gsize n_descs,
+                    unsigned flags,
+                    char *buf,
+                    gsize len)
+{
+	gsize i;
+	char *p;
+
+#if NM_MORE_ASSERTS > 10
+	nm_assert (descs);
+	nm_assert (n_descs > 0);
+	for (i = 0; i < n_descs; i++) {
+		gsize j;
+
+		nm_assert (descs[i].name && descs[i].name[0]);
+		for (j = 0; j < i; j++)
+			nm_assert (descs[j].flag != descs[i].flag);
+	}
+#endif
+
+	nm_utils_to_string_buffer_init (&buf, &len);
+
+	if (!len)
+		return buf;
+
+	buf[0] = '\0';
+	p = buf;
+	if (!flags) {
+		for (i = 0; i < n_descs; i++) {
+			if (!descs[i].flag) {
+				nm_utils_strbuf_append_str (&p, &len, descs[i].name);
+				break;
+			}
+		}
+		return buf;
+	}
+
+	for (i = 0; flags && i < n_descs; i++) {
+		if (   descs[i].flag
+		    && NM_FLAGS_ALL (flags, descs[i].flag)) {
+			flags &= ~descs[i].flag;
+
+			if (buf[0] != '\0')
+				nm_utils_strbuf_append_c (&p, &len, ',');
+			nm_utils_strbuf_append_str (&p, &len, descs[i].name);
+		}
+	}
+	if (flags) {
+		if (buf[0] != '\0')
+			nm_utils_strbuf_append_c (&p, &len, ',');
+		nm_utils_strbuf_append (&p, &len, "0x%x", flags);
+	}
+	return buf;
+};
+
+/*****************************************************************************/
+
+/**
  * _nm_utils_ip4_prefix_to_netmask:
  * @prefix: a CIDR prefix
  *
@@ -170,52 +332,79 @@
 /*****************************************************************************/
 
 gboolean
-nm_utils_parse_inaddr (const char *text,
-                       int family,
-                       char **out_addr)
+nm_utils_parse_inaddr_bin (int addr_family,
+                           const char *text,
+                           gpointer out_addr)
 {
-	union {
-		in_addr_t v4;
-		struct in6_addr v6;
-	} addrbin;
-	char addrstr_buf[MAX (INET_ADDRSTRLEN, INET6_ADDRSTRLEN)];
+	NMIPAddr addrbin;
 
 	g_return_val_if_fail (text, FALSE);
 
-	if (family == AF_UNSPEC)
-		family = strchr (text, ':') ? AF_INET6 : AF_INET;
+	if (addr_family == AF_UNSPEC)
+		addr_family = strchr (text, ':') ? AF_INET6 : AF_INET;
 	else
-		g_return_val_if_fail (NM_IN_SET (family, AF_INET, AF_INET6), FALSE);
+		g_return_val_if_fail (NM_IN_SET (addr_family, AF_INET, AF_INET6), FALSE);
 
-	if (inet_pton (family, text, &addrbin) != 1)
+	/* use a temporary variable @addrbin, to guarantee that @out_addr
+	 * is only modified on success. */
+	if (inet_pton (addr_family, text, &addrbin) != 1)
 		return FALSE;
 
-	NM_SET_OUT (out_addr, g_strdup (inet_ntop (family, &addrbin, addrstr_buf, sizeof (addrstr_buf))));
+	if (out_addr) {
+		switch (addr_family) {
+		case AF_INET:
+			*((in_addr_t *) out_addr) = addrbin.addr4;
+			break;
+		case AF_INET6:
+			*((struct in6_addr *) out_addr) = addrbin.addr6;
+			break;
+		default:
+			nm_assert_not_reached ();
+		}
+	}
 	return TRUE;
 }
 
 gboolean
-nm_utils_parse_inaddr_prefix (const char *text,
-                              int family,
-                              char **out_addr,
-                              int *out_prefix)
+nm_utils_parse_inaddr (int addr_family,
+                       const char *text,
+                       char **out_addr)
+{
+	NMIPAddr addrbin;
+	char addrstr_buf[MAX (INET_ADDRSTRLEN, INET6_ADDRSTRLEN)];
+
+	nm_assert (!out_addr || !*out_addr);
+
+	if (!nm_utils_parse_inaddr_bin (addr_family, text, &addrbin))
+		return FALSE;
+	NM_SET_OUT (out_addr, g_strdup (inet_ntop (addr_family, &addrbin, addrstr_buf, sizeof (addrstr_buf))));
+	return TRUE;
+}
+
+gboolean
+nm_utils_parse_inaddr_prefix_bin (int addr_family,
+                                  const char *text,
+                                  gpointer out_addr,
+                                  int *out_prefix)
 {
 	gs_free char *addrstr_free = NULL;
 	int prefix = -1;
 	const char *slash;
 	const char *addrstr;
-	union {
-		in_addr_t v4;
-		struct in6_addr v6;
-	} addrbin;
-	char addrstr_buf[MAX (INET_ADDRSTRLEN, INET6_ADDRSTRLEN)];
+	NMIPAddr addrbin;
+	int addr_len;
 
 	g_return_val_if_fail (text, FALSE);
 
-	if (family == AF_UNSPEC)
-		family = strchr (text, ':') ? AF_INET6 : AF_INET;
+	if (addr_family == AF_UNSPEC)
+		addr_family = strchr (text, ':') ? AF_INET6 : AF_INET;
+
+	if (addr_family == AF_INET)
+		addr_len = sizeof (in_addr_t);
+	else if (addr_family == AF_INET6)
+		addr_len = sizeof (struct in6_addr);
 	else
-		g_return_val_if_fail (NM_IN_SET (family, AF_INET, AF_INET6), FALSE);
+		g_return_val_if_reached (FALSE);
 
 	slash = strchr (text, '/');
 	if (slash)
@@ -223,23 +412,39 @@
 	else
 		addrstr = text;
 
-	if (inet_pton (family, addrstr, &addrbin) != 1)
+	if (inet_pton (addr_family, addrstr, &addrbin) != 1)
 		return FALSE;
 
 	if (slash) {
 		prefix = _nm_utils_ascii_str_to_int64 (slash + 1, 10,
 		                                       0,
-		                                       family == AF_INET ? 32 : 128,
+		                                       addr_family == AF_INET ? 32 : 128,
 		                                       -1);
 		if (prefix == -1)
 			return FALSE;
 	}
 
-	NM_SET_OUT (out_addr, g_strdup (inet_ntop (family, &addrbin, addrstr_buf, sizeof (addrstr_buf))));
+	if (out_addr)
+		memcpy (out_addr, &addrbin, addr_len);
 	NM_SET_OUT (out_prefix, prefix);
 	return TRUE;
 }
 
+gboolean
+nm_utils_parse_inaddr_prefix (int addr_family,
+                              const char *text,
+                              char **out_addr,
+                              int *out_prefix)
+{
+	NMIPAddr addrbin;
+	char addrstr_buf[MAX (INET_ADDRSTRLEN, INET6_ADDRSTRLEN)];
+
+	if (!nm_utils_parse_inaddr_prefix_bin (addr_family, text, &addrbin, out_prefix))
+		return FALSE;
+	NM_SET_OUT (out_addr, g_strdup (inet_ntop (addr_family, &addrbin, addrstr_buf, sizeof (addrstr_buf))));
+	return TRUE;
+}
+
 /*****************************************************************************/
 
 /* _nm_utils_ascii_str_to_int64:
@@ -295,6 +500,118 @@
 /*****************************************************************************/
 
 /**
+ * nm_utils_strsplit_set:
+ * @str: the string to split.
+ * @delimiters: the set of delimiters. If %NULL, defaults to " \t\n",
+ *   like bash's $IFS.
+ *
+ * This is a replacement for g_strsplit_set() which avoids copying
+ * each word once (the entire strv array), but instead copies it once
+ * and all words point into that internal copy.
+ *
+ * Another difference from g_strsplit_set() is that this never returns
+ * empty words. Multiple delimiters are combined and treated as one.
+ *
+ * Returns: %NULL if @str is %NULL or contains only delimiters.
+ *   Otherwise, a %NULL terminated strv array containing non-empty
+ *   words, split at the delimiter characters (delimiter characters
+ *   are removed).
+ *   The strings to which the result strv array points to are allocated
+ *   after the returned result itself. Don't free the strings themself,
+ *   but free everything with g_free().
+ */
+const char **
+nm_utils_strsplit_set (const char *str, const char *delimiters)
+{
+	const char **ptr, **ptr0;
+	gsize alloc_size, plen, i;
+	gsize str_len;
+	char *s0;
+	char *s;
+	guint8 delimiters_table[256];
+
+	if (!str)
+		return NULL;
+
+	/* initialize lookup table for delimiter */
+	if (!delimiters)
+		delimiters = " \t\n";
+	memset (delimiters_table, 0, sizeof (delimiters_table));
+	for (i = 0; delimiters[i]; i++)
+		delimiters_table[(guint8) delimiters[i]] = 1;
+
+#define _is_delimiter(ch, delimiters_table) \
+	((delimiters_table)[(guint8) (ch)] != 0)
+
+	/* skip initial delimiters, and return of the remaining string is
+	 * empty. */
+	while (_is_delimiter (str[0], delimiters_table))
+		str++;
+	if (!str[0])
+		return NULL;
+
+	str_len = strlen (str) + 1;
+	alloc_size = 8;
+
+	/* we allocate the buffer larger, so to copy @str at the
+	 * end of it as @s0. */
+	ptr0 = g_malloc ((sizeof (const char *) * (alloc_size + 1)) + str_len);
+	s0 = (char *) &ptr0[alloc_size + 1];
+	memcpy (s0, str, str_len);
+
+	plen = 0;
+	s = s0;
+	ptr = ptr0;
+
+	while (TRUE) {
+		if (plen >= alloc_size) {
+			const char **ptr_old = ptr;
+
+			/* reallocate the buffer. Note that for now the string
+			 * continues to be in ptr0/s0. We fix that at the end. */
+			alloc_size += 2;
+			ptr = g_malloc ((sizeof (const char *) * (alloc_size + 1)) + str_len);
+			memcpy (ptr, ptr_old, sizeof (const char *) * plen);
+			if (ptr_old != ptr0)
+				g_free (ptr_old);
+		}
+
+		ptr[plen++] = s;
+
+		nm_assert (s[0] && !_is_delimiter (s[0], delimiters_table));
+
+		while (TRUE) {
+			s++;
+			if (_is_delimiter (s[0], delimiters_table))
+				break;
+			if (s[0] == '\0')
+				goto done;
+		}
+
+		s[0] = '\0';
+		s++;
+		while (_is_delimiter (s[0], delimiters_table))
+			s++;
+		if (s[0] == '\0')
+			break;
+	}
+done:
+	ptr[plen] = NULL;
+
+	if (ptr != ptr0) {
+		/* we reallocated the buffer. We must copy over the
+		 * string @s0 and adjust the pointers. */
+		s = (char *) &ptr[alloc_size + 1];
+		memcpy (s, s0, str_len);
+		for (i = 0; i < plen; i++)
+			ptr[i] = &s[ptr[i] - s0];
+		g_free (ptr0);
+	}
+
+	return ptr;
+}
+
+/**
  * nm_utils_strv_find_first:
  * @list: the strv list to search
  * @len: the length of the list, or a negative value if @list is %NULL terminated.
@@ -677,3 +994,98 @@
 	}
 	return str;
 }
+
+/*****************************************************************************/
+
+/* taken from systemd's fd_wait_for_event(). Note that the timeout
+ * is here in nano-seconds, not micro-seconds. */
+int
+nm_utils_fd_wait_for_event (int fd, int event, gint64 timeout_ns)
+{
+	struct pollfd pollfd = {
+		.fd = fd,
+		.events = event,
+	};
+	struct timespec ts, *pts;
+	int r;
+
+	if (timeout_ns < 0)
+		pts = NULL;
+	else {
+		ts.tv_sec = (time_t) (timeout_ns / NM_UTILS_NS_PER_SECOND);
+		ts.tv_nsec = (long int) (timeout_ns % NM_UTILS_NS_PER_SECOND);
+		pts = &ts;
+	}
+
+	r = ppoll (&pollfd, 1, pts, NULL);
+	if (r < 0)
+		return -errno;
+	if (r == 0)
+		return 0;
+	return pollfd.revents;
+}
+
+/* taken from systemd's loop_read() */
+ssize_t
+nm_utils_fd_read_loop (int fd, void *buf, size_t nbytes, bool do_poll)
+{
+	uint8_t *p = buf;
+	ssize_t n = 0;
+
+	g_return_val_if_fail (fd >= 0, -EINVAL);
+	g_return_val_if_fail (buf, -EINVAL);
+
+	/* If called with nbytes == 0, let's call read() at least
+	 * once, to validate the operation */
+
+	if (nbytes > (size_t) SSIZE_MAX)
+		return -EINVAL;
+
+	do {
+		ssize_t k;
+
+		k = read (fd, p, nbytes);
+		if (k < 0) {
+			if (errno == EINTR)
+				continue;
+
+			if (errno == EAGAIN && do_poll) {
+
+				/* We knowingly ignore any return value here,
+				 * and expect that any error/EOF is reported
+				 * via read() */
+
+				(void) nm_utils_fd_wait_for_event (fd, POLLIN, -1);
+				continue;
+			}
+
+			return n > 0 ? n : -errno;
+		}
+
+		if (k == 0)
+			return n;
+
+		g_assert ((size_t) k <= nbytes);
+
+		p += k;
+		nbytes -= k;
+		n += k;
+	} while (nbytes > 0);
+
+	return n;
+}
+
+/* taken from systemd's loop_read_exact() */
+int
+nm_utils_fd_read_loop_exact (int fd, void *buf, size_t nbytes, bool do_poll)
+{
+	ssize_t n;
+
+	n = nm_utils_fd_read_loop (fd, buf, nbytes, do_poll);
+	if (n < 0)
+		return (int) n;
+	if ((size_t) n != nbytes)
+		return -EIO;
+
+	return 0;
+}
diff -Nru network-manager-applet-1.8.4/shared/nm-utils/nm-shared-utils.h network-manager-applet-1.8.10/shared/nm-utils/nm-shared-utils.h
--- network-manager-applet-1.8.4/shared/nm-utils/nm-shared-utils.h	2017-09-07 16:11:44.000000000 +0000
+++ network-manager-applet-1.8.10/shared/nm-utils/nm-shared-utils.h	2017-12-19 11:44:30.000000000 +0000
@@ -22,6 +22,63 @@
 #ifndef __NM_SHARED_UTILS_H__
 #define __NM_SHARED_UTILS_H__
 
+#include 
+
+/*****************************************************************************/
+
+static inline char
+nm_utils_addr_family_to_char (int addr_family)
+{
+	switch (addr_family) {
+	case AF_INET:  return '4';
+	case AF_INET6: return '6';
+	}
+	g_return_val_if_reached ('?');
+}
+
+static inline gsize
+nm_utils_addr_family_to_size (int addr_family)
+{
+	switch (addr_family) {
+	case AF_INET:  return sizeof (in_addr_t);
+	case AF_INET6: return sizeof (struct in6_addr);
+	}
+	g_return_val_if_reached (0);
+}
+
+#define nm_assert_addr_family(addr_family) \
+	nm_assert (NM_IN_SET ((addr_family), AF_INET, AF_INET6))
+
+/*****************************************************************************/
+
+typedef struct {
+	union {
+		guint8 addr_ptr[1];
+		in_addr_t addr4;
+		struct in6_addr addr6;
+
+		/* NMIPAddr is really a union for IP addresses.
+		 * However, as ethernet addresses fit in here nicely, use
+		 * it also for an ethernet MAC address. */
+		guint8 addr_eth[6 /*ETH_ALEN*/];
+	};
+} NMIPAddr;
+
+extern const NMIPAddr nm_ip_addr_zero;
+
+static inline void
+nm_ip_addr_set (int addr_family, gpointer dst, const NMIPAddr *src)
+{
+	nm_assert_addr_family (addr_family);
+	nm_assert (dst);
+	nm_assert (src);
+
+	if (addr_family != AF_INET6)
+		*((in_addr_t *) dst) = src->addr4;
+	else
+		*((struct in6_addr *) dst) = src->addr6;
+}
+
 /*****************************************************************************/
 
 #define NM_CMP_RETURN(c) \
@@ -132,8 +189,12 @@
 void nm_utils_strbuf_append_c (char **buf, gsize *len, char c);
 void nm_utils_strbuf_append_str (char **buf, gsize *len, const char *str);
 
+const char *nm_strquote (char *buf, gsize buf_len, const char *str);
+
 /*****************************************************************************/
 
+const char **nm_utils_strsplit_set (const char *str, const char *delimiters);
+
 gssize nm_utils_strv_find_first (char **list, gssize len, const char *needle);
 
 char **_nm_utils_strv_cleanup (char **strv,
@@ -151,12 +212,21 @@
 
 /*****************************************************************************/
 
-gboolean nm_utils_parse_inaddr (const char *text,
-                                int family,
+gboolean nm_utils_parse_inaddr_bin  (int addr_family,
+                                     const char *text,
+                                     gpointer out_addr);
+
+gboolean nm_utils_parse_inaddr (int addr_family,
+                                const char *text,
                                 char **out_addr);
 
-gboolean nm_utils_parse_inaddr_prefix (const char *text,
-                                       int family,
+gboolean nm_utils_parse_inaddr_prefix_bin (int addr_family,
+                                           const char *text,
+                                           gpointer out_addr,
+                                           int *out_prefix);
+
+gboolean nm_utils_parse_inaddr_prefix (int addr_family,
+                                       const char *text,
                                        char **out_addr,
                                        int *out_prefix);
 
@@ -167,6 +237,74 @@
 
 /*****************************************************************************/
 
+extern char _nm_utils_to_string_buffer[2096];
+
+void     nm_utils_to_string_buffer_init (char **buf, gsize *len);
+gboolean nm_utils_to_string_buffer_init_null (gconstpointer obj, char **buf, gsize *len);
+
+/*****************************************************************************/
+
+typedef struct {
+	unsigned flag;
+	const char *name;
+} NMUtilsFlags2StrDesc;
+
+#define NM_UTILS_FLAGS2STR(f, n) { .flag = f, .name = ""n, }
+
+#define _NM_UTILS_FLAGS2STR_DEFINE(scope, fcn_name, flags_type, ...) \
+scope const char * \
+fcn_name (flags_type flags, char *buf, gsize len) \
+{ \
+	static const NMUtilsFlags2StrDesc descs[] = { \
+		__VA_ARGS__ \
+	}; \
+	G_STATIC_ASSERT (sizeof (flags_type) <= sizeof (unsigned)); \
+	return nm_utils_flags2str (descs, G_N_ELEMENTS (descs), flags, buf, len); \
+};
+
+#define NM_UTILS_FLAGS2STR_DEFINE(fcn_name, flags_type, ...) \
+	_NM_UTILS_FLAGS2STR_DEFINE (, fcn_name, flags_type, __VA_ARGS__)
+#define NM_UTILS_FLAGS2STR_DEFINE_STATIC(fcn_name, flags_type, ...) \
+	_NM_UTILS_FLAGS2STR_DEFINE (static, fcn_name, flags_type, __VA_ARGS__)
+
+const char *nm_utils_flags2str (const NMUtilsFlags2StrDesc *descs,
+                                gsize n_descs,
+                                unsigned flags,
+                                char *buf,
+                                gsize len);
+
+/*****************************************************************************/
+
+#define NM_UTILS_ENUM2STR(v, n)     (void) 0; case v: s = ""n""; break; (void) 0
+#define NM_UTILS_ENUM2STR_IGNORE(v) (void) 0; case v: break; (void) 0
+
+#define _NM_UTILS_ENUM2STR_DEFINE(scope, fcn_name, lookup_type, int_fmt, ...) \
+scope const char * \
+fcn_name (lookup_type val, char *buf, gsize len) \
+{ \
+	nm_utils_to_string_buffer_init (&buf, &len); \
+	if (len) { \
+		const char *s = NULL; \
+		switch (val) { \
+			(void) 0, \
+			__VA_ARGS__ \
+			(void) 0; \
+		}; \
+		if (s) \
+			g_strlcpy (buf, s, len); \
+		else \
+			g_snprintf (buf, len, "(%"int_fmt")", val); \
+	} \
+	return buf; \
+}
+
+#define NM_UTILS_ENUM2STR_DEFINE(fcn_name, lookup_type, ...) \
+	_NM_UTILS_ENUM2STR_DEFINE (, fcn_name, lookup_type, "d", __VA_ARGS__)
+#define NM_UTILS_ENUM2STR_DEFINE_STATIC(fcn_name, lookup_type, ...) \
+	_NM_UTILS_ENUM2STR_DEFINE (static, fcn_name, lookup_type, "d", __VA_ARGS__)
+
+/*****************************************************************************/
+
 #define _nm_g_slice_free_fcn_define(mem_size) \
 static inline void \
 _nm_g_slice_free_fcn_##mem_size (gpointer mem_block) \
@@ -178,6 +316,7 @@
 _nm_g_slice_free_fcn_define (2)
 _nm_g_slice_free_fcn_define (4)
 _nm_g_slice_free_fcn_define (8)
+_nm_g_slice_free_fcn_define (12)
 _nm_g_slice_free_fcn_define (16)
 
 #define _nm_g_slice_free_fcn1(mem_size) \
@@ -192,6 +331,7 @@
 		case  2: _fcn = _nm_g_slice_free_fcn_2;  break; \
 		case  4: _fcn = _nm_g_slice_free_fcn_4;  break; \
 		case  8: _fcn = _nm_g_slice_free_fcn_8;  break; \
+		case 12: _fcn = _nm_g_slice_free_fcn_12;  break; \
 		case 16: _fcn = _nm_g_slice_free_fcn_16; break; \
 		default: g_assert_not_reached (); _fcn = NULL; break; \
 		} \
@@ -267,4 +407,36 @@
 
 /*****************************************************************************/
 
+typedef struct {
+	const char *name;
+} NMUtilsNamedEntry;
+
+typedef struct {
+	union {
+		NMUtilsNamedEntry named_entry;
+		const char *name;
+	};
+	union {
+		const char *value_str;
+		gconstpointer value_ptr;
+	};
+} NMUtilsNamedValue;
+
+#define nm_utils_named_entry_cmp           nm_strcmp_p
+#define nm_utils_named_entry_cmp_with_data nm_strcmp_p_with_data
+
+/*****************************************************************************/
+
+#define NM_UTILS_NS_PER_SECOND  ((gint64) 1000000000)
+#define NM_UTILS_NS_PER_MSEC    ((gint64) 1000000)
+#define NM_UTILS_NS_TO_MSEC_CEIL(nsec)      (((nsec) + (NM_UTILS_NS_PER_MSEC - 1)) / NM_UTILS_NS_PER_MSEC)
+
+/*****************************************************************************/
+
+int nm_utils_fd_wait_for_event (int fd, int event, gint64 timeout_ns);
+ssize_t nm_utils_fd_read_loop (int fd, void *buf, size_t nbytes, bool do_poll);
+int nm_utils_fd_read_loop_exact (int fd, void *buf, size_t nbytes, bool do_poll);
+
+/*****************************************************************************/
+
 #endif /* __NM_SHARED_UTILS_H__ */
diff -Nru network-manager-applet-1.8.4/shared/nm-utils/nm-test-utils.h network-manager-applet-1.8.10/shared/nm-utils/nm-test-utils.h
--- network-manager-applet-1.8.4/shared/nm-utils/nm-test-utils.h	2017-09-07 16:11:44.000000000 +0000
+++ network-manager-applet-1.8.10/shared/nm-utils/nm-test-utils.h	2017-12-19 11:44:30.000000000 +0000
@@ -1697,6 +1697,62 @@
 	g_assert (success);
 }
 
+#if defined(__NM_SIMPLE_CONNECTION_H__) && NM_CHECK_VERSION (1, 10, 0) && (!defined (NM_VERSION_MAX_ALLOWED) || NM_VERSION_MAX_ALLOWED >= NM_VERSION_1_10)
+static inline void
+_nmtst_assert_connection_has_settings (NMConnection *connection, gboolean has_at_least, gboolean has_at_most, ...)
+{
+	gs_unref_hashtable GHashTable *names = NULL;
+	gs_free NMSetting **settings = NULL;
+	va_list ap;
+	const char *name;
+	guint i, len;
+	gs_unref_ptrarray GPtrArray *names_arr = NULL;
+
+	g_assert (NM_IS_CONNECTION (connection));
+
+	names = g_hash_table_new (g_str_hash, g_str_equal);
+	names_arr = g_ptr_array_new ();
+
+	va_start (ap, has_at_most);
+	while ((name = va_arg (ap, const char *))) {
+		if (!nm_g_hash_table_add (names, (gpointer) name))
+			g_assert_not_reached ();
+		g_ptr_array_add (names_arr, (gpointer) name);
+	}
+	va_end (ap);
+
+	g_ptr_array_add (names_arr, NULL);
+
+	settings = nm_connection_get_settings (connection, &len);
+	for (i = 0; i < len; i++) {
+		if (   !g_hash_table_remove (names, nm_setting_get_name (settings[i]))
+		    && has_at_most) {
+			g_error ("nmtst_assert_connection_has_settings(): has setting \"%s\" which is not expected",
+			         nm_setting_get_name (settings[i]));
+		}
+	}
+	if (   g_hash_table_size (names) > 0
+	    && has_at_least) {
+		gs_free char *expected_str = g_strjoinv (" ", (char **) names_arr->pdata);
+		gs_free const char **settings_names = NULL;
+		gs_free char *has_str = NULL;
+
+		settings_names = g_new0 (const char *, len + 1);
+		for (i = 0; i < len; i++)
+			settings_names[i] = nm_setting_get_name (settings[i]);
+		has_str = g_strjoinv (" ", (char **) settings_names);
+
+		g_error ("nmtst_assert_connection_has_settings(): the setting lacks %u expected settings (expected: [%s] vs. has: [%s])",
+		         g_hash_table_size (names),
+		         expected_str,
+		         has_str);
+	}
+}
+#define nmtst_assert_connection_has_settings(connection, ...)          _nmtst_assert_connection_has_settings ((connection), TRUE,  TRUE,  __VA_ARGS__, NULL)
+#define nmtst_assert_connection_has_settings_at_least(connection, ...) _nmtst_assert_connection_has_settings ((connection), TRUE,  FALSE, __VA_ARGS__, NULL)
+#define nmtst_assert_connection_has_settings_at_most(connection, ...)  _nmtst_assert_connection_has_settings ((connection), FALSE, TRUE,  __VA_ARGS__, NULL)
+#endif
+
 static inline void
 nmtst_assert_setting_verify_fails (NMSetting *setting,
                                    GQuark expect_error_domain,
diff -Nru network-manager-applet-1.8.4/src/applet-vpn-request.c network-manager-applet-1.8.10/src/applet-vpn-request.c
--- network-manager-applet-1.8.4/src/applet-vpn-request.c	2017-01-12 11:47:27.000000000 +0000
+++ network-manager-applet-1.8.10/src/applet-vpn-request.c	2017-12-19 11:44:30.000000000 +0000
@@ -17,11 +17,13 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright 2004 - 2014 Red Hat, Inc.
+ * Copyright 2004 - 2017 Red Hat, Inc.
  */
 
 #include "nm-default.h"
 
+#include "applet-vpn-request.h"
+
 #include 
 #include 
 #include 
@@ -30,36 +32,11 @@
 #include 
 #include 
 
-#include 
-
-#include "applet-vpn-request.h"
-
-#define APPLET_TYPE_VPN_REQUEST            (applet_vpn_request_get_type ())
-#define APPLET_VPN_REQUEST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), APPLET_TYPE_VPN_REQUEST, AppletVpnRequest))
-#define APPLET_VPN_REQUEST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), APPLET_TYPE_VPN_REQUEST, AppletVpnRequestClass))
-#define APPLET_IS_VPN_REQUEST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APPLET_TYPE_VPN_REQUEST))
-#define APPLET_IS_VPN_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), APPLET_TYPE_VPN_REQUEST))
-#define APPLET_VPN_REQUEST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), APPLET_TYPE_VPN_REQUEST, AppletVpnRequestClass))
+#include "nm-utils/nm-compat.h"
 
-typedef struct {
-	GObject parent;
-} AppletVpnRequest;
+/*****************************************************************************/
 
 typedef struct {
-	GObjectClass parent;
-} AppletVpnRequestClass;
-
-GType applet_vpn_request_get_type (void);
-
-G_DEFINE_TYPE (AppletVpnRequest, applet_vpn_request, G_TYPE_OBJECT)
-
-#define APPLET_VPN_REQUEST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
-                                           APPLET_TYPE_VPN_REQUEST, \
-                                           AppletVpnRequestPrivate))
-
-typedef struct {
-	gboolean disposed;
-
 	char *uuid;
 	char *id;
 	char *service_type;
@@ -73,24 +50,35 @@
 	int num_newlines;
 	GIOChannel *channel;
 	guint channel_eventid;
-} AppletVpnRequestPrivate;
-
-/****************************************************************/
+} RequestData;
 
 typedef struct {
 	SecretsRequest req;
-	AppletVpnRequest *vpn;
+	RequestData *req_data;
 } VpnSecretsInfo;
 
-static void 
+/*****************************************************************************/
+
+static void request_data_free (RequestData *req_data);
+
+/*****************************************************************************/
+
+size_t
+applet_vpn_request_get_secrets_size (void)
+{
+	return sizeof (VpnSecretsInfo);
+}
+
+/*****************************************************************************/
+
+static void
 child_finished_cb (GPid pid, gint status, gpointer user_data)
 {
 	SecretsRequest *req = user_data;
 	VpnSecretsInfo *info = (VpnSecretsInfo *) req;
-	AppletVpnRequest *self = info->vpn;
-	AppletVpnRequestPrivate *priv = APPLET_VPN_REQUEST_GET_PRIVATE (self);
-	GError *error = NULL;
-	GVariant *settings = NULL;
+	RequestData *req_data = info->req_data;
+	gs_free_error GError *error = NULL;
+	gs_unref_variant GVariant *settings = NULL;
 	GVariantBuilder settings_builder, vpn_builder, secrets_builder;
 
 	if (status == 0) {
@@ -104,7 +92,7 @@
 		 * key:secret pairs with the key on one line and the associated secret
 		 * on the next line.
 		 */
-		for (iter = priv->lines; iter; iter = g_slist_next (iter)) {
+		for (iter = req_data->lines; iter; iter = g_slist_next (iter)) {
 			if (!iter->next)
 				break;
 			g_variant_builder_add (&secrets_builder, "{ss}", iter->data, iter->next->data);
@@ -113,7 +101,7 @@
 
 		g_variant_builder_add (&vpn_builder, "{sv}",
 		                       NM_SETTING_VPN_SECRETS,
-                                       g_variant_builder_end (&secrets_builder));
+		                       g_variant_builder_end (&secrets_builder));
 		g_variant_builder_add (&settings_builder, "{sa{sv}}",
 		                       NM_SETTING_VPN_SETTING_NAME,
 		                       &vpn_builder);
@@ -127,19 +115,15 @@
 	/* Complete the secrets request */
 	applet_secrets_request_complete (req, settings, error);
 	applet_secrets_request_free (req);
-
-	if (settings)
-		g_variant_unref (settings);
-	g_clear_error (&error);
 }
 
-static gboolean 
+/*****************************************************************************/
+
+static gboolean
 child_stdout_data_cb (GIOChannel *source, GIOCondition condition, gpointer user_data)
 {
 	VpnSecretsInfo *info = user_data;
-	AppletVpnRequest *self = info->vpn;
-	AppletVpnRequestPrivate *priv = APPLET_VPN_REQUEST_GET_PRIVATE (self);
-	const char *buf = "QUIT\n\n";
+	RequestData *req_data = info->req_data;
 	char *str;
 	int len;
 
@@ -150,252 +134,302 @@
 		len = strlen (str);
 		if (len == 1 && str[0] == '\n') {
 			/* on second line with a newline newline */
-			if (++priv->num_newlines == 2) {
+			if (++req_data->num_newlines == 2) {
+				const char *buf = "QUIT\n\n";
+
 				/* terminate the child */
-				if (write (priv->child_stdin, buf, strlen (buf)) == -1)
+				if (write (req_data->child_stdin, buf, strlen (buf)) == -1)
 					return TRUE;
 			}
 		} else if (len > 0) {
 			/* remove terminating newline */
 			str[len - 1] = '\0';
-			priv->lines = g_slist_append (priv->lines, str);
+			req_data->lines = g_slist_append (req_data->lines, str);
 		}
 	}
 	return TRUE;
 }
 
+/*****************************************************************************/
+
+static void
+_str_append (GString *str,
+             const char *tag,
+             const char *val)
+{
+	const char *s;
+	gsize i;
+
+	nm_assert (str);
+	nm_assert (tag && tag[0]);
+	nm_assert (val);
+
+	g_string_append (str, tag);
+	g_string_append_c (str, '=');
+
+	s = strchr (val, '\n');
+	if (s) {
+		gs_free char *val2 = g_strdup (val);
+
+		for (i = 0; val2[i]; i++) {
+			if (val2[i] == '\n')
+				val2[i] = ' ';
+		}
+		g_string_append (str, val2);
+	} else
+		g_string_append (str, val);
+	g_string_append_c (str, '\n');
+}
+
 static char *
-find_auth_dialog_binary (const char *service,
-                         gboolean *out_hints_supported,
-                         GError **error)
+connection_to_data (NMConnection *connection,
+                    gsize *out_length,
+                    GError **error)
 {
-	const char *auth_dialog;
-	gs_unref_object NMVpnPluginInfo *plugin = NULL;
+	NMSettingVpn *s_vpn;
+	GString *buf;
+	const char **keys;
+	guint i, len;
 
-	plugin = nm_vpn_plugin_info_new_search_file (NULL, service);
+	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
 
-	auth_dialog = plugin ? nm_vpn_plugin_info_get_auth_dialog (plugin) : NULL;
-	if (!auth_dialog) {
-		g_set_error (error,
-		             NM_SECRET_AGENT_ERROR,
-		             NM_SECRET_AGENT_ERROR_FAILED,
-		             "Could not find the authentication dialog for VPN connection type '%s'",
-		             service);
+	s_vpn = nm_connection_get_setting_vpn (connection);
+	if (!s_vpn) {
+		g_set_error_literal (error,
+		                     NM_SECRET_AGENT_ERROR,
+		                     NM_SECRET_AGENT_ERROR_FAILED,
+		                     _("Connection had no VPN setting"));
 		return NULL;
 	}
 
-	*out_hints_supported = nm_vpn_plugin_info_supports_hints (plugin);
-	return g_strdup (auth_dialog);
-}
+	buf = g_string_new_len (NULL, 100);
 
-static void
-free_vpn_secrets_info (SecretsRequest *req)
-{
-	VpnSecretsInfo *info = (VpnSecretsInfo *) req;
+	keys = nm_setting_vpn_get_data_keys (s_vpn, &len);
+	for (i = 0; i < len; i++) {
+		_str_append (buf, "DATA_KEY", keys[i]);
+		_str_append (buf, "DATA_VAL", nm_setting_vpn_get_data_item (s_vpn, keys[i]));
+	}
+	nm_clear_g_free (&keys);
 
-	if (info->vpn)
-		g_object_unref (info->vpn);
-}
+	keys = nm_setting_vpn_get_secret_keys (s_vpn, &len);
+	for (i = 0; i < len; i++) {
+		_str_append (buf, "SECRET_KEY", keys[i]);
+		_str_append (buf, "SECRET_VAL", nm_setting_vpn_get_secret (s_vpn, keys[i]));
+	}
+	nm_clear_g_free (&keys);
 
-size_t
-applet_vpn_request_get_secrets_size (void)
-{
-	return sizeof (VpnSecretsInfo);
+	g_string_append (buf, "DONE\n\n");
+	NM_SET_OUT (out_length, buf->len);
+	return g_string_free (buf, FALSE);
 }
 
-typedef struct {
-	int fd;
-	gboolean secret;
-	GError **error;
-} WriteItemInfo;
-
-static const char *data_key_tag = "DATA_KEY=";
-static const char *data_val_tag = "DATA_VAL=";
-static const char *secret_key_tag = "SECRET_KEY=";
-static const char *secret_val_tag = "SECRET_VAL=";
+/*****************************************************************************/
 
 static gboolean
-write_item (int fd, const char *item, GError **error)
-{
-	size_t item_len = strlen (item);
+connection_to_fd (NMConnection *connection,
+                  int fd,
+                  GError **error)
+{
+	gs_free char *data = NULL;
+	gsize data_len;
+	gssize w;
+	int errsv;
+
+	data = connection_to_data (connection, &data_len, error);
+	if (!data)
+		return FALSE;
 
-	errno = 0;
-	if (write (fd, item, item_len) != item_len) {
+again:
+	w = write (fd, data, data_len);
+	if (w < 0) {
+		errsv = errno;
+		if (errsv == EINTR)
+			goto again;
 		g_set_error (error,
-			         NM_SECRET_AGENT_ERROR,
-			         NM_SECRET_AGENT_ERROR_FAILED,
-			         "Failed to write connection to VPN UI: errno %d", errno);
+		             NM_SECRET_AGENT_ERROR,
+		             NM_SECRET_AGENT_ERROR_FAILED,
+		             _("Failed to write connection to VPN UI: %s (%d)"), g_strerror (errsv), errsv);
 		return FALSE;
 	}
+
+	if ((gsize) w != data_len) {
+		g_set_error_literal (error,
+		                     NM_SECRET_AGENT_ERROR,
+		                     NM_SECRET_AGENT_ERROR_FAILED,
+		                     _("Failed to write connection to VPN UI: incomplete write"));
+		return FALSE;
+	}
+
 	return TRUE;
 }
 
+/*****************************************************************************/
+
 static void
-write_one_key_val (const char *key, const char *value, gpointer user_data)
+vpn_child_setup (gpointer user_data)
 {
-	WriteItemInfo *info = user_data;
-	const char *tag;
-
-	if (info->error && *(info->error))
-		return;
-
-	/* Write the key name */
-	tag = info->secret ? secret_key_tag : data_key_tag;
-	if (!write_item (info->fd, tag, info->error))
-		return;
-	if (!write_item (info->fd, key, info->error))
-		return;
-	if (!write_item (info->fd, "\n", info->error))
-		return;
-
-	/* Write the key value */
-	tag = info->secret ? secret_val_tag : data_val_tag;
-	if (!write_item (info->fd, tag, info->error))
-		return;
-	if (!write_item (info->fd, value ? value : "", info->error))
-		return;
-	if (!write_item (info->fd, "\n\n", info->error))
-		return;
+	/* We are in the child process at this point */
+	pid_t pid = getpid ();
+	setpgid (pid, pid);
 }
 
 static gboolean
-write_connection_to_child (int fd, NMConnection *connection, GError **error)
-{
-	NMSettingVpn *s_vpn;
-	WriteItemInfo info = { .fd = fd, .secret = FALSE, .error = error };
-
-	s_vpn = nm_connection_get_setting_vpn (connection);
-	if (!s_vpn) {
-		g_set_error_literal (error,
-		                     NM_SECRET_AGENT_ERROR,
-		                     NM_SECRET_AGENT_ERROR_FAILED,
-		                     "Connection had no VPN setting");
-		return FALSE;
+auth_dialog_spawn (const char *con_id,
+                   const char *con_uuid,
+                   const char *const*hints,
+                   const char *auth_dialog,
+                   const char *service_type,
+                   gboolean supports_hints,
+                   guint32 flags,
+                   GPid *out_pid,
+                   int *out_stdin,
+                   int *out_stdout,
+                   GError **error)
+{
+	gsize hints_len;
+	gsize i, j;
+	gs_free const char **argv = NULL;
+	gs_free const char **envp = NULL;
+	gsize environ_len;
+
+	g_return_val_if_fail (con_id, FALSE);
+	g_return_val_if_fail (con_uuid, FALSE);
+	g_return_val_if_fail (auth_dialog, FALSE);
+	g_return_val_if_fail (service_type, FALSE);
+	g_return_val_if_fail (out_pid, FALSE);
+	g_return_val_if_fail (out_stdin, FALSE);
+	g_return_val_if_fail (out_stdout, FALSE);
+
+	hints_len = NM_PTRARRAY_LEN (hints);
+	argv = g_new (const char *, 10 + (2 * hints_len));
+	i = 0;
+	argv[i++] = auth_dialog;
+	argv[i++] = "-u";
+	argv[i++] = con_uuid;
+	argv[i++] = "-n";
+	argv[i++] = con_id;
+	argv[i++] = "-s";
+	argv[i++] = service_type;
+	if (flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION)
+		argv[i++] = "-i";
+	if (flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW)
+		argv[i++] = "-r";
+	for (j = 0; supports_hints && (j < hints_len); j++) {
+		argv[i++] = "-t";
+		argv[i++] = hints[j];
 	}
+	nm_assert (i <= 10 + (2 * hints_len));
+	argv[i++] = NULL;
 
-	nm_setting_vpn_foreach_data_item (s_vpn, write_one_key_val, &info);
-	if (error && *error)
-		return FALSE;
-
-	info.secret = TRUE;
-	nm_setting_vpn_foreach_secret (s_vpn, write_one_key_val, &info);
-	if (error && *error)
-		return FALSE;
+	environ_len = NM_PTRARRAY_LEN (environ);
+	envp = g_new (const char *, environ_len + 1);
+	memcpy (envp, environ, sizeof (const char *) * environ_len);
+	for (i = 0, j = 0; i < environ_len; i++) {
+		const char *e = environ[i];
+
+		if (g_str_has_prefix (e, "G_MESSAGES_DEBUG=")) {
+			/* skip this environment variable. We interact with the auth-dialog via stdout.
+			 * G_MESSAGES_DEBUG may enable additional debugging messages from GTK. */
+			continue;
+		}
+		envp[j++] = e;
+	}
+	envp[j] = NULL;
 
-	if (!write_item (fd, "DONE\n\n", error))
+	if (!g_spawn_async_with_pipes (NULL,
+	                               (char **) argv,
+	                               (char **) envp,
+	                               G_SPAWN_DO_NOT_REAP_CHILD,
+	                               vpn_child_setup,
+	                               NULL,
+	                               out_pid,
+	                               out_stdin,
+	                               out_stdout,
+	                               NULL,
+	                               error))
 		return FALSE;
 
 	return TRUE;
 }
 
+/*****************************************************************************/
+
 static void
-vpn_child_setup (gpointer user_data G_GNUC_UNUSED)
+free_vpn_secrets_info (SecretsRequest *req)
 {
-	/* We are in the child process at this point */
-	pid_t pid = getpid ();
-	setpgid (pid, pid);
+	request_data_free (((VpnSecretsInfo *) req)->req_data);
 }
 
 gboolean
 applet_vpn_request_get_secrets (SecretsRequest *req, GError **error)
 {
 	VpnSecretsInfo *info = (VpnSecretsInfo *) req;
-	AppletVpnRequestPrivate *priv;
+	RequestData *req_data;
 	NMSettingConnection *s_con;
 	NMSettingVpn *s_vpn;
 	const char *connection_type;
 	const char *service_type;
-	char *bin_path;
-	char **argv = NULL;
-	gboolean success = FALSE;
-	guint i = 0, u, hints_len;
-	gboolean supports_hints = FALSE;
+	const char *auth_dialog;
+	gs_unref_object NMVpnPluginInfo *plugin = NULL;
 
 	applet_secrets_request_set_free_func (req, free_vpn_secrets_info);
 
 	s_con = nm_connection_get_setting_connection (req->connection);
-	g_return_val_if_fail (s_con != NULL, FALSE);
+	s_vpn = nm_connection_get_setting_vpn (req->connection);
 
 	connection_type = nm_setting_connection_get_connection_type (s_con);
-	g_return_val_if_fail (connection_type != NULL, FALSE);
-	g_return_val_if_fail (strcmp (connection_type, NM_SETTING_VPN_SETTING_NAME) == 0, FALSE);
-
-	s_vpn = nm_connection_get_setting_vpn (req->connection);
-	g_return_val_if_fail (s_vpn != NULL, FALSE);
+	g_return_val_if_fail (nm_streq0 (connection_type, NM_SETTING_VPN_SETTING_NAME), FALSE);
 
 	service_type = nm_setting_vpn_get_service_type (s_vpn);
-	g_return_val_if_fail (service_type != NULL, FALSE);
+	g_return_val_if_fail (service_type, FALSE);
 
-	/* find the auth-dialog binary */
-	bin_path = find_auth_dialog_binary (service_type, &supports_hints, error);
-	if (!bin_path)
+	plugin = nm_vpn_plugin_info_new_search_file (NULL, service_type);
+	auth_dialog = plugin ? nm_vpn_plugin_info_get_auth_dialog (plugin) : NULL;
+	if (!auth_dialog) {
+		g_set_error (error,
+		             NM_SECRET_AGENT_ERROR,
+		             NM_SECRET_AGENT_ERROR_FAILED,
+		             "Could not find the authentication dialog for VPN connection type '%s'",
+		             service_type);
 		return FALSE;
+	}
 
-	info->vpn = (AppletVpnRequest *) g_object_new (APPLET_TYPE_VPN_REQUEST, NULL);
-	if (!info->vpn) {
+	info->req_data = g_slice_new0 (RequestData);
+	if (!info->req_data) {
 		g_set_error_literal (error,
 		                     NM_SECRET_AGENT_ERROR,
 		                     NM_SECRET_AGENT_ERROR_FAILED,
 		                     "Could not create VPN secrets request object");
-		goto out;
-	}
-
-	priv = APPLET_VPN_REQUEST_GET_PRIVATE (info->vpn);
-
-	hints_len = g_strv_length (req->hints);
-	argv = g_new0 (char *, 10 + (2 * hints_len));
-	argv[i++] = bin_path;
-	argv[i++] = "-u";
-	argv[i++] = (char *) nm_setting_connection_get_uuid (s_con);
-	argv[i++] = "-n";
-	argv[i++] = (char *) nm_setting_connection_get_id (s_con);
-	argv[i++] = "-s";
-	argv[i++] = (char *) service_type;
-	if (req->flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION)
-		argv[i++] = "-i";
-	if (req->flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW)
-		argv[i++] = "-r";
-
-	/* add hints */
-	for (u = 0; supports_hints && (u < hints_len); u++) {
-		argv[i++] = "-t";
-		argv[i++] = req->hints[u];
+		return FALSE;
 	}
+	req_data = info->req_data;
 
-	if (!g_spawn_async_with_pipes (NULL,                       /* working_directory */
-	                               argv,                       /* argv */
-	                               NULL,                       /* envp */
-	                               G_SPAWN_DO_NOT_REAP_CHILD,  /* flags */
-	                               vpn_child_setup,            /* child_setup */
-	                               NULL,                       /* user_data */
-	                               &priv->pid,                 /* child_pid */
-	                               &priv->child_stdin,         /* standard_input */
-	                               &priv->child_stdout,        /* standard_output */
-	                               NULL,                       /* standard_error */
-	                               error))                     /* error */
-		goto out;
+	if (!auth_dialog_spawn (nm_setting_connection_get_id (s_con),
+	                        nm_setting_connection_get_uuid (s_con),
+	                        (const char *const*) req->hints,
+	                        auth_dialog,
+	                        service_type,
+	                        nm_vpn_plugin_info_supports_hints (plugin),
+	                        req->flags,
+	                        &req_data->pid,
+	                        &req_data->child_stdin,
+	                        &req_data->child_stdout,
+	                        error))
+		return FALSE;
 
 	/* catch when child is reaped */
-	priv->watch_id = g_child_watch_add (priv->pid, child_finished_cb, info);
+	req_data->watch_id = g_child_watch_add (req_data->pid, child_finished_cb, info);
 
 	/* listen to what child has to say */
-	priv->channel = g_io_channel_unix_new (priv->child_stdout);
-	priv->channel_eventid = g_io_add_watch (priv->channel, G_IO_IN, child_stdout_data_cb, info);
-	g_io_channel_set_encoding (priv->channel, NULL, NULL);
+	req_data->channel = g_io_channel_unix_new (req_data->child_stdout);
+	req_data->channel_eventid = g_io_add_watch (req_data->channel, G_IO_IN, child_stdout_data_cb, info);
+	g_io_channel_set_encoding (req_data->channel, NULL, NULL);
 
 	/* Dump parts of the connection to the child */
-	success = write_connection_to_child (priv->child_stdin, req->connection, error);
-
-out:
-	g_free (argv);
-	g_free (bin_path);
-	return success;
+	return connection_to_fd (req->connection, req_data->child_stdin, error);
 }
 
-static void
-applet_vpn_request_init (AppletVpnRequest *self)
-{
-}
+/*****************************************************************************/
 
 static gboolean
 ensure_killed (gpointer data)
@@ -410,54 +444,34 @@
 }
 
 static void
-dispose (GObject *object)
+request_data_free (RequestData *req_data)
 {
-	AppletVpnRequest *self = APPLET_VPN_REQUEST (object);
-	AppletVpnRequestPrivate *priv = APPLET_VPN_REQUEST_GET_PRIVATE (self);
-
-	if (priv->disposed)
-		goto done;
-
-	priv->disposed = TRUE;
-
-	g_free (priv->uuid);
-	g_free (priv->id);
-	g_free (priv->service_type);
-
-	if (priv->watch_id)
-		g_source_remove (priv->watch_id);
-
-	if (priv->channel_eventid)
-		g_source_remove (priv->channel_eventid);
-	if (priv->channel)
-		g_io_channel_unref (priv->channel);
+	if (!req_data)
+		return;
 
-	if (priv->pid) {
-		g_spawn_close_pid (priv->pid);
-		if (kill (priv->pid, SIGTERM) == 0)
-			g_timeout_add_seconds (2, ensure_killed, GINT_TO_POINTER (priv->pid));
+	g_free (req_data->uuid);
+	g_free (req_data->id);
+	g_free (req_data->service_type);
+
+	nm_clear_g_source (&req_data->watch_id);
+
+	nm_clear_g_source (&req_data->channel_eventid);
+	if (req_data->channel)
+		g_io_channel_unref (req_data->channel);
+
+	if (req_data->pid) {
+		g_spawn_close_pid (req_data->pid);
+		if (kill (req_data->pid, SIGTERM) == 0)
+			g_timeout_add_seconds (2, ensure_killed, GINT_TO_POINTER (req_data->pid));
 		else {
-			kill (priv->pid, SIGKILL);
+			kill (req_data->pid, SIGKILL);
 			/* ensure the child is reaped */
-			waitpid (priv->pid, NULL, 0);
+			waitpid (req_data->pid, NULL, 0);
 		}
 	}
 
-	g_slist_foreach (priv->lines, (GFunc) g_free, NULL);
-	g_slist_free (priv->lines);
+	g_slist_foreach (req_data->lines, (GFunc) g_free, NULL);
+	g_slist_free (req_data->lines);
 
-done:
-	G_OBJECT_CLASS (applet_vpn_request_parent_class)->dispose (object);
+	g_slice_free (RequestData, req_data);
 }
-
-static void
-applet_vpn_request_class_init (AppletVpnRequestClass *req_class)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (req_class);
-
-	g_type_class_add_private (req_class, sizeof (AppletVpnRequestPrivate));
-
-	/* virtual methods */
-	object_class->dispose = dispose;
-}
-
diff -Nru network-manager-applet-1.8.4/src/connection-editor/ce-page-ip6.ui network-manager-applet-1.8.10/src/connection-editor/ce-page-ip6.ui
--- network-manager-applet-1.8.4/src/connection-editor/ce-page-ip6.ui	2017-08-11 09:40:17.000000000 +0000
+++ network-manager-applet-1.8.10/src/connection-editor/ce-page-ip6.ui	2017-12-19 11:44:30.000000000 +0000
@@ -42,6 +42,20 @@
       
     
   
+  
+    
+      
+      
+    
+    
+      
+        EUI64
+      
+      
+        Stable privacy
+      
+    
+  
     True
     False
@@ -290,6 +304,38 @@
                     2
                   
                 
+                
+                  
+                    True
+                    False
+                    IPv6 address _generation mode:
+                    True
+                    ip6_addr_gen_mode_combo
+                    0
+                  
+                  
+                    0
+                    3
+                  
+                
+                
+                  
+                    True
+                    False
+                    False
+                    model3
+                    
+                      
+                      
+                        0
+                      
+                    
+                  
+                  
+                    1
+                    3
+                  
+                
               
               
                 False
diff -Nru network-manager-applet-1.8.4/src/connection-editor/meson.build network-manager-applet-1.8.10/src/connection-editor/meson.build
--- network-manager-applet-1.8.4/src/connection-editor/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/src/connection-editor/meson.build	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1,123 @@
+sources = files(
+  'ce-page.c',
+  'ce-polkit-button.c',
+  'ce-polkit.c',
+  'connection-helpers.c',
+  'ip4-routes-dialog.c',
+  'ip6-routes-dialog.c',
+  'nm-connection-editor.c',
+  'nm-connection-list.c',
+  'main.c',
+  'page-8021x-security.c',
+  'page-bridge.c',
+  'page-bridge-port.c',
+  'page-bluetooth.c',
+  'page-bond.c',
+  'page-dcb.c',
+  'page-dsl.c',
+  'page-ethernet.c',
+  'page-general.c',
+  'page-infiniband.c',
+  'page-ip-tunnel.c',
+  'page-ip4.c',
+  'page-ip6.c',
+  'page-macsec.c',
+  'page-master.c',
+  'page-mobile.c',
+  'page-ppp.c',
+  'page-proxy.c',
+  'page-team.c',
+  'page-team-port.c',
+  'page-vlan.c',
+  'page-vpn.c',
+  'page-wifi.c',
+  'page-wifi-security.c',
+  'ppp-auth-methods-dialog.c',
+  'vpn-helpers.c'
+)
+
+resource_data = files(
+  'ce-ip4-routes.ui',
+  'ce-ip6-routes.ui',
+  'ce-new-connection.ui',
+  'ce-page-bluetooth.ui',
+  'ce-page-bond.ui',
+  'ce-page-bridge-port.ui',
+  'ce-page-bridge.ui',
+  'ce-page-dcb.ui',
+  'ce-page-dsl.ui',
+  'ce-page-ethernet.ui',
+  'ce-page-general.ui',
+  'ce-page-infiniband.ui',
+  'ce-page-ip4.ui',
+  'ce-page-ip6.ui',
+  'ce-page-ip-tunnel.ui',
+  'ce-page-macsec.ui',
+  'ce-page-mobile.ui',
+  'ce-page-ppp.ui',
+  'ce-page-proxy.ui',
+  'ce-page-team-port.ui',
+  'ce-page-team.ui',
+  'ce-page-vlan.ui',
+  'ce-page-wifi-security.ui',
+  'ce-page-wifi.ui',
+  'ce-ppp-auth-methods.ui',
+  'nm-connection-editor.ui',
+  'nm-connection-list.ui'
+)
+
+sources += gnome.compile_resources(
+  'ce-resources',
+  'ce.gresource.xml',
+  dependencies: resource_data
+)
+
+incs = [
+  top_inc,
+  utils_inc,
+  src_inc,
+  shared_inc,
+  wireless_security_inc
+]
+
+deps = [
+  gtk_dep,
+  libnm_dep,
+  libnma_dep,
+  m_dep
+]
+
+cflags = [
+  '-DBINDIR="@0@"'.format(nma_bindir),
+  '-DDATADIR="@0@"'.format(nma_datadir),
+  '-DLIBDIR="@0@"'.format(nma_libdir),
+  '-DNMALOCALEDIR="@0@"'.format(nma_localedir),
+  '-DSYSCONFDIR="@0@"'.format(nma_sysconfdir),
+  '-DICONDIR="@0@"'.format(nma_icondir)
+]
+
+ldflags = []
+if have_version_script
+  ldflags += '-Wl,--version-script,@0@'.format(linker_script_ver)
+endif
+
+if enable_selinux
+  deps += libselinux_dep
+endif
+
+if enable_team
+  deps += jansson_dep
+endif
+
+executable(
+  'nm-connection-editor',
+  sources,
+  include_directories: incs,
+  dependencies: deps,
+  c_args: cflags,
+  link_args: ldflags,
+  link_depends: linker_script_ver,
+  link_whole: libwireless_security_libnm,
+  install: true,
+  install_dir: nma_bindir
+)
diff -Nru network-manager-applet-1.8.4/src/connection-editor/nm-connection-editor.c network-manager-applet-1.8.10/src/connection-editor/nm-connection-editor.c
--- network-manager-applet-1.8.4/src/connection-editor/nm-connection-editor.c	2017-09-08 08:03:45.000000000 +0000
+++ network-manager-applet-1.8.10/src/connection-editor/nm-connection-editor.c	2017-12-19 12:20:23.000000000 +0000
@@ -147,7 +147,7 @@
 update_sensitivity (NMConnectionEditor *editor)
 {
 	NMSettingConnection *s_con;
-	gboolean actionable = FALSE, authorized = FALSE, sensitive = FALSE;
+	gboolean sensitive = FALSE;
 	GtkWidget *widget;
 	GSList *iter;
 
@@ -156,17 +156,13 @@
 	/* Can't modify read-only connections; can't modify anything before the
 	 * editor is initialized either.
 	 */
-	if (   !nm_setting_connection_get_read_only (s_con)
-	    && editor_is_initialized (editor)) {
-		if (editor->can_modify) {
-			actionable = ce_polkit_button_get_actionable (CE_POLKIT_BUTTON (editor->ok_button));
-			authorized = ce_polkit_button_get_authorized (CE_POLKIT_BUTTON (editor->ok_button));
-		}
-
+	if (   editor_is_initialized (editor)
+	    && editor->can_modify
+	    && !nm_setting_connection_get_read_only (s_con)) {
 		/* If the user cannot ever be authorized to change system connections,
 		 * we desensitize the entire dialog.
 		 */
-		sensitive = authorized;
+		sensitive = ce_polkit_button_get_authorized (CE_POLKIT_BUTTON (editor->ok_button));
 	}
 
 	/* Cancel button is always sensitive */
diff -Nru network-manager-applet-1.8.4/src/connection-editor/page-bluetooth.c network-manager-applet-1.8.10/src/connection-editor/page-bluetooth.c
--- network-manager-applet-1.8.4/src/connection-editor/page-bluetooth.c	2017-08-11 09:40:17.000000000 +0000
+++ network-manager-applet-1.8.10/src/connection-editor/page-bluetooth.c	2017-12-19 12:19:24.000000000 +0000
@@ -137,8 +137,6 @@
 
 	g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
 
-	*out_secrets_setting_name = NM_SETTING_BLUETOOTH_SETTING_NAME;
-
 	return CE_PAGE (self);
 }
 
diff -Nru network-manager-applet-1.8.4/src/connection-editor/page-ip6.c network-manager-applet-1.8.10/src/connection-editor/page-ip6.c
--- network-manager-applet-1.8.4/src/connection-editor/page-ip6.c	2017-01-16 16:48:27.000000000 +0000
+++ network-manager-applet-1.8.10/src/connection-editor/page-ip6.c	2017-12-19 11:44:30.000000000 +0000
@@ -75,6 +75,9 @@
 	GtkWidget *ip6_privacy_label;
 	GtkComboBox *ip6_privacy_combo;
 
+	GtkWidget *ip6_addr_gen_mode_label;
+	GtkComboBox *ip6_addr_gen_mode_combo;
+
 	/* IPv6 required */
 	GtkCheckButton *ip6_required;
 
@@ -106,6 +109,9 @@
 #define IP6_PRIVACY_PREFER_PUBLIC  1
 #define IP6_PRIVACY_PREFER_TEMP    2
 
+#define IP6_ADDR_GEN_MODE_EUI64    0
+#define IP6_ADDR_GEN_MODE_STABLE   1
+
 static void
 ip6_private_init (CEPageIP6 *self, NMConnection *connection)
 {
@@ -224,6 +230,9 @@
 	priv->ip6_privacy_label = GTK_WIDGET (gtk_builder_get_object (builder, "ip6_privacy_label"));
 	priv->ip6_privacy_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "ip6_privacy_combo"));
 
+	priv->ip6_addr_gen_mode_label = GTK_WIDGET (gtk_builder_get_object (builder, "ip6_addr_gen_mode_label"));
+	priv->ip6_addr_gen_mode_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "ip6_addr_gen_mode_combo"));
+
 	priv->ip6_required = GTK_CHECK_BUTTON (gtk_builder_get_object (builder, "ip6_required_checkbutton"));
 	/* Hide IP6-require button if it'll never be used for a particular method */
 	if (   priv->connection_type == NM_TYPE_SETTING_VPN
@@ -244,6 +253,7 @@
 	gboolean dns_enabled = FALSE;
 	gboolean routes_enabled = FALSE;
 	gboolean ip6_privacy_enabled = FALSE;
+	gboolean ip6_addr_gen_mode_enabled = TRUE;
 	gboolean ip6_required_enabled = TRUE;
 	gboolean method_auto = FALSE;
 	GtkTreeIter iter;
@@ -290,6 +300,7 @@
 		break;
 	case IP6_METHOD_IGNORE:
 		ip6_required_enabled = FALSE;
+		ip6_addr_gen_mode_enabled = FALSE;
 		break;
 	default:
 		break;
@@ -340,6 +351,9 @@
 	gtk_widget_set_sensitive (priv->ip6_privacy_label, ip6_privacy_enabled);
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->ip6_privacy_combo), ip6_privacy_enabled);
 
+	gtk_widget_set_sensitive (priv->ip6_addr_gen_mode_label, ip6_addr_gen_mode_enabled);
+	gtk_widget_set_sensitive (GTK_WIDGET (priv->ip6_addr_gen_mode_combo), ip6_addr_gen_mode_enabled);
+
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->ip6_required), ip6_required_enabled);
 
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->routes_button), routes_enabled);
@@ -376,6 +390,8 @@
 	int method = IP6_METHOD_AUTO;
 	NMSettingIP6ConfigPrivacy ip6_privacy;
 	int ip6_privacy_idx = IP6_PRIVACY_DISABLED;
+	NMSettingIP6ConfigAddrGenMode ip6_addr_gen_mode;
+	int ip6_addr_gen_mode_idx;
 	GString *string = NULL;
 	SetMethodInfo info;
 	const char *str_method;
@@ -477,6 +493,13 @@
 	}
 	gtk_combo_box_set_active (priv->ip6_privacy_combo, ip6_privacy_idx);
 
+	ip6_addr_gen_mode = nm_setting_ip6_config_get_addr_gen_mode (NM_SETTING_IP6_CONFIG (setting));
+	if (ip6_addr_gen_mode == NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64)
+		ip6_addr_gen_mode_idx = IP6_ADDR_GEN_MODE_EUI64;
+	else
+		ip6_addr_gen_mode_idx = IP6_ADDR_GEN_MODE_STABLE;
+	gtk_combo_box_set_active (priv->ip6_addr_gen_mode_combo, ip6_addr_gen_mode_idx);
+
 	/* IPv6 required */
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->ip6_required),
 	                              !nm_setting_ip_config_get_may_fail (setting));
@@ -1153,6 +1176,7 @@
 	g_signal_connect (priv->dns_servers, "insert-text", G_CALLBACK (dns_servers_filter_cb), self);
 	g_signal_connect_swapped (priv->dns_searches, "changed", G_CALLBACK (ce_page_changed), self);
 	g_signal_connect_swapped (priv->ip6_privacy_combo, "changed", G_CALLBACK (ce_page_changed), self);
+	g_signal_connect_swapped (priv->ip6_addr_gen_mode_combo, "changed", G_CALLBACK (ce_page_changed), self);
 
 	method_changed (priv->method, self);
 	g_signal_connect (priv->method, "changed", G_CALLBACK (method_changed), self);
@@ -1219,6 +1243,7 @@
 	char **items = NULL, **iter;
 	gboolean may_fail;
 	NMSettingIP6ConfigPrivacy ip6_privacy;
+	NMSettingIP6ConfigAddrGenMode ip6_addr_gen_mode;
 
 	/* Method */
 	if (gtk_combo_box_get_active_iter (priv->method, &tree_iter)) {
@@ -1371,10 +1396,16 @@
 		break;
 	}
 
+	if (gtk_combo_box_get_active (priv->ip6_addr_gen_mode_combo) == IP6_ADDR_GEN_MODE_EUI64)
+		ip6_addr_gen_mode = NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64;
+	else
+		ip6_addr_gen_mode = NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY;
+
 	may_fail = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->ip6_required));
 	g_object_set (G_OBJECT (priv->setting),
 	              NM_SETTING_IP_CONFIG_MAY_FAIL, may_fail,
 	              NM_SETTING_IP6_CONFIG_IP6_PRIVACY, ip6_privacy,
+	              NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE, (int) ip6_addr_gen_mode,
 	              NULL);
 
 	valid = TRUE;
diff -Nru network-manager-applet-1.8.4/src/connection-editor/page-vpn.c network-manager-applet-1.8.10/src/connection-editor/page-vpn.c
--- network-manager-applet-1.8.4/src/connection-editor/page-vpn.c	2017-01-12 11:47:27.000000000 +0000
+++ network-manager-applet-1.8.10/src/connection-editor/page-vpn.c	2017-12-19 11:44:30.000000000 +0000
@@ -55,12 +55,20 @@
 {
 	CEPage *parent = CE_PAGE (self);
 	CEPageVpnPrivate *priv = CE_PAGE_VPN_GET_PRIVATE (self);
+	GError *local = NULL;
 
 	if (error)
 		return;
 
 	g_return_if_fail (NM_IS_VPN_EDITOR_PLUGIN (priv->plugin));
-	g_return_if_fail (NM_IS_VPN_EDITOR (priv->editor));
+
+	priv->editor = nm_vpn_editor_plugin_get_editor (priv->plugin, CE_PAGE (self)->connection, &local);
+	if (!priv->editor) {
+		g_warning (_("Could not load editor VPN plugin for “%s” (%s)."),
+		           priv->service_type, local ? local->message : _("unknown failure"));
+		g_clear_error (&local);
+		return;
+	}
 
 	g_signal_connect (priv->editor, "changed", G_CALLBACK (vpn_plugin_changed_cb), self);
 
@@ -84,7 +92,6 @@
 	CEPageVpn *self;
 	CEPageVpnPrivate *priv;
 	const char *service_type;
-	GError *local = NULL;
 
 	self = CE_PAGE_VPN (ce_page_new (CE_TYPE_PAGE_VPN,
 	                                 editor,
@@ -116,16 +123,6 @@
 	}
 	priv->plugin = g_object_ref (priv->plugin);
 
-	priv->editor = nm_vpn_editor_plugin_get_editor (priv->plugin, CE_PAGE (self)->connection, &local);
-	if (!priv->editor) {
-		g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC,
-		             _("Could not load editor VPN plugin for “%s” (%s)."),
-		             service_type, local ? local->message : _("unknown failure"));
-		g_clear_error (&local);
-		g_object_unref (self);
-		return NULL;
-	}
-
 	g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
 
 	*out_secrets_setting_name = NM_SETTING_VPN_SETTING_NAME;
diff -Nru network-manager-applet-1.8.4/src/connection-editor/page-wifi.c network-manager-applet-1.8.10/src/connection-editor/page-wifi.c
--- network-manager-applet-1.8.4/src/connection-editor/page-wifi.c	2017-03-26 18:32:43.000000000 +0000
+++ network-manager-applet-1.8.10/src/connection-editor/page-wifi.c	2017-12-19 11:44:30.000000000 +0000
@@ -240,7 +240,7 @@
 	CEPageWifiPrivate *priv = CE_PAGE_WIFI_GET_PRIVATE (self);
 	CEPage *parent = CE_PAGE (self);
 	GtkWidget *widget_band_label, *widget_chan_label, *widget_bssid_label;
-	gboolean show_freq = FALSE;
+	gboolean show_freq = TRUE;
 	gboolean show_bssid = TRUE;
 	gboolean hotspot = FALSE;
 
@@ -254,10 +254,8 @@
 		 * For AP-mode, the BSSID is the MAC address of the device.
 		 */
 		show_bssid = FALSE;
-		show_freq = TRUE;
 		break;
 	default: /* infrastructure */
-		show_freq = FALSE;
 		break;
 	}
 	nm_connection_editor_inter_page_set_value (parent->editor,
@@ -336,12 +334,14 @@
 	mode_combo_changed_cb (priv->mode, self);
 	g_signal_connect (priv->mode, "changed", G_CALLBACK (mode_combo_changed_cb), self);
 
-	g_signal_connect (priv->channel, "output",
-	                  G_CALLBACK (channel_spin_output_cb),
-	                  self);
-	g_signal_connect (priv->channel, "input",
-	                  G_CALLBACK (channel_spin_input_cb),
-	                  self);
+	g_signal_connect_object (priv->channel, "output",
+	                         G_CALLBACK (channel_spin_output_cb),
+	                         self,
+	                         0);
+	g_signal_connect_object (priv->channel, "input",
+	                         G_CALLBACK (channel_spin_input_cb),
+	                         self,
+	                         0);
 
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->channel), FALSE);
 	if (band) {
diff -Nru network-manager-applet-1.8.4/src/libnma/meson.build network-manager-applet-1.8.10/src/libnma/meson.build
--- network-manager-applet-1.8.4/src/libnma/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/src/libnma/meson.build	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1,149 @@
+lib_name = 'libnma'
+
+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-mobile-providers.h',
+  'nma-mobile-wizard.h',
+  'nma-ui-utils.h',
+  'nma-vpn-password-dialog.h',
+  'nma-wifi-dialog.h'
+)
+
+headers = gir_headers + files('nma-cert-chooser-private.h')
+
+install_headers(
+  gir_headers,
+  subdir: lib_name
+)
+
+gir_sources = [version_header] + cert_chooser_sources + files(
+  'init.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 = [
+  gtk_dep,
+  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')
+
+ldflags = []
+if have_version_script
+  ldflags += '-Wl,--version-script,' + symbol_map
+endif
+
+if enable_gcr
+  headers += files(
+    'nma-cert-chooser-button.h',
+    'nma-pkcs11-cert-chooser-dialog.h',
+    'nma-pkcs11-token-login-dialog.h'
+  )
+
+  gir_sources += files(
+    'nma-cert-chooser-button.c',
+    'nma-pkcs11-cert-chooser.c',
+    'nma-pkcs11-cert-chooser-dialog.c',
+    'nma-pkcs11-token-login-dialog.c'
+  )
+
+  deps += gcr_dep
+endif
+
+libnma = shared_library(
+  'nma',
+  sources: gir_sources + built_sources,
+  version: libversion,
+  include_directories: incs,
+  dependencies: deps,
+  c_args: cflags,
+  link_args: ldflags,
+  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
+)
+
+pkg.generate(
+  libraries: libnma,
+  version: nma_version,
+  name: lib_name,
+  description: 'NetworkManager UI utilities (libnm version)',
+  filebase: lib_name,
+  subdirs: lib_name,
+  requires: 'libnm',
+  variables: 'exec_prefix=' + nma_prefix,
+  install_dir: join_paths(nma_libdir, 'pkgconfig')
+)
+
+if enable_introspection
+  gir_incs = [
+    'Gtk-3.0',
+    'NM-1.0'
+  ]
+
+  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_gir_ns,
+    includes: gir_incs,
+    identifier_prefix: nma_gir_prefix,
+    symbol_prefix: nma_gir_prefix.to_lower(),
+    export_packages: lib_name,
+    install: true,
+    install_dir_gir: gir_dir,
+    install_dir_typelib: typelib_dir
+  )
+endif
diff -Nru network-manager-applet-1.8.4/src/libnma/nma-cert-chooser.c network-manager-applet-1.8.10/src/libnma/nma-cert-chooser.c
--- network-manager-applet-1.8.4/src/libnma/nma-cert-chooser.c	2017-05-10 10:25:21.000000000 +0000
+++ network-manager-applet-1.8.10/src/libnma/nma-cert-chooser.c	2017-12-19 11:44:30.000000000 +0000
@@ -643,12 +643,9 @@
 set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
 	NMACertChooser *cert_chooser = NMA_CERT_CHOOSER (object);
-	const NMACertChooserVtable *vtable;
 
 	g_return_if_fail (NMA_IS_CERT_CHOOSER (cert_chooser));
 
-	vtable = NMA_CERT_CHOOSER_GET_VTABLE (cert_chooser);
-
 	switch (property_id) {
 	case PROP_TITLE:
 	case PROP_FLAGS:
diff -Nru network-manager-applet-1.8.4/src/libnma/nma-version.h network-manager-applet-1.8.10/src/libnma/nma-version.h
--- network-manager-applet-1.8.4/src/libnma/nma-version.h	2017-09-20 13:28:07.000000000 +0000
+++ network-manager-applet-1.8.10/src/libnma/nma-version.h	2017-12-19 12:30:09.000000000 +0000
@@ -45,7 +45,7 @@
  * Evaluates to the micro version number of NetworkManager which this source
  * compiled against.
  */
-#define NMA_MICRO_VERSION (4)
+#define NMA_MICRO_VERSION (10)
 
 /**
  * NMA_CHECK_VERSION:
@@ -68,9 +68,13 @@
 #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_CUR_STABLE  NMA_VERSION_1_8_2
-#define NMA_VERSION_NEXT_STABLE NMA_VERSION_1_8_4
+#define NMA_VERSION_CUR_STABLE  NMA_VERSION_1_8_10
+#define NMA_VERSION_NEXT_STABLE NMA_VERSION_1_8_12
 
 #define NMA_VERSION NMA_ENCODE_VERSION (NMA_MAJOR_VERSION, NMA_MINOR_VERSION, NMA_MICRO_VERSION)
 
diff -Nru network-manager-applet-1.8.4/src/libnma/nma-version.h.in network-manager-applet-1.8.10/src/libnma/nma-version.h.in
--- network-manager-applet-1.8.4/src/libnma/nma-version.h.in	2017-09-20 13:27:32.000000000 +0000
+++ network-manager-applet-1.8.10/src/libnma/nma-version.h.in	2017-12-19 12:26:25.000000000 +0000
@@ -68,9 +68,13 @@
 #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_CUR_STABLE  NMA_VERSION_1_8_2
-#define NMA_VERSION_NEXT_STABLE NMA_VERSION_1_8_4
+#define NMA_VERSION_CUR_STABLE  NMA_VERSION_1_8_10
+#define NMA_VERSION_NEXT_STABLE NMA_VERSION_1_8_12
 
 #define NMA_VERSION NMA_ENCODE_VERSION (NMA_MAJOR_VERSION, NMA_MINOR_VERSION, NMA_MICRO_VERSION)
 
diff -Nru network-manager-applet-1.8.4/src/libnm-gtk/meson.build network-manager-applet-1.8.10/src/libnm-gtk/meson.build
--- network-manager-applet-1.8.4/src/libnm-gtk/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/src/libnm-gtk/meson.build	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1,152 @@
+lib_name = 'libnm-gtk'
+
+gir_headers = files(
+  'nm-cert-chooser.h',
+  'nm-mobile-providers.h',
+  'nm-mobile-wizard.h',
+  'nm-ui-utils.h',
+  'nm-vpn-password-dialog.h',
+  'nm-wifi-dialog.h'
+)
+
+headers = gir_headers + files('nm-wireless-dialog.h')
+
+install_headers(
+  headers,
+  subdir: lib_name
+)
+
+gir_sources = cert_chooser_sources + files(
+  'init.c',
+  'nm-mobile-providers.c',
+  'nm-mobile-wizard.c',
+  'nm-ui-utils.c',
+  'nm-vpn-password-dialog.c',
+  'nm-wifi-dialog.c'
+)
+
+sources = [version_header] + gir_sources + files('nm-wireless-dialog.c')
+
+resource_data = files('wifi.ui')
+
+sources += gnome.compile_resources(
+  'nm-resources',
+  'nm.gresource.xml',
+  dependencies: resource_data
+)
+
+incs = [
+  top_inc,
+  shared_inc,
+  src_inc,
+  libnma_inc,
+  wireless_security_inc
+]
+
+deps = [
+  gtk_dep,
+  gudev_dep,
+  libnm_glib_dep,
+  libutils_libnm_glib_dep,
+]
+
+cflags = [
+  '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY',
+  '-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(), 'libnm-gtk.ver')
+
+ldflags = []
+if have_version_script
+  ldflags += '-Wl,--version-script,' + symbol_map
+endif
+
+libnm_gtk = shared_library(
+  'nm-gtk',
+  sources: sources,
+  version: libversion,
+  include_directories: incs,
+  dependencies: deps,
+  c_args: cflags,
+  link_args: ldflags,
+  link_depends: symbol_map,
+  link_whole: libwireless_security_libnm_glib,
+  install: true,
+  install_dir: nma_libdir
+)
+
+pkg.generate(
+  libraries: libnm_gtk,
+  version: nma_version,
+  name: lib_name,
+  description: 'NetworkManager UI utilities (libnm-glib version)',
+  filebase: lib_name,
+  subdirs: lib_name,
+  requires: [
+    'NetworkManager ' + nm_req_version,
+    'libnm-util ' + nm_req_version,
+    'libnm-glib ' + nm_req_version,
+    'gtk+-3.0 ' + gtk_req_version
+  ],
+  variables: 'exec_prefix=' + nma_prefix,
+  install_dir: join_paths(nma_libdir, 'pkgconfig')
+)
+
+if enable_introspection
+  gir_incs = [
+    'Gtk-3.0',
+    'NetworkManager-1.0',
+    'NMClient-1.0'
+  ]
+
+  gir_dir = join_paths(nma_datadir, 'gir-' + nma_gir_version)
+  typelib_dir = join_paths(nma_libdir, 'girepository-' + nma_gir_version)
+
+  # FIXME: the generated gir file is slightly different
+  gnome.generate_gir(
+    libnm_gtk,
+    sources: gir_sources + gir_headers,
+    nsversion: nma_gir_version,
+    namespace: nma_gtk_gir_ns,
+    includes: gir_incs,
+    identifier_prefix: nma_gir_prefix,
+    symbol_prefix: nma_gir_prefix.to_lower(),
+    export_packages: lib_name,
+    install: true,
+    install_dir_gir: gir_dir,
+    install_dir_typelib: typelib_dir
+  )
+endif
+
+test_unit = 'test-mobile-providers'
+
+deps = [
+ gtk_dep,
+ libnm_glib_dep
+]
+
+cflags = '-DTEST_DATA_DIR="@0@"'.format(join_paths(meson.current_source_dir(), 'tests'))
+
+exe = executable(
+  test_unit,
+  'tests/' + test_unit + '.c',
+  include_directories: incs,
+  dependencies: deps,
+  c_args: cflags,
+  link_with: libnm_gtk
+)
+
+test(test_unit, exe)
+
+run_target(
+  'check-local-exports-libnm-gtk',
+  command: [find_program('check-exports.sh'), libnm_gtk.full_path(), symbol_map],
+  depends: libnm_gtk
+)
diff -Nru network-manager-applet-1.8.4/src/libnm-gtk/nm-cert-chooser.h network-manager-applet-1.8.10/src/libnm-gtk/nm-cert-chooser.h
--- network-manager-applet-1.8.4/src/libnm-gtk/nm-cert-chooser.h	2017-05-10 10:25:21.000000000 +0000
+++ network-manager-applet-1.8.10/src/libnm-gtk/nm-cert-chooser.h	2017-12-19 11:44:30.000000000 +0000
@@ -25,6 +25,7 @@
 
 #include 
 #include 
+#include 
 
 G_BEGIN_DECLS
 
diff -Nru network-manager-applet-1.8.4/src/meson.build network-manager-applet-1.8.10/src/meson.build
--- network-manager-applet-1.8.4/src/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/src/meson.build	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1,120 @@
+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: true,
+  install_dir: join_paths(nma_includedir, 'libnma')
+)
+
+subdir('utils')
+subdir('wireless-security')
+subdir('libnma')
+
+if enable_libnm_gtk
+  subdir('libnm-gtk')
+endif
+
+subdir('connection-editor')
+
+sources = files(
+  'ap-menu-item.c',
+  'applet-agent.c',
+  'applet.c',
+  'applet-device-bt.c',
+  'applet-device-ethernet.c',
+  'applet-device-wifi.c',
+  'applet-dialogs.c',
+  'applet-vpn-request.c',
+  'ethernet-dialog.c',
+  'main.c',
+  'mb-menu-item.c',
+  'mobile-helpers.c'
+)
+
+resource_data = files(
+  '8021x.ui',
+  'connection-editor/ce-page-dsl.ui',
+  'gsm-unlock.ui',
+  'info.ui'
+)
+
+sources += gnome.compile_resources(
+  'applet-resources',
+  'applet.gresource.xml',
+  dependencies: resource_data
+)
+
+incs = [
+  top_inc,
+  utils_inc,
+  src_inc,
+  shared_inc,
+  wireless_security_inc
+]
+
+deps = [
+  gtk_dep,
+  libnm_dep,
+  libnma_dep,
+  libnotify_dep,
+  libsecret_dep,
+  m_dep
+]
+
+cflags = [
+  '-DBINDIR="@0@"'.format(nma_bindir),
+  '-DDATADIR="@0@"'.format(nma_datadir),
+  '-DLIBDIR="@0@"'.format(nma_libdir),
+  '-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),
+  '-DG_LOG_DOMAIN="@0@"'.format(nma_name)
+]
+
+ldflags = []
+if have_version_script
+  ldflags += '-Wl,--version-script,@0@'.format(linker_script_ver)
+endif
+
+if enable_appindicator
+  deps += [
+    appindicator_dep,
+    dbusmenu_dep
+  ]
+endif
+
+if enable_wwan
+  sources += files('applet-device-broadband.c')
+
+  deps += mm_glib_dep
+endif
+
+executable(
+  nma_name,
+  sources,
+  include_directories: incs,
+  dependencies: deps,
+  c_args: cflags,
+  link_args: ldflags,
+  link_depends: linker_script_ver,
+  link_whole: libwireless_security_libnm,
+  install: true,
+  install_dir: nma_bindir
+)
diff -Nru network-manager-applet-1.8.4/src/utils/meson.build network-manager-applet-1.8.10/src/utils/meson.build
--- network-manager-applet-1.8.4/src/utils/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/src/utils/meson.build	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1,61 @@
+utils_inc = include_directories('.')
+
+incs = [
+  top_inc,
+  shared_inc
+]
+
+deps = [
+  gtk_dep,
+  libnm_dep
+]
+
+libutils_libnm = static_library(
+  'utils-libnm',
+  sources: shared_sources + files(
+    'utils.c',
+  ),
+  include_directories: incs,
+  dependencies: deps
+)
+
+libutils_libnm_dep = declare_dependency(
+  link_with: libutils_libnm,
+  include_directories: utils_inc
+)
+
+test_unit = 'test-utils'
+
+exe = executable(
+  test_unit,
+  'tests/' + test_unit + '.c',
+  include_directories: incs,
+  dependencies: deps,
+  link_with: libutils_libnm
+)
+
+test(test_unit, exe)
+
+if enable_libnm_gtk
+  deps = [
+    gtk_dep,
+    libnm_glib_dep
+  ]
+
+  cflags = '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY'
+
+  libutils_libnm_glib = static_library(
+    'utils-libnm-glib',
+    sources: shared_legacy_sources + files(
+      'utils.c',
+    ),
+    include_directories: incs,
+    dependencies: deps,
+    c_args: cflags
+  )
+
+  libutils_libnm_glib_dep = declare_dependency(
+    link_with: libutils_libnm_glib,
+    include_directories: utils_inc
+  )
+endif
diff -Nru network-manager-applet-1.8.4/src/wireless-security/meson.build network-manager-applet-1.8.10/src/wireless-security/meson.build
--- network-manager-applet-1.8.4/src/wireless-security/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ network-manager-applet-1.8.10/src/wireless-security/meson.build	2017-12-19 11:44:30.000000000 +0000
@@ -0,0 +1,76 @@
+wireless_security_inc = include_directories('.')
+
+sources = [version_header] + files(
+  'eap-method.c',
+  'eap-method-fast.c',
+  'eap-method-leap.c',
+  'eap-method-peap.c',
+  'eap-method-simple.c',
+  'eap-method-tls.c',
+  'eap-method-ttls.c',
+  'helpers.c',
+  'wireless-security.c',
+  'ws-dynamic-wep.c',
+  'ws-leap.c',
+  'ws-wep-key.c',
+  'ws-wpa-eap.c',
+  'ws-wpa-psk.c'
+)
+
+resource_data = files(
+  'eap-method-fast.ui',
+  'eap-method-leap.ui',
+  'eap-method-peap.ui',
+  'eap-method-simple.ui',
+  'eap-method-tls.ui',
+  'eap-method-ttls.ui',
+  'ws-dynamic-wep.ui',
+  'ws-leap.ui',
+  'ws-wep-key.ui',
+  'ws-wpa-eap.ui',
+  'ws-wpa-psk.ui'
+)
+
+sources += gnome.compile_resources(
+  'ws-resources',
+  'ws.gresource.xml',
+  dependencies: resource_data
+)
+
+incs = [
+  top_inc,
+  shared_inc,
+  src_inc,
+  libnma_inc
+]
+
+deps = [
+  gtk_dep,
+  libnm_dep,
+  libutils_libnm_dep
+]
+
+libwireless_security_libnm = static_library(
+  'wireless-security-libnm',
+  sources: sources,
+  include_directories: incs,
+  dependencies: deps
+)
+
+if enable_libnm_gtk
+  deps = [
+    gtk_dep,
+    libnm_glib_dep,
+    libutils_libnm_glib_dep
+  ]
+
+  cflags = '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY'
+
+  libwireless_security_libnm_glib = static_library(
+    'wireless-security-libnm-glib',
+    sources: sources,
+    include_directories: incs,
+    dependencies: deps,
+    c_args: cflags
+  )
+endif
diff -Nru network-manager-applet-1.8.4/test-driver network-manager-applet-1.8.10/test-driver
--- network-manager-applet-1.8.4/test-driver	2017-02-10 06:47:11.000000000 +0000
+++ network-manager-applet-1.8.10/test-driver	2017-08-15 07:25:07.000000000 +0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2013-07-13.22; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -143,6 +143,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End: