nm: Update build files and switch from intltool to gettext

gnome-common has been deprecated, so has intltool.  This follows GNOME's
recommended migration paths.

diff --git a/scripts/test.sh b/scripts/test.sh
index 6d109756691f9a39d50cee386ee4d62e25c492fc..75e50a9c07187890d65745c1e8fd905e495717ca 100755 (executable)
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -445,6 +445,10 @@ fuzzing)
        ;;
 nm)
        DEPS="gnome-common libsecret-1-dev libgtk-3-dev libnm-dev libnma-dev"
+       # Ubuntu 20.04 requires this package explicitly for the ITS rules for the .metainfo.xml file
+       if [ "$ID" = "ubuntu" -a "$VERSION_ID" = "20.04" ]; then
+               DEPS="$DEPS appstream"
+       fi
        cd src/frontends/gnome
        # don't run ./configure with ./autogen.sh
        export NOCONFIGURE=1

diff --git a/src/frontends/gnome/.gitignore b/src/frontends/gnome/.gitignore
index 82fd10c9eb16170a90cbb226e3dc45a1218e4b27..8c03fe56bdb0c9b5d064776222b959bf60d69e46 100644 (file)
--- a/src/frontends/gnome/.gitignore
+++ b/src/frontends/gnome/.gitignore
@@ -1,14 +1,9 @@
+ABOUT-NLS
 compile
-config.h
-config.h.in
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
+config.*
 mkinstalldirs
 nm-strongswan-service.name
 stamp-h1
-config.guess.cdbs-orig
-config.sub.cdbs-orig
 NetworkManager-strongswan.metainfo.xml
 NetworkManager-strongswan.pot
 properties/nm-strongswan-resources.c

diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am
index 3dd41a3bc7c82cae217089edc98b3cd913cfa64d..7d3f390b8c3d2268dc3b745b8b42fd747cc7d1ab 100644 (file)
--- a/src/frontends/gnome/Makefile.am
+++ b/src/frontends/gnome/Makefile.am
@@ -4,12 +4,12 @@ SUBDIRS = properties auth-dialog po
 
 nmvpnservice_DATA = nm-strongswan-service.name
 
-@INTLTOOL_DESKTOP_RULE@
-
 metainfodir = $(datadir)/metainfo
 metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
 metainfo_in_files = NetworkManager-strongswan.metainfo.xml.in
-@INTLTOOL_XML_RULE@
+
+%.xml: %.xml.in
+       $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
        $(AM_V_GEN) \
@@ -20,12 +20,8 @@ nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
 
 EXTRA_DIST = \
     nm-strongswan-service.name.in  \
-    $(metainfo_in_files)  \
-    intltool-extract.in  \
-    intltool-merge.in    \
-    intltool-update.in
+    $(metainfo_in_files)
 
 CLEANFILES = $(nmvpnservice_DATA) $(metainfo_DATA) *~
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 ACLOCAL_AMFLAGS = -I m4

diff --git a/src/frontends/gnome/NetworkManager-strongswan.metainfo.xml.in b/src/frontends/gnome/NetworkManager-strongswan.metainfo.xml.in
index 4f5c0695c9b3c752a00889903ab593ac18f3420f..d22557b9d3cc4f438ef4163afd8b14bb7b21904f 100644 (file)
--- a/src/frontends/gnome/NetworkManager-strongswan.metainfo.xml.in
+++ b/src/frontends/gnome/NetworkManager-strongswan.metainfo.xml.in
@@ -6,23 +6,23 @@
   <metadata_license>CC0-1.0</metadata_license>
   <extends>nm-connection-editor.desktop</extends>
   <extends>gnome-control-center.desktop</extends>
-  <_name>strongSwan VPN client</_name>
-  <_summary>strongSwan based client for IPsec virtual private networks</_summary>
+  <name>strongSwan VPN client</name>
+  <summary>strongSwan based client for IPsec virtual private networks</summary>
 
   <keywords>
-    <keyword>network</keyword>
-    <keyword>manager</keyword>
-    <keyword>NetworkManager</keyword>
-    <keyword>connection</keyword>
-    <keyword>VPN</keyword>
-    <keyword>strongSwan</keyword>
-    <keyword>IPsec</keyword>
-    <keyword>IKEv2</keyword>
+    <keyword translate="no">network</keyword>
+    <keyword translate="no">manager</keyword>
+    <keyword translate="no">NetworkManager</keyword>
+    <keyword translate="no">connection</keyword>
+    <keyword translate="no">VPN</keyword>
+    <keyword translate="no">strongSwan</keyword>
+    <keyword translate="no">IPsec</keyword>
+    <keyword translate="no">IKEv2</keyword>
   </keywords>
 
   <description>
-    <_p>Support for configuring IPsec based virtual private network connections.</_p>
-    <_p>Compatible with IKEv2 key exchange and multiple authentication mechanisms.</_p>
+    <p>Support for configuring IPsec based virtual private network connections.</p>
+    <p>Compatible with IKEv2 key exchange and multiple authentication mechanisms.</p>
   </description>
 
   <screenshots>
@@ -36,5 +36,5 @@
   <url type="help">https://www.strongswan.org/support.html</url>
   <update_contact>info_AT_strongswan.org</update_contact>
   <translation type="gettext">NetworkManager-strongswan</translation>
-  <_developer_name>strongSwan Developers</_developer_name>
+  <developer_name>strongSwan Developers</developer_name>
 </component>

diff --git a/src/frontends/gnome/autogen.sh b/src/frontends/gnome/autogen.sh
index 8a0435c1db63f219ec70b29d49b6a9c06230f4b3..0b84e46396aa367784aa5994f9f94dfbf31c1004 100755 (executable)
--- a/src/frontends/gnome/autogen.sh
+++ b/src/frontends/gnome/autogen.sh
@@ -1,14 +1,38 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-REQUIRED_AUTOMAKE_VERSION=1.7
+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
 
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
-    exit 1
+olddir=$(pwd)
+
+cd $srcdir
+
+(test -f configure.ac) || {
+        echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
+        exit 1
 }
-. gnome-autogen.sh
 
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
+
+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
+        echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
+        echo "*** If you wish to pass any to it, please specify them on the" >&2
+        echo "*** '$0' command line." >&2
+        echo "" >&2
+fi
+
+autoreconf --verbose --force --install || exit 1
+
+cd "$olddir"
+if [ "$NOCONFIGURE" = "" ]; then
+        $srcdir/configure "$@" || exit 1
 
+        if [ "$1" = "--help" ]; then
+                exit 0
+        else
+                echo "Now type 'make' to compile $PKG_NAME" || exit 1
+        fi
+else
+        echo "Skipping configure process."
+fi

diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac
index c374194f775331f41f064fc5426269024028ae04..b12b9654a4e31eb0d8eac9e23501db389247522d 100644 (file)
--- a/src/frontends/gnome/configure.ac
+++ b/src/frontends/gnome/configure.ac
@@ -1,6 +1,6 @@
-AC_PREREQ(2.52)
+AC_PREREQ([2.69])
 
-AC_INIT(NetworkManager-strongswan, 1.6.0, info@strongswan.org, NetworkManager-strongswan)
+AC_INIT([NetworkManager-strongswan],[1.6.0],[info@strongswan.org],[NetworkManager-strongswan])
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE
 
@@ -13,14 +13,13 @@ dnl
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+LT_INIT([disable-static])
 PKG_PROG_PKG_CONFIG
 AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
 
 dnl
 dnl Required headers
 dnl
-AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h paths.h sys/ioctl.h sys/time.h syslog.h unistd.h)
 
 dnl
@@ -28,7 +27,6 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 dnl
 AC_TYPE_MODE_T
 AC_TYPE_PID_T
-AC_HEADER_TIME
 
 dnl
 dnl Checks for library functions.
@@ -40,13 +38,13 @@ AC_CHECK_FUNCS(select socket uname)
 AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
 AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
 
+AM_GNU_GETTEXT_VERSION([0.19])
+AM_GNU_GETTEXT([external])
+
 GETTEXT_PACKAGE=NetworkManager-strongswan
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 
-IT_PROG_INTLTOOL([0.35])
-AM_GLIB_GNU_GETTEXT
-
 PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
 PKG_CHECK_MODULES(LIBSECRET, libsecret-1)
 

diff --git a/src/frontends/gnome/m4/.gitignore b/src/frontends/gnome/m4/.gitignore
index 3d067d03a64bf87583a90f90d6fa9263d29d3477..6be6eec6f0c20f44e44ff666afb483e8ec7424a9 100644 (file)
--- a/src/frontends/gnome/m4/.gitignore
+++ b/src/frontends/gnome/m4/.gitignore
@@ -1,7 +1,38 @@
-intltool.m4
+codeset.m4
+extern-inline.m4
+fcntl-o.m4
+glibc2.m4
+glibc21.m4
+gettext.m4
+host-cpu-c-abi.m4
+iconv.m4
+intdiv0.m4
+intl.m4
+intldir.m4
+intlmacosx.m4
+intmax.m4
+inttypes-pri.m4
+inttypes_h.m4
+lcmessage.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
 libtool.m4
+lock.m4
+longlong.m4
 ltoptions.m4
 ltsugar.m4
 ltversion.m4
 lt~obsolete.m4
-
+nls.m4
+po.m4
+printf-posix.m4
+progtest.m4
+size_max.m4
+stdint_h.m4
+threadlib.m4
+uintmax_t.m4
+visibility.m4
+wchar_t.m4
+wint_t.m4
+xsize.m4

diff --git a/src/frontends/gnome/m4/compiler_warnings.m4 b/src/frontends/gnome/m4/compiler_warnings.m4
index 6cea2f74e71204be7e1ccb5e6411cf25f459dd02..f5cfbe4643219a1593499886004298cffe8c7a40 100644 (file)
--- a/src/frontends/gnome/m4/compiler_warnings.m4
+++ b/src/frontends/gnome/m4/compiler_warnings.m4
@@ -14,9 +14,9 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
                SAVE_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $option"
                AC_MSG_CHECKING([whether gcc understands $option])
-               AC_TRY_COMPILE([], [],
-                       has_option=yes,
-                       has_option=no,)
+               AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+                       [has_option=yes],
+                       [has_option=no])
                if test $has_option = no; then
                        CFLAGS="$SAVE_CFLAGS"
                fi

diff --git a/src/frontends/gnome/po/.gitignore b/src/frontends/gnome/po/.gitignore
index 53b34e577727fbcefd1f60aaa6f378fbddb98b02..bc8a513c9c105544231fbf3f026eba9d9405203c 100644 (file)
--- a/src/frontends/gnome/po/.gitignore
+++ b/src/frontends/gnome/po/.gitignore
@@ -1,6 +1,13 @@
 Makefile.in.in
+Makevars.template
 POTFILES
 de.gmo
-stamp-it
-.intltool-merge-cache
-.intltool-merge-cache.lock
+stamp-po
+boldquot.sed
+en@boldquot.header
+en@quot.header
+insert-header.sin
+quot.sed
+remove-potcdate.sed
+remove-potcdate.sin
+Rules-quot

diff --git a/src/frontends/gnome/po/Makevars b/src/frontends/gnome/po/Makevars
new file mode 100644 (file)
index 0000000..337f065
--- /dev/null
+++ b/src/frontends/gnome/po/Makevars
@@ -0,0 +1,14 @@
+DOMAIN = $(PACKAGE)
+
+subdir = po
+top_builddir = ..
+
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --add-comments
+
+COPYRIGHT_HOLDER = strongSwan Developers
+
+MSGID_BUGS_ADDRESS = https://github.com/strongswan/strongswan
+
+# play nice with Git
+PO_DEPENDS_ON_POT = no
+DIST_DEPENDS_ON_UPDATE_PO = no

diff --git a/src/frontends/gnome/po/POTFILES.in b/src/frontends/gnome/po/POTFILES.in
index f35860687980d478ec1bb3878577961238e7c06e..839729d60e7233ec396bbc1df857ffc0dac2f76f 100644 (file)
--- a/src/frontends/gnome/po/POTFILES.in
+++ b/src/frontends/gnome/po/POTFILES.in
@@ -2,6 +2,6 @@
 # Please keep this file sorted alphabetically.
 properties/nm-strongswan-plugin.c
 properties/nm-strongswan.c
-[type: gettext/glade]properties/nm-strongswan-dialog.ui
+properties/nm-strongswan-dialog.ui
 auth-dialog/main.c
 NetworkManager-strongswan.metainfo.xml.in

diff --git a/src/frontends/gnome/po/de.po b/src/frontends/gnome/po/de.po
index fbb8da01a4318a2e779f2fdd8f82fbd1877ad11a..a0744bbd19023d8e77ae7ea396db90cd58171910 100644 (file)
--- a/src/frontends/gnome/po/de.po
+++ b/src/frontends/gnome/po/de.po
@@ -7,109 +7,111 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-strongswan\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-20 17:19+0200\n"
+"Report-Msgid-Bugs-To: https://github.com/strongswan/strongswan\n"
+"POT-Creation-Date: 2024-10-15 17:58+0200\n"
 "PO-Revision-Date: 2019-12-18 17:10+0100\n"
 "Last-Translator: Tobias Brunner\n"
 "Language-Team: de <info@strongswan.org>\n"
-"Language: German\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../properties/nm-strongswan-plugin.c:36
+#: properties/nm-strongswan-plugin.c:35
 msgid "IPsec/IKEv2 (strongswan)"
 msgstr "IPsec/IKEv2 (strongswan)"
 
-#: ../properties/nm-strongswan-plugin.c:37
+#: properties/nm-strongswan-plugin.c:36
 msgid "IPsec with the IKEv2 key exchange protocol."
 msgstr "IPsec mit dem IKEv2 Protokoll."
 
-#: ../properties/nm-strongswan-plugin.c:80
+#: properties/nm-strongswan-plugin.c:97
 #, c-format
 msgid "unable to determine plugin path: %s"
 msgstr "Plugin-Pfad konnte nicht ermittelt werden: %s"
 
-#: ../properties/nm-strongswan-plugin.c:93
+#: properties/nm-strongswan-plugin.c:110
 #, c-format
 msgid "missing plugin file '%s'"
 msgstr "Plugin-Datei '%s' fehlt"
 
-#: ../properties/nm-strongswan-plugin.c:98
+#: properties/nm-strongswan-plugin.c:115
 #, c-format
 msgid "unable to load editor plugin: %s"
 msgstr "Laden des Editor-Plugins fehlgeschlagen: %s"
 
-#: ../properties/nm-strongswan-plugin.c:108
+#: properties/nm-strongswan-plugin.c:125
 #, c-format
 msgid "cannot load factory %s from plugin: %s"
 msgstr "Factory %s konnte nicht aus Plugin geladen werden: %s"
 
-#: ../properties/nm-strongswan-plugin.c:124
+#: properties/nm-strongswan-plugin.c:142
 msgid "unknown error creating editor instance"
 msgstr "Unbekannter Fehler beim Erstellen der Editor-Instanz"
 
-#: ../properties/nm-strongswan.c:255
+#: properties/nm-strongswan.c:269
 msgid "(None)"
 msgstr "(Nicht festgelegt)"
 
-#: ../properties/nm-strongswan.c:420
+#: properties/nm-strongswan.c:433
 msgid "EAP (Username/Password)"
 msgstr "EAP (Benutzername/Passwort)"
 
-#: ../properties/nm-strongswan.c:421
+#: properties/nm-strongswan.c:434
 msgid "Certificate"
 msgstr "Zertifikat"
 
-#: ../properties/nm-strongswan.c:422
+#: properties/nm-strongswan.c:435
 msgid "EAP-TLS"
 msgstr "EAP-TLS"
 
-#: ../properties/nm-strongswan.c:423
+#: properties/nm-strongswan.c:436
 msgid "Pre-shared key"
 msgstr "Pre-shared Key"
 
-#: ../properties/nm-strongswan.c:449
+#: properties/nm-strongswan.c:462
 msgid "Certificate/private key"
 msgstr "Zertifikat/Privater Schlüssel"
 
-#: ../properties/nm-strongswan.c:450
+#: properties/nm-strongswan.c:463
 msgid "Certificate/ssh-agent"
 msgstr "Zertifikat/ssh-agent"
 
-#: ../properties/nm-strongswan.c:451
+#: properties/nm-strongswan.c:464
 msgid "Smartcard"
 msgstr "Smartcard"
 
-#: ../properties/nm-strongswan-dialog.ui.h:1
+#: properties/nm-strongswan-dialog.ui:15
 msgid "Choose a server or CA certificate…"
 msgstr "Server- oder CA-Zertifikat auswählen…"
 
-#: ../properties/nm-strongswan-dialog.ui.h:2
+#: properties/nm-strongswan-dialog.ui:25 properties/nm-strongswan-dialog.ui:765
+#: properties/nm-strongswan-dialog.ui:818
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: ../properties/nm-strongswan-dialog.ui.h:3
+#: properties/nm-strongswan-dialog.ui:34 properties/nm-strongswan-dialog.ui:774
+#: properties/nm-strongswan-dialog.ui:827
 msgid "_Select"
 msgstr "_Auswählen"
 
-#: ../properties/nm-strongswan-dialog.ui.h:4
+#: properties/nm-strongswan-dialog.ui:74
 msgid "<b>Server</b>"
 msgstr "<b>Server</b>"
 
-#: ../properties/nm-strongswan-dialog.ui.h:5
+#: properties/nm-strongswan-dialog.ui:97
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:6
+#: properties/nm-strongswan-dialog.ui:110
 msgid "An IP address or hostname of the VPN server."
 msgstr "Eine IP-Adresse oder ein Hostname des VPN Servers."
 
-#: ../properties/nm-strongswan-dialog.ui.h:7
+#: properties/nm-strongswan-dialog.ui:122
 msgid "C_ertificate:"
 msgstr "Z_ertifikat:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:8
+#: properties/nm-strongswan-dialog.ui:136
 msgid ""
 "Server or CA certificate to use for server authentication. If none is "
 "specified, pre-installed CA certificates are used."
@@ -117,11 +119,11 @@ msgstr ""
 "Server- oder CA-Zertifikat für die Authentisierung des Servers. Ohne Angabe "
 "eines Zertifikates werden die CA-Zertifikate des Systems verwendet."
 
-#: ../properties/nm-strongswan-dialog.ui.h:9
+#: properties/nm-strongswan-dialog.ui:177
 msgid "_Identity:"
 msgstr "_Identität:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:10
+#: properties/nm-strongswan-dialog.ui:190
 msgid ""
 "Defaults to the server address or the server certificate's subject DN (if "
 "configured). Custom values are explicitly sent to the server and enforced "
@@ -131,35 +133,35 @@ msgstr ""
 "Zertifikats (falls konfiguriert). Eigene Werte werden explizit an den Server "
 "gesendet und während der Authentifizierung erzwungen."
 
-#: ../properties/nm-strongswan-dialog.ui.h:11
+#: properties/nm-strongswan-dialog.ui:192
 msgid "(Defaults to address or certificate subject)"
 msgstr "(Standardwert ist die Adresse oder die Zertifikats-Identität)"
 
-#: ../properties/nm-strongswan-dialog.ui.h:12
+#: properties/nm-strongswan-dialog.ui:223
 msgid "<b>Client</b>"
 msgstr "<b>Client</b>"
 
-#: ../properties/nm-strongswan-dialog.ui.h:13
+#: properties/nm-strongswan-dialog.ui:246
 msgid "Au_thentication:"
 msgstr "Au_thentisierung:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:14
+#: properties/nm-strongswan-dialog.ui:270
 msgid "Ce_rtificate:"
 msgstr "Ze_rtifikat:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:15
+#: properties/nm-strongswan-dialog.ui:294
 msgid "Certificate _file:"
 msgstr "Z_ertifikatsdatei:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:16
+#: properties/nm-strongswan-dialog.ui:308
 msgid "Client certificate to use for client authentication."
 msgstr "Zertifikat des Clients für dessen Authentisierung."
 
-#: ../properties/nm-strongswan-dialog.ui.h:17
+#: properties/nm-strongswan-dialog.ui:349
 msgid "Private _key:"
 msgstr "Privater _Schlüssel:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:18
+#: properties/nm-strongswan-dialog.ui:363
 msgid ""
 "Private key to use for client authentication. This key has to match the "
 "certificates public key and may be encrypted."
@@ -167,21 +169,21 @@ msgstr ""
 "Privater Schlüssel für die Authentisierung des Clients. Dieser Schlüssel "
 "muss zum konfigurierten Zertifikat passen und kann verschlüsselt sein."
 
-#: ../properties/nm-strongswan-dialog.ui.h:19
+#: properties/nm-strongswan-dialog.ui:404
 msgid "_Username:"
 msgstr "_Benutzername:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:20
+#: properties/nm-strongswan-dialog.ui:417
 msgid ""
 "The username (EAP identity) to use for authentication against the server."
 msgstr ""
 "Benutzername/EAP-Identität für die Authentisierung gegenüber dem Server."
 
-#: ../properties/nm-strongswan-dialog.ui.h:21
+#: properties/nm-strongswan-dialog.ui:429
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:22
+#: properties/nm-strongswan-dialog.ui:442
 msgid ""
 "The password to use for authentication against the server (min. 20 "
 "characters for PSKs)."
@@ -189,19 +191,19 @@ msgstr ""
 "Das Passwort für die Authentisierung gegenüber dem Server (min. 20 Zeichen "
 "für PSKs)."
 
-#: ../properties/nm-strongswan-dialog.ui.h:23
+#: properties/nm-strongswan-dialog.ui:445
 msgid "(Use icon to change password storage policy)"
 msgstr "(Icon verwenden, um Passwort-Richtlinie zu ändern)"
 
-#: ../properties/nm-strongswan-dialog.ui.h:24
+#: properties/nm-strongswan-dialog.ui:454
 msgid "_Show password"
 msgstr "Passwort _anzeigen"
 
-#: ../properties/nm-strongswan-dialog.ui.h:25
+#: properties/nm-strongswan-dialog.ui:471
 msgid "I_dentity:"
 msgstr "I_dentität:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:26
+#: properties/nm-strongswan-dialog.ui:484
 msgid ""
 "Defaults to the username (EAP), the client certificate's subject DN "
 "(certificate/EAP-TLS), or the IP address (PSK). Custom values may be used if "
@@ -211,15 +213,15 @@ msgstr ""
 "Zertifikats (Zertifikat/EAP-TLS) oder die IP-Adresse (PSK). Eigene Werte "
 "können verwendet werden, falls der Server diese erwartet/benötigt."
 
-#: ../properties/nm-strongswan-dialog.ui.h:27
+#: properties/nm-strongswan-dialog.ui:486
 msgid "(Defaults to username, certificate subject or IP address)"
 msgstr "(Standardwert ist der Benutzername, die Zertifikats-ID oder die IP)"
 
-#: ../properties/nm-strongswan-dialog.ui.h:28
+#: properties/nm-strongswan-dialog.ui:525
 msgid "Request an _inner IP address"
 msgstr "_Innere IP-Adresse beziehen"
 
-#: ../properties/nm-strongswan-dialog.ui.h:29
+#: properties/nm-strongswan-dialog.ui:529
 msgid ""
 "The server may provide addresses from a pool to use for communication in the "
 "VPN. Check to request such an address."
@@ -228,11 +230,11 @@ msgstr ""
 "Kommunikation im dahinterliegenden Netz verwenden kann. Aktivieren, um eine "
 "solche Adresse zu beziehen."
 
-#: ../properties/nm-strongswan-dialog.ui.h:30
+#: properties/nm-strongswan-dialog.ui:541
 msgid "En_force UDP encapsulation"
 msgstr "Erzwingen einer zusätzlichen Einbettung der Datenpakete in _UDP"
 
-#: ../properties/nm-strongswan-dialog.ui.h:31
+#: properties/nm-strongswan-dialog.ui:545
 msgid ""
 "Some firewalls block ESP traffic. Enforcing UDP capsulation even if no NAT "
 "situation is detected might help in such cases."
@@ -241,11 +243,11 @@ msgstr ""
 "erzwingen einer zustzlichen Einbettung in UDP, auch wenn kein NAT-Router "
 "detektiert wurde, kann in solchen Situationen hilfreich sein."
 
-#: ../properties/nm-strongswan-dialog.ui.h:32
+#: properties/nm-strongswan-dialog.ui:557
 msgid "Use IP c_ompression"
 msgstr "IP-Pakete k_omprimieren"
 
-#: ../properties/nm-strongswan-dialog.ui.h:33
+#: properties/nm-strongswan-dialog.ui:561
 msgid ""
 "IPComp compresses raw IP packets before they get encrypted. This saves some "
 "bandwidth, but uses more processing power."
@@ -253,11 +255,11 @@ msgstr ""
 "IPComp komprimiert IP-Pakete, bevor sie verschlüsselt werden. Diese Option "
 "kann Bandbreite sparen, benötigt jedoch zusätzliche Rechenleistung."
 
-#: ../properties/nm-strongswan-dialog.ui.h:34
+#: properties/nm-strongswan-dialog.ui:583
 msgid "Server _port:"
 msgstr "Server-_Port:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:35
+#: properties/nm-strongswan-dialog.ui:596
 msgid ""
 "Custom server port to connect to. Defaults to UDP port 500, which is "
 "followed by a switch to port 4500 after the first exchange."
@@ -265,53 +267,53 @@ msgstr ""
 "Server-Port zu dem verbunden wird. Ohne Konfiguration wird UDP-Port 500 "
 "verwendet, mit einem Wechsel auf Port 4500 nach der ersten Nachricht."
 
-#: ../properties/nm-strongswan-dialog.ui.h:36
+#: properties/nm-strongswan-dialog.ui:599
 msgid "(Defaults to UDP 500/4500)"
 msgstr "(Standardwert ist UDP 500/4500)"
 
-#: ../properties/nm-strongswan-dialog.ui.h:37
+#: properties/nm-strongswan-dialog.ui:619
 msgid "Options"
 msgstr "Optionen"
 
-#: ../properties/nm-strongswan-dialog.ui.h:38
+#: properties/nm-strongswan-dialog.ui:635
 msgid "_Enable custom algorithm proposals"
 msgstr "_Eigene Algorithmen verwenden"
 
-#: ../properties/nm-strongswan-dialog.ui.h:39
+#: properties/nm-strongswan-dialog.ui:660
 msgid "_IKE:"
 msgstr "_IKE:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:40
+#: properties/nm-strongswan-dialog.ui:673
 msgid "A list of proposals for IKE separated by \";\""
 msgstr "Eine Liste von Proposals für IKE getrennt mit \";\""
 
-#: ../properties/nm-strongswan-dialog.ui.h:41
+#: properties/nm-strongswan-dialog.ui:686
 msgid "_ESP:"
 msgstr "_ESP:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:42
+#: properties/nm-strongswan-dialog.ui:699
 msgid "A list of proposals for ESP separated by \";\""
 msgstr "Eine Liste von Proposals für ESP getrennt mit \";\""
 
-#: ../properties/nm-strongswan-dialog.ui.h:43
+#: properties/nm-strongswan-dialog.ui:724
 msgid "Algorithms"
 msgstr "Algorithmen"
 
-#: ../properties/nm-strongswan-dialog.ui.h:44
+#: properties/nm-strongswan-dialog.ui:755
 msgid "Choose a client certificate…"
 msgstr "Client-Zertifikat auswählen…"
 
-#: ../properties/nm-strongswan-dialog.ui.h:45
+#: properties/nm-strongswan-dialog.ui:808
 msgid "Choose a private key…"
 msgstr "Privaten Schlüssel auswählen…"
 
-#: ../auth-dialog/main.c:137
+#: auth-dialog/main.c:136
 #, c-format
 msgid "EAP password required to establish VPN connection '%s'."
 msgstr ""
 "Für die Erstellung des VPN-Tunnels '%s' ist ein EAP-Passwort erforderlich."
 
-#: ../auth-dialog/main.c:142
+#: auth-dialog/main.c:141
 #, c-format
 msgid ""
 "Pre-shared key required to establish VPN connection '%s' (min. 20 "
@@ -320,14 +322,14 @@ msgstr ""
 "Für die Erstellung des VPN-Tunnels '%s' ist ein Pre-shared Key erforderlich "
 "(min. 20 Zeichen)."
 
-#: ../auth-dialog/main.c:150
+#: auth-dialog/main.c:149
 #, c-format
 msgid "Smartcard PIN required to establish VPN connection '%s'."
 msgstr ""
 "Die Smartcard für die Erstellung des VPN-Tunnels '%s' ist durch eine PIN "
 "geschützt."
 
-#: ../auth-dialog/main.c:155
+#: auth-dialog/main.c:154
 #, c-format
 msgid ""
 "Private key decryption password required to establish VPN connection '%s'."
@@ -335,16 +337,15 @@ msgstr ""
 "Der Private Schlüssel für die Erstellung des VPN-Tunnels '%s' ist durch ein "
 "Passwort geschützt."
 
-#: ../auth-dialog/main.c:167 ../auth-dialog/main.c:185
-#: ../auth-dialog/main.c:328
+#: auth-dialog/main.c:166 auth-dialog/main.c:184 auth-dialog/main.c:327
 msgid "Authenticate VPN"
 msgstr "VPN Authentisierung"
 
-#: ../auth-dialog/main.c:169
+#: auth-dialog/main.c:168
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../auth-dialog/main.c:346
+#: auth-dialog/main.c:345
 msgid ""
 "Configuration uses ssh-agent for authentication, but ssh-agent is not "
 "running!"
@@ -352,27 +353,27 @@ msgstr ""
 "Die Konfiguration verwendet ssh-agent für die Authentisierung, aber ssh-"
 "agent ist nicht gestartet!"
 
-#: ../NetworkManager-strongswan.metainfo.xml.in.h:1
+#: NetworkManager-strongswan.metainfo.xml.in:9
 msgid "strongSwan VPN client"
 msgstr "strongSwan VPN Client"
 
-#: ../NetworkManager-strongswan.metainfo.xml.in.h:2
+#: NetworkManager-strongswan.metainfo.xml.in:10
 msgid "strongSwan based client for IPsec virtual private networks"
 msgstr "Auf strongSwan basierender Client für IPsec VPNs"
 
-#: ../NetworkManager-strongswan.metainfo.xml.in.h:3
+#: NetworkManager-strongswan.metainfo.xml.in:24
 msgid ""
 "Support for configuring IPsec based virtual private network connections."
 msgstr ""
 "Unterstützung für die Konfiguration von IPsec-basierten VPN Verbindungen."
 
-#: ../NetworkManager-strongswan.metainfo.xml.in.h:4
+#: NetworkManager-strongswan.metainfo.xml.in:25
 msgid ""
 "Compatible with IKEv2 key exchange and multiple authentication mechanisms."
 msgstr ""
 "Kompatibel mit dem IKEv2 Schlüsselaustausch-Protokoll und verschiedenen "
 "Authentisierungsmethoden."
 
-#: ../NetworkManager-strongswan.metainfo.xml.in.h:5
+#: NetworkManager-strongswan.metainfo.xml.in:39
 msgid "strongSwan Developers"
 msgstr "strongSwan Entwickler"