New upstream version 1.5.2

9 files changed, 185 insertions, 201 deletions

diff --git a/Makefile.am b/Makefile.am
index 9b8c676..646d913 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,9 +6,9 @@ nmvpnservice_DATA = nm-strongswan-service.name
 
 @INTLTOOL_DESKTOP_RULE@
 
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = NetworkManager-strongswan.appdata.xml.in
+metainfodir = $(datadir)/metainfo
+metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
+metainfo_in_files = NetworkManager-strongswan.metainfo.xml.in
 @INTLTOOL_XML_RULE@
 
 if WITH_LIBNM_GLIB
@@ -37,12 +37,12 @@ nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
 
 EXTRA_DIST = \
     nm-strongswan-service.name.in  \
-    $(appdata_in_files)  \
+    $(metainfo_in_files)  \
     intltool-extract.in  \
     intltool-merge.in    \
     intltool-update.in
 
-CLEANFILES = $(nmvpnservice_DATA) $(appdata_DATA) *~
+CLEANFILES = $(nmvpnservice_DATA) $(metainfo_DATA) *~
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/Makefile.in b/Makefile.in
index dc8f442..7dd92c8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -159,9 +159,9 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(appdatadir)" \
+am__installdirs = "$(DESTDIR)$(metainfodir)" \
 	"$(DESTDIR)$(nmvpnservicedir)"
