nm: Move server port to options tab and position tabs to the left

Also shortened the title of the proposal tab.  This saves some additional
screen space.

Fixes #3448.

src/frontends/gnome/po/de.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-strongswan\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-18 11:35+0200\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 <[email protected]>\n"
@@ -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,15 +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
+#: ../properties/nm-strongswan-dialog.ui.h:25
 msgid "Request an _inner IP address"
 msgstr "_Innere IP-Adresse beziehen"
 
-#: ../properties/nm-strongswan-dialog.ui.h:29
+#: ../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."
@@ -204,11 +188,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.h:27
 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.h:28
 msgid ""
 "Some firewalls block ESP traffic. Enforcing UDP capsulation even if no NAT "
 "situation is detected might help in such cases."
@@ -217,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:32
+#: ../properties/nm-strongswan-dialog.ui.h:29
 msgid "Use IP c_ompression"
 msgstr "IP-Pakete k_omprimieren"
 
-#: ../properties/nm-strongswan-dialog.ui.h:33
+#: ../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."
@@ -229,12 +213,28 @@ 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:31
+msgid "Server _port:"
+msgstr "Server-_Port:"
+
+#: ../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 proposals"
+msgid "_Enable custom algorithm proposals"
 msgstr "_Eigene Algorithmen verwenden"
 
 #: ../properties/nm-strongswan-dialog.ui.h:36
@@ -254,7 +254,7 @@ 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 "Cipher proposals"
+msgid "Algorithms"
 msgstr "Algorithmen"
 
 #: ../auth-dialog/main.c:137

src/frontends/gnome/properties/nm-strongswan-dialog.ui

@@ -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>
@@ -405,6 +376,7 @@
       <object class="GtkNotebook" id="options_notebook">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="tab_pos">left</property>
         <child>
           <object class="GtkBox" id="options-vbox">
             <property name="visible">True</property>
@@ -461,6 +433,49 @@
                 <property name="position">2</property>
               </packing>
             </child>
+            <child>
+              <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>
         </child>
         <child type="tab">
@@ -483,7 +498,7 @@
             <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>
@@ -575,7 +590,7 @@
           <object class="GtkLabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Cipher proposals</property>
+            <property name="label" translatable="yes">Algorithms</property>
           </object>
           <packing>
             <property name="position">1</property>