-DATA = $(appdata_DATA) $(nmvpnservice_DATA)
+DATA = $(metainfo_DATA) $(nmvpnservice_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -406,17 +406,17 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = properties auth-dialog po
 nmvpnservice_DATA = nm-strongswan-service.name
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = NetworkManager-strongswan.appdata.xml.in
+metainfodir = $(datadir)/metainfo
+metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
+metainfo_in_files = NetworkManager-strongswan.metainfo.xml.in
 EXTRA_DIST = \
     nm-strongswan-service.name.in  \
-    $(appdata_in_files)  \
+    $(metainfo_in_files)  \
     intltool-extract.in  \
     intltool-merge.in    \
     intltool-update.in
 
-CLEANFILES = $(nmvpnservice_DATA) $(appdata_DATA) *~
+CLEANFILES = $(nmvpnservice_DATA) $(metainfo_DATA) *~
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 ACLOCAL_AMFLAGS = -I m4
 all: config.h
@@ -480,27 +480,27 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool config.lt
-install-appdataDATA: $(appdata_DATA)
+install-metainfoDATA: $(metainfo_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+	@list='$(metainfo_DATA)'; test -n "$(metainfodir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(metainfodir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(metainfodir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(metainfodir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(metainfodir)" || exit $$?; \
 	done
 
-uninstall-appdataDATA:
+uninstall-metainfoDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+	@list='$(metainfo_DATA)'; test -n "$(metainfodir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
+	dir='$(DESTDIR)$(metainfodir)'; $(am__uninstall_files_from_dir)
 install-nmvpnserviceDATA: $(nmvpnservice_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(nmvpnservice_DATA)'; test -n "$(nmvpnservicedir)" || list=; \
@@ -822,7 +822,7 @@ check: check-recursive
 all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(nmvpnservicedir)"; do \
+	for dir in "$(DESTDIR)$(metainfodir)" "$(DESTDIR)$(nmvpnservicedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -881,7 +881,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-appdataDATA install-nmvpnserviceDATA
+install-data-am: install-metainfoDATA install-nmvpnserviceDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-recursive
@@ -928,7 +928,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-appdataDATA uninstall-nmvpnserviceDATA
+uninstall-am: uninstall-metainfoDATA uninstall-nmvpnserviceDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 .MAKE: $(am__recursive_targets) all install-am install-data-am \
@@ -941,16 +941,16 @@ uninstall-am: uninstall-appdataDATA uninstall-nmvpnserviceDATA
 	dist-xz dist-zip distcheck distclean distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags distcleancheck \
 	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-appdataDATA install-data \
-	install-data-am install-data-hook install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man \
+	info-am install install-am install-data install-data-am \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-metainfoDATA \
 	install-nmvpnserviceDATA install-pdf install-pdf-am install-ps \
 	install-ps-am install-strip installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-appdataDATA uninstall-hook \
+	uninstall-am uninstall-hook uninstall-metainfoDATA \
 	uninstall-nmvpnserviceDATA
 
 .PRECIOUS: Makefile
diff --git a/NEWS b/NEWS
index 75ed893..f5e48ce 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+NetworkManager-strongswan-1.5.2
+-------------------------------
+
+- Reduce height of config dialog by moving options/proposals to tabs
+- Migrated appdata to metainfo (renamed and moved the file)
+
 NetworkManager-strongswan-1.5.1
 -------------------------------
 
diff --git a/NetworkManager-strongswan.appdata.xml.in b/NetworkManager-strongswan.metainfo.xml.in
index e2b8998..e2b8998 100644
--- a/NetworkManager-strongswan.appdata.xml.in
+++ b/NetworkManager-strongswan.metainfo.xml.in
diff --git a/configure b/configure
index ea3f3b2..299098e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for NetworkManager-strongswan 1.5.1.
+# Generated by GNU Autoconf 2.69 for NetworkManager-strongswan 1.5.2.
 #
 # Report bugs to <info@strongswan.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager-strongswan'
 PACKAGE_TARNAME='NetworkManager-strongswan'
-PACKAGE_VERSION='1.5.1'
-PACKAGE_STRING='NetworkManager-strongswan 1.5.1'
+PACKAGE_VERSION='1.5.2'
+PACKAGE_STRING='NetworkManager-strongswan 1.5.2'
 PACKAGE_BUGREPORT='info@strongswan.org'
 PACKAGE_URL=''
 
@@ -1420,7 +1420,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures NetworkManager-strongswan 1.5.1 to adapt to many kinds of systems.
+\`configure' configures NetworkManager-strongswan 1.5.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1492,7 +1492,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager-strongswan 1.5.1:";;
+     short | recursive ) echo "Configuration of NetworkManager-strongswan 1.5.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1640,7 +1640,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager-strongswan configure 1.5.1
+NetworkManager-strongswan configure 1.5.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2063,7 +2063,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by NetworkManager-strongswan $as_me 1.5.1, which was
+It was created by NetworkManager-strongswan $as_me 1.5.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2926,7 +2926,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager-strongswan'
- VERSION='1.5.1'
+ VERSION='1.5.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15148,7 +15148,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by NetworkManager-strongswan $as_me 1.5.1, which was
+This file was extended by NetworkManager-strongswan $as_me 1.5.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15214,7 +15214,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-NetworkManager-strongswan config.status 1.5.1
+NetworkManager-strongswan config.status 1.5.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 0a5e5ec..f92049b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.52)
 
-AC_INIT(NetworkManager-strongswan, 1.5.1, info@strongswan.org, NetworkManager-strongswan)
+AC_INIT(NetworkManager-strongswan, 1.5.2, info@strongswan.org, NetworkManager-strongswan)
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8c56a13..1b05c10 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,4 +3,4 @@
 properties/nm-strongswan.c
 [type: gettext/glade]properties/nm-strongswan-dialog.ui
 auth-dialog/main.c
-NetworkManager-strongswan.appdata.xml.in
+NetworkManager-strongswan.metainfo.xml.in
diff --git a/po/de.po b/po/de.po
index 91486fa..7ab216f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-strongswan\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-12 12:06+0100\n"
+"POT-Creation-Date: 2020-05-18 18:12+0200\n"
 "PO-Revision-Date: 2019-12-18 17:10+0100\n"
 "Last-Translator: Tobias Brunner\n"
 "Language-Team: de <info@strongswan.org>\n"
@@ -25,31 +25,31 @@ msgstr "IPsec/IKEv2 (strongswan)"
 msgid "IPsec with the IKEv2 key exchange protocol."
 msgstr "IPsec mit dem IKEv2 Protokoll."
 
-#: ../properties/nm-strongswan.c:366
+#: ../properties/nm-strongswan.c:367
 msgid "EAP (Username/Password)"
 msgstr "EAP (Benutzername/Passwort)"
 
-#: ../properties/nm-strongswan.c:367
+#: ../properties/nm-strongswan.c:368
 msgid "Certificate"
 msgstr "Zertifikat"
 
-#: ../properties/nm-strongswan.c:368
+#: ../properties/nm-strongswan.c:369
 msgid "EAP-TLS"
 msgstr "EAP-TLS"
 
-#: ../properties/nm-strongswan.c:369
+#: ../properties/nm-strongswan.c:370
 msgid "Pre-shared key"
 msgstr "Pre-shared Key"
 
-#: ../properties/nm-strongswan.c:395
+#: ../properties/nm-strongswan.c:396
 msgid "Certificate/private key"
 msgstr "Zertifikat/Privater Schlüssel"
 
-#: ../properties/nm-strongswan.c:396
+#: ../properties/nm-strongswan.c:397
 msgid "Certificate/ssh-agent"
 msgstr "Zertifikat/ssh-agent"
 
-#: ../properties/nm-strongswan.c:397
+#: ../properties/nm-strongswan.c:398
 msgid "Smartcard"
 msgstr "Smartcard"
 
@@ -96,46 +96,30 @@ msgid "(Defaults to address or certificate subject)"
 msgstr "(Standardwert ist die Adresse oder die Zertifikats-Identität)"
 
 #: ../properties/nm-strongswan-dialog.ui.h:9
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../properties/nm-strongswan-dialog.ui.h:10
-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."
-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:11
-msgid "(Defaults to UDP 500/4500)"
-msgstr "(Standardwert ist UDP 500/4500)"
-
-#: ../properties/nm-strongswan-dialog.ui.h:12
 msgid "<b>Client</b>"
 msgstr "<b>Client</b>"
 
-#: ../properties/nm-strongswan-dialog.ui.h:13
+#: ../properties/nm-strongswan-dialog.ui.h:10
 msgid "Au_thentication:"
 msgstr "Au_thentisierung:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:14
+#: ../properties/nm-strongswan-dialog.ui.h:11
 msgid "Ce_rtificate:"
 msgstr "Ze_rtifikat:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:15
+#: ../properties/nm-strongswan-dialog.ui.h:12
 msgid "Certificate _file:"
 msgstr "Z_ertifikatsdatei:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:16
+#: ../properties/nm-strongswan-dialog.ui.h:13
 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.h:14
 msgid "Private _key:"
 msgstr "Privater _Schlüssel:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:18
+#: ../properties/nm-strongswan-dialog.ui.h:15
 msgid ""
 "Private key to use for client authentication. This key has to match the "
 "certificates public key and may be encrypted."
@@ -143,21 +127,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.h:16
 msgid "_Username:"
 msgstr "_Benutzername:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:20
+#: ../properties/nm-strongswan-dialog.ui.h:17
 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.h:18
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:22
+#: ../properties/nm-strongswan-dialog.ui.h:19
 msgid ""
 "The password to use for authentication against the server (min. 20 "
 "characters for PSKs)."
@@ -165,19 +149,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.h:20
 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.h:21
 msgid "_Show password"
 msgstr "Passwort _anzeigen"
 
-#: ../properties/nm-strongswan-dialog.ui.h:25
+#: ../properties/nm-strongswan-dialog.ui.h:22
 msgid "I_dentity:"
 msgstr "I_dentität:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:26
+#: ../properties/nm-strongswan-dialog.ui.h:23
 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 "
@@ -187,19 +171,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.h:24
 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
-msgid "<b>Options</b>"
-msgstr "<b>Optionen</b>"
-
-#: ../properties/nm-strongswan-dialog.ui.h:29
+#: ../properties/nm-strongswan-dialog.ui.h:25
 msgid "Request an _inner IP address"
 msgstr "_Innere IP-Adresse beziehen"
 
-#: ../properties/nm-strongswan-dialog.ui.h:30
+#: ../properties/nm-strongswan-dialog.ui.h:26
 msgid ""
 "The server may provide addresses from a pool to use for communication in the "
 "VPN. Check to request such an address."
@@ -208,11 +188,11 @@ msgstr ""
 "Kommunikation im dahinterliegenden Netz verwenden kann. Aktivieren, um eine "
 "solche Adresse zu beziehen."
 
-#: ../properties/nm-strongswan-dialog.ui.h:31
+#: ../properties/nm-strongswan-dialog.ui.h:27
 msgid "En_force UDP encapsulation"
 msgstr "Erzwingen einer zusätzlichen Einbettung der Datenpakete in _UDP"
 
-#: ../properties/nm-strongswan-dialog.ui.h:32
+#: ../properties/nm-strongswan-dialog.ui.h:28
 msgid ""
 "Some firewalls block ESP traffic. Enforcing UDP capsulation even if no NAT "
 "situation is detected might help in such cases."
@@ -221,11 +201,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:33
+#: ../properties/nm-strongswan-dialog.ui.h:29
 msgid "Use IP c_ompression"
 msgstr "IP-Pakete k_omprimieren"
 
-#: ../properties/nm-strongswan-dialog.ui.h:34
+#: ../properties/nm-strongswan-dialog.ui.h:30
 msgid ""
 "IPComp compresses raw IP packets before they get encrypted. This saves some "
 "bandwidth, but uses more processing power."
@@ -233,30 +213,50 @@ 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:35
-msgid "<b>Cipher proposals</b>"
-msgstr "<b>Algorithmen</b>"
+#: ../properties/nm-strongswan-dialog.ui.h:31
+msgid "Server _port:"
+msgstr "Server-_Port:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:36
-msgid "_Enable custom proposals"
+#: ../properties/nm-strongswan-dialog.ui.h:32
+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."
+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:33
+msgid "(Defaults to UDP 500/4500)"
+msgstr "(Standardwert ist UDP 500/4500)"
+
+#: ../properties/nm-strongswan-dialog.ui.h:34
+msgid "Options"
+msgstr "Optionen"
+
+#: ../properties/nm-strongswan-dialog.ui.h:35
+msgid "_Enable custom algorithm proposals"
 msgstr "_Eigene Algorithmen verwenden"
 
-#: ../properties/nm-strongswan-dialog.ui.h:37
+#: ../properties/nm-strongswan-dialog.ui.h:36
 msgid "_IKE:"
 msgstr "_IKE:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:38
+#: ../properties/nm-strongswan-dialog.ui.h:37
 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:39
+#: ../properties/nm-strongswan-dialog.ui.h:38
 msgid "_ESP:"
 msgstr "_ESP:"
 
-#: ../properties/nm-strongswan-dialog.ui.h:40
+#: ../properties/nm-strongswan-dialog.ui.h:39
 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:40
+msgid "Algorithms"
+msgstr "Algorithmen"
+
 #: ../auth-dialog/main.c:137
 #, c-format
 msgid "EAP password required to establish VPN connection '%s'."
@@ -304,27 +304,27 @@ msgstr ""
 "Die Konfiguration verwendet ssh-agent für die Authentisierung, aber ssh-"
 "agent ist nicht gestartet!"
 
-#: ../NetworkManager-strongswan.appdata.xml.in.h:1
+#: ../NetworkManager-strongswan.metainfo.xml.in.h:1
 msgid "strongSwan VPN client"
 msgstr "strongSwan VPN Client"
 
-#: ../NetworkManager-strongswan.appdata.xml.in.h:2
+#: ../NetworkManager-strongswan.metainfo.xml.in.h:2
 msgid "strongSwan based client for IPsec virtual private networks"
 msgstr "Auf strongSwan basierender Client für IPsec VPNs"
 
-#: ../NetworkManager-strongswan.appdata.xml.in.h:3
+#: ../NetworkManager-strongswan.metainfo.xml.in.h:3
 msgid ""
 "Support for configuring IPsec based virtual private network connections."
 msgstr ""
 "Unterstützung für die Konfiguration von IPsec-basierten VPN Verbindungen."
 
-#: ../NetworkManager-strongswan.appdata.xml.in.h:4
+#: ../NetworkManager-strongswan.metainfo.xml.in.h:4
 msgid ""
 "Compatible with IKEv2 key exchange and multiple authentication mechanisms."
 msgstr ""
 "Kompatibel mit dem IKEv2 Schlüsselaustausch-Protokoll und verschiedenen "
 "Authentisierungsmethoden."
 
-#: ../NetworkManager-strongswan.appdata.xml.in.h:5
+#: ../NetworkManager-strongswan.metainfo.xml.in.h:5
 msgid "strongSwan Developers"
 msgstr "strongSwan Entwickler"
diff --git a/properties/nm-strongswan-dialog.ui b/properties/nm-strongswan-dialog.ui
index c9bd266..7320ba4 100644
--- a/properties/nm-strongswan-dialog.ui
+++ b/properties/nm-strongswan-dialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
+<!-- Generated with glade 3.36.0 -->
 <interface>
   <requires lib="gtk+" version="3.2"/>
   <object class="GtkBox" id="strongswan-vbox">
@@ -7,7 +7,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="orientation">vertical</property>
-    <property name="spacing">16</property>
+    <property name="spacing">12</property>
     <child>
       <object class="GtkBox" id="gateway-vbox">
         <property name="visible">True</property>
@@ -116,35 +116,6 @@
                 <property name="top_attach">2</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkLabel" id="server-port-label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Port:</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="server-port-entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="tooltip_text" translatable="yes">Custom server port to connect to. Defaults to UDP port 500, which is followed by a switch to port 4500 after the first exchange.</property>
-                <property name="hexpand">True</property>
-                <property name="invisible_char">•</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="secondary_icon_activatable">False</property>
-                <property name="placeholder_text" translatable="yes">(Defaults to UDP 500/4500)</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -152,9 +123,6 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -397,9 +365,6 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -408,31 +373,18 @@
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="options-vbox">
+      <object class="GtkNotebook" id="options_notebook">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
+        <property name="can_focus">True</property>
+        <property name="tab_pos">left</property>
         <child>
-          <object class="GtkLabel" id="options-label">
+          <object class="GtkBox" id="options-vbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-            <property name="xalign">0</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="options-inner-vbox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">12</property>
+            <property name="valign">start</property>
+            <property name="border_width">6</property>
             <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="virtual-check">
                 <property name="label" translatable="yes">Request an _inner IP address</property>
@@ -482,54 +434,71 @@
               </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">6</property>
+                <property name="row_homogeneous">True</property>
+                <child>
+                  <object class="GtkLabel" id="server-port-label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Server _port:</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="server-port-entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip_text" translatable="yes">Custom server port to connect to. Defaults to UDP port 500, which is followed by a switch to port 4500 after the first exchange.</property>
+                    <property name="hexpand">True</property>
+                    <property name="invisible_char">•</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                    <property name="placeholder_text" translatable="yes">(Defaults to UDP 500/4500)</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="proposals-vbox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="proposals-label">
+        <child type="tab">
+          <object class="GtkLabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">&lt;b&gt;Cipher proposals&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Options</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
+            <property name="tab_fill">False</property>
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="proposal-vbox">
+          <object class="GtkBox" id="proposals-vbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">12</property>
+            <property name="valign">start</property>
+            <property name="border_width">6</property>
             <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="proposal-check">
-                <property name="label" translatable="yes">_Enable custom proposals</property>
+                <property name="label" translatable="yes">_Enable custom algorithm proposals</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -612,24 +581,33 @@
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
+        <child type="tab">
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Algorithms</property>
+          </object>
+          <packing>
+            <property name="position">1</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
         <child>
           <placeholder/>
         </child>
+        <child type="tab">
+          <placeholder/>
+        </child>
       </object>
       <packing>
         <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">3</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
       </packing>
     </child>
   </object>