[network-manager-applet] connection-editor: Change labelling style



commit 004ac2a23e185712b7d827528bf8e7b4c260ce53
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Mar 13 17:23:44 2018 +0100

    connection-editor: Change labelling style
    
    Replace the left justified labels with right justified ones, reduce the
    space between label and entry and drop the unnecessary ":". This more
    closely matches the GNOME UI style, reducing the differences between
    gnome-control-center's Network panel and nm-connection-editor.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=794295

 src/connection-editor/ce-page-bluetooth.ui     |    6 +-
 src/connection-editor/ce-page-bond.ui          |   42 +++---
 src/connection-editor/ce-page-bridge-port.ui   |   14 +-
 src/connection-editor/ce-page-bridge.ui        |   34 ++--
 src/connection-editor/ce-page-dcb.ui           |  220 ++++++++++++------------
 src/connection-editor/ce-page-dsl.ui           |   22 ++--
 src/connection-editor/ce-page-ethernet.ui      |   40 ++--
 src/connection-editor/ce-page-general.ui       |   10 +-
 src/connection-editor/ce-page-infiniband.ui    |   14 +-
 src/connection-editor/ce-page-ip-tunnel.ui     |   34 ++--
 src/connection-editor/ce-page-ip4.ui           |   18 +-
 src/connection-editor/ce-page-ip6.ui           |   22 ++--
 src/connection-editor/ce-page-macsec.ui        |   38 ++--
 src/connection-editor/ce-page-mobile.ui        |   28 ++--
 src/connection-editor/ce-page-ppp.ui           |    4 +-
 src/connection-editor/ce-page-proxy.ui         |   14 +-
 src/connection-editor/ce-page-team-port.ui     |   58 +++---
 src/connection-editor/ce-page-team.ui          |  104 ++++++------
 src/connection-editor/ce-page-vlan.ui          |   26 ++--
 src/connection-editor/ce-page-wifi-security.ui |    6 +-
 src/connection-editor/ce-page-wifi.ui          |   42 +++---
 src/connection-editor/nm-connection-editor.ui  |    4 +-
 src/connection-editor/page-ip4.c               |    8 +-
 src/connection-editor/page-ip6.c               |    8 +-
 24 files changed, 408 insertions(+), 408 deletions(-)
---
diff --git a/src/connection-editor/ce-page-bluetooth.ui b/src/connection-editor/ce-page-bluetooth.ui
index 86da78d..11ce28e 100644
--- a/src/connection-editor/ce-page-bluetooth.ui
+++ b/src/connection-editor/ce-page-bluetooth.ui
@@ -7,7 +7,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkBox" id="bluetooth_device_vbox">
         <property name="visible">True</property>
@@ -29,9 +29,9 @@
       <object class="GtkLabel" id="bluetooth_device_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Device:</property>
+        <property name="label" translatable="yes">_Device</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-bond.ui b/src/connection-editor/ce-page-bond.ui
index a5174c1..3e24af2 100644
--- a/src/connection-editor/ce-page-bond.ui
+++ b/src/connection-editor/ce-page-bond.ui
@@ -80,14 +80,14 @@
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkLabel" id="master_connections_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Bonded _connections:</property>
+        <property name="label" translatable="yes">Bonded _connections</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -99,10 +99,10 @@
       <object class="GtkLabel" id="bond_mode_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">M_ode:</property>
+        <property name="label" translatable="yes">M_ode</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bond_mode</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -231,10 +231,10 @@
       <object class="GtkLabel" id="bond_frequency_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Monitoring _frequency:</property>
+        <property name="label" translatable="yes">Monitoring _frequency</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bond_frequency</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -283,10 +283,10 @@
       <object class="GtkLabel" id="master_interface_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Interface name:</property>
+        <property name="label" translatable="yes">_Interface name</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">master_interface</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -308,10 +308,10 @@
       <object class="GtkLabel" id="bond_monitoring_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Link Monitoring:</property>
+        <property name="label" translatable="yes">_Link Monitoring</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bond_monitoring</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -339,10 +339,10 @@
       <object class="GtkLabel" id="bond_arp_targets_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">ARP _targets:</property>
+        <property name="label" translatable="yes">ARP _targets</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bond_arp_targets</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -365,10 +365,10 @@
       <object class="GtkLabel" id="bond_updelay_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Link _up delay:</property>
+        <property name="label" translatable="yes">Link _up delay</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bond_updelay</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -379,10 +379,10 @@
       <object class="GtkLabel" id="bond_downdelay_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Link _down delay:</property>
+        <property name="label" translatable="yes">Link _down delay</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bond_downdelay</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -471,10 +471,10 @@
       <object class="GtkLabel" id="bond_primary_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Primary:</property>
+        <property name="label" translatable="yes">_Primary</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bond_primary</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -497,10 +497,10 @@
       <object class="GtkLabel" id="bond_mtu_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_MTU:</property>
+        <property name="label" translatable="yes">_MTU</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bond_mtu</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-bridge-port.ui b/src/connection-editor/ce-page-bridge-port.ui
index 76a927f..33343a6 100644
--- a/src/connection-editor/ce-page-bridge-port.ui
+++ b/src/connection-editor/ce-page-bridge-port.ui
@@ -18,7 +18,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkCheckButton" id="bridge_port_hairpin_mode">
         <property name="visible">True</property>
@@ -36,9 +36,9 @@
       <object class="GtkLabel" id="bridge_port_path_cost_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Path _cost:</property>
+        <property name="label" translatable="yes">Path _cost</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -49,9 +49,9 @@
       <object class="GtkLabel" id="bridge_port_priority_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Priority:</property>
+        <property name="label" translatable="yes">_Priority</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -91,10 +91,10 @@
       <object class="GtkLabel" id="bridge_port_hairpin_mode_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Hairpin mode:</property>
+        <property name="label" translatable="yes">_Hairpin mode</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bridge_port_hairpin_mode</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-bridge.ui b/src/connection-editor/ce-page-bridge.ui
index 18c299c..f90e5d7 100644
--- a/src/connection-editor/ce-page-bridge.ui
+++ b/src/connection-editor/ce-page-bridge.ui
@@ -50,15 +50,15 @@
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkLabel" id="master_connections_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
-        <property name="label" translatable="yes">Bridged _connections:</property>
+        <property name="label" translatable="yes">Bridged _connections</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -171,10 +171,10 @@
       <object class="GtkLabel" id="bridge_prio">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Priority:</property>
+        <property name="label" translatable="yes">_Priority</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bridge_priority</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -185,10 +185,10 @@
       <object class="GtkLabel" id="master_interface_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Interface name:</property>
+        <property name="label" translatable="yes">_Interface name</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">master_interface</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -211,10 +211,10 @@
       <object class="GtkLabel" id="bridge_forward_delay_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Forward delay:</property>
+        <property name="label" translatable="yes">_Forward delay</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bridge_forward_delay</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -225,10 +225,10 @@
       <object class="GtkLabel" id="bridge_hello_time_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Hello time:</property>
+        <property name="label" translatable="yes">_Hello time</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bridge_hello_time</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -369,10 +369,10 @@
       <object class="GtkLabel" id="bridge_max_age_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Max age:</property>
+        <property name="label" translatable="yes">_Max age</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bridge_max_age</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -424,10 +424,10 @@
       <object class="GtkLabel" id="bridge_ageing_time_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Aging time:</property>
+        <property name="label" translatable="yes">_Aging time</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bridge_ageing_time</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -479,10 +479,10 @@
       <object class="GtkLabel" id="bridge_group_fwd_mask_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Group _forward mask:</property>
+        <property name="label" translatable="yes">Group _forward mask</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">bridge_group_fwd_mask</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-dcb.ui b/src/connection-editor/ce-page-dcb.ui
index f4685e1..5bfd7f8 100644
--- a/src/connection-editor/ce-page-dcb.ui
+++ b/src/connection-editor/ce-page-dcb.ui
@@ -7,7 +7,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkCheckButton" id="dcb_enabled_checkbutton">
         <property name="label" translatable="yes">_Use Data Center Bridging (DCB) for this 
connection</property>
@@ -629,8 +629,8 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Priority:</property>
-                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Priority</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -647,8 +647,8 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">0:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">0</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -688,8 +688,8 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">1:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">1</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -729,8 +729,8 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">2:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">2</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -770,8 +770,8 @@
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">3:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">3</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -811,8 +811,8 @@
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">4:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">4</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -852,8 +852,8 @@
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">5:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">5</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -893,8 +893,8 @@
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">6:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">6</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -934,8 +934,8 @@
                       <object class="GtkLabel" id="label10">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">7:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">7</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1058,13 +1058,13 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label54">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Traffic Class:</property>
-                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Traffic Class</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1080,8 +1080,8 @@
                       <object class="GtkLabel" id="label53">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">0:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">0</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1129,8 +1129,8 @@
                       <object class="GtkLabel" id="label55">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">1:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">1</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1178,8 +1178,8 @@
                       <object class="GtkLabel" id="label56">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">2:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">2</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1227,8 +1227,8 @@
                       <object class="GtkLabel" id="label57">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">3:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">3</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1276,8 +1276,8 @@
                       <object class="GtkLabel" id="label58">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">4:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">4</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1325,8 +1325,8 @@
                       <object class="GtkLabel" id="label59">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">5:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">5</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1374,8 +1374,8 @@
                       <object class="GtkLabel" id="label60">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">6:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">6</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1423,8 +1423,8 @@
                       <object class="GtkLabel" id="label61">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">7:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">7</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1467,8 +1467,8 @@
                   <object class="GtkLabel" id="label44">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Strict Bandwidth:</property>
-                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Strict Bandwidth</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1484,8 +1484,8 @@
                       <object class="GtkLabel" id="label45">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">0:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">0</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1524,8 +1524,8 @@
                       <object class="GtkLabel" id="label46">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">1:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">1</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1564,8 +1564,8 @@
                       <object class="GtkLabel" id="label47">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">2:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">2</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1604,8 +1604,8 @@
                       <object class="GtkLabel" id="label48">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">3:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">3</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1644,8 +1644,8 @@
                       <object class="GtkLabel" id="label49">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">4:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">4</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1684,8 +1684,8 @@
                       <object class="GtkLabel" id="label50">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">5:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">5</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1724,8 +1724,8 @@
                       <object class="GtkLabel" id="label51">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">6:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">6</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1764,8 +1764,8 @@
                       <object class="GtkLabel" id="label52">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">7:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">7</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1799,8 +1799,8 @@
                   <object class="GtkLabel" id="label26">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Priority Bandwidth:</property>
-                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Priority Bandwidth</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1816,8 +1816,8 @@
                       <object class="GtkLabel" id="label27">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">0:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">0</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1856,8 +1856,8 @@
                       <object class="GtkLabel" id="label28">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">1:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">1</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1896,8 +1896,8 @@
                       <object class="GtkLabel" id="label29">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">2:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">2</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1936,8 +1936,8 @@
                       <object class="GtkLabel" id="label30">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">3:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">3</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1976,8 +1976,8 @@
                       <object class="GtkLabel" id="label31">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">4:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">4</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2016,8 +2016,8 @@
                       <object class="GtkLabel" id="label32">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">5:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">5</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2056,8 +2056,8 @@
                       <object class="GtkLabel" id="label33">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">6:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">6</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2096,8 +2096,8 @@
                       <object class="GtkLabel" id="label34">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">7:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">7</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2131,8 +2131,8 @@
                   <object class="GtkLabel" id="label35">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Group Bandwidth:</property>
-                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Group Bandwidth</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -2148,8 +2148,8 @@
                       <object class="GtkLabel" id="label36">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">0:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">0</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2188,8 +2188,8 @@
                       <object class="GtkLabel" id="label37">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">1:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">1</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2228,8 +2228,8 @@
                       <object class="GtkLabel" id="label38">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">2:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">2</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2268,8 +2268,8 @@
                       <object class="GtkLabel" id="label39">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">3:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">3</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2308,8 +2308,8 @@
                       <object class="GtkLabel" id="label40">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">4:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">4</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2348,8 +2348,8 @@
                       <object class="GtkLabel" id="label41">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">5:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">5</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2388,8 +2388,8 @@
                       <object class="GtkLabel" id="label42">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">6:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">6</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2428,8 +2428,8 @@
                       <object class="GtkLabel" id="label43">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">7:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">7</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2463,8 +2463,8 @@
                   <object class="GtkLabel" id="label11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Group ID:</property>
-                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Group ID</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -2480,8 +2480,8 @@
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">0:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">0</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2530,8 +2530,8 @@
                       <object class="GtkLabel" id="label13">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">1:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">1</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2580,8 +2580,8 @@
                       <object class="GtkLabel" id="label14">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">2:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">2</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2630,8 +2630,8 @@
                       <object class="GtkLabel" id="label15">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">3:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">3</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2680,8 +2680,8 @@
                       <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">4:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">4</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2730,8 +2730,8 @@
                       <object class="GtkLabel" id="label17">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">5:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">5</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2780,8 +2780,8 @@
                       <object class="GtkLabel" id="label18">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">6:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">6</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2830,8 +2830,8 @@
                       <object class="GtkLabel" id="label19">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">7:</property>
-                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">7</property>
+                        <property name="xalign">1</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
diff --git a/src/connection-editor/ce-page-dsl.ui b/src/connection-editor/ce-page-dsl.ui
index 0ca27b1..0e3b22d 100644
--- a/src/connection-editor/ce-page-dsl.ui
+++ b/src/connection-editor/ce-page-dsl.ui
@@ -8,15 +8,15 @@
     <property name="hexpand">True</property>
     <property name="border_width">12</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkLabel" id="label24">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Username:</property>
+        <property name="label" translatable="yes">_Username</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">dsl_username</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -51,10 +51,10 @@
       <object class="GtkLabel" id="label26">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Service:</property>
+        <property name="label" translatable="yes">_Service</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">dsl_service</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -92,10 +92,10 @@
       <object class="GtkLabel" id="label25">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Password:</property>
+        <property name="label" translatable="yes">_Password</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">dsl_password</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -106,10 +106,10 @@
       <object class="GtkLabel" id="dsl_interface_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">PPP _interface:</property>
+        <property name="label" translatable="yes">PPP _interface</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">dsl_interface</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -120,10 +120,10 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">P_arent interface:</property>
+        <property name="label" translatable="yes">P_arent interface</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">dsl_parent</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-ethernet.ui b/src/connection-editor/ce-page-ethernet.ui
index 57e46eb..f4d6961 100644
--- a/src/connection-editor/ce-page-ethernet.ui
+++ b/src/connection-editor/ce-page-ethernet.ui
@@ -86,15 +86,15 @@
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkLabel" id="ethernet_port_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Port:</property>
+        <property name="label" translatable="yes">_Port</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">ethernet_port</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -123,9 +123,9 @@
       <object class="GtkLabel" id="ethernet_device_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Device:</property>
+        <property name="label" translatable="yes">_Device</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -149,10 +149,10 @@
       <object class="GtkLabel" id="label27">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">C_loned MAC address:</property>
+        <property name="label" translatable="yes">C_loned MAC address</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">ethernet_cloned_mac</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -181,10 +181,10 @@
       <object class="GtkLabel" id="label28">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_MTU:</property>
+        <property name="label" translatable="yes">_MTU</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">ethernet_mtu</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -233,9 +233,9 @@
       <object class="GtkLabel" id="label30">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Wake on LAN:</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
+        <property name="label" translatable="yes">Wake on LAN</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -380,10 +380,10 @@
       <object class="GtkLabel" id="label31">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Wake on LAN password:</property>
+        <property name="label" translatable="yes">_Wake on LAN password</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">ethernet_wol_passwd</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -406,10 +406,10 @@
       <object class="GtkLabel" id="ethernet_linkneg_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Lin_k negotiation:</property>
+        <property name="label" translatable="yes">Lin_k negotiation</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">ethernet_linkneg</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -440,10 +440,10 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="margin_left">26</property>
-        <property name="label" translatable="yes">_Speed:</property>
+        <property name="label" translatable="yes">_Speed</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">ethernet_speed</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -474,10 +474,10 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="margin_left">26</property>
-        <property name="label" translatable="yes">Duple_x:</property>
+        <property name="label" translatable="yes">Duple_x</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">ethernet_duplex</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui
index f4f24cd..6ebe5d9 100644
--- a/src/connection-editor/ce-page-general.ui
+++ b/src/connection-editor/ce-page-general.ui
@@ -21,7 +21,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkCheckButton" id="dependent_vpn_checkbox">
         <property name="label" translatable="yes">Automatically connect to _VPN when using this 
connection</property>
@@ -96,10 +96,10 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">Connection _priority for auto-activation:</property>
+            <property name="label" translatable="yes">Connection _priority for auto-activation</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">autoconnect_prio</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -142,9 +142,9 @@
         <child>
           <object class="GtkLabel" id="firewall_zone_label">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Firewall _zone:</property>
+            <property name="label" translatable="yes">Firewall _zone</property>
             <property name="use_underline">True</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/src/connection-editor/ce-page-infiniband.ui b/src/connection-editor/ce-page-infiniband.ui
index 9c9c0f6..7d65cef 100644
--- a/src/connection-editor/ce-page-infiniband.ui
+++ b/src/connection-editor/ce-page-infiniband.ui
@@ -26,14 +26,14 @@
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkLabel" id="infiniband_mode_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Transport mode:</property>
+        <property name="label" translatable="yes">_Transport mode</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -44,9 +44,9 @@
       <object class="GtkLabel" id="infiniband_device_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Device:</property>
+        <property name="label" translatable="yes">_Device</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -126,10 +126,10 @@
       <object class="GtkLabel" id="infiniband_mtu_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_MTU:</property>
+        <property name="label" translatable="yes">_MTU</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">infiniband_mtu</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-ip-tunnel.ui b/src/connection-editor/ce-page-ip-tunnel.ui
index f0c414a..dc2287c 100644
--- a/src/connection-editor/ce-page-ip-tunnel.ui
+++ b/src/connection-editor/ce-page-ip-tunnel.ui
@@ -49,13 +49,13 @@
     <property name="border_width">12</property>
     <property name="orientation">vertical</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkLabel" id="name_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Device name:</property>
+        <property name="halign">end</property>
+        <property name="label" translatable="yes">Device name</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -77,9 +77,9 @@
       <object class="GtkLabel" id="device_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
+        <property name="halign">end</property>
         <property name="hexpand">False</property>
-        <property name="label" translatable="yes">Parent device:</property>
+        <property name="label" translatable="yes">Parent device</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -107,9 +107,9 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
+        <property name="halign">end</property>
         <property name="hexpand">False</property>
-        <property name="label" translatable="yes">Mode:</property>
+        <property name="label" translatable="yes">Mode</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -120,9 +120,9 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
+        <property name="halign">end</property>
         <property name="hexpand">False</property>
-        <property name="label" translatable="yes">Local IP:</property>
+        <property name="label" translatable="yes">Local IP</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -133,8 +133,8 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Remote IP:</property>
+        <property name="halign">end</property>
+        <property name="label" translatable="yes">Remote IP</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -145,8 +145,8 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Input key:</property>
+        <property name="halign">end</property>
+        <property name="label" translatable="yes">Input key</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -157,8 +157,8 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Output key:</property>
+        <property name="halign">end</property>
+        <property name="label" translatable="yes">Output key</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -238,8 +238,8 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">MTU:</property>
+        <property name="halign">end</property>
+        <property name="label" translatable="yes">MTU</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-ip4.ui b/src/connection-editor/ce-page-ip4.ui
index 4fcedf8..e1c318a 100644
--- a/src/connection-editor/ce-page-ip4.ui
+++ b/src/connection-editor/ce-page-ip4.ui
@@ -39,10 +39,10 @@
           <object class="GtkLabel" id="label38">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">_Method:</property>
+            <property name="label" translatable="yes">_Method</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">ip4_method</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -186,7 +186,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkEntry" id="ip4_dhcp_client_id_entry">
                     <property name="visible">True</property>
@@ -217,10 +217,10 @@
                   <object class="GtkLabel" id="ip4_dhcp_client_id_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">D_HCP client ID:</property>
+                    <property name="label" translatable="yes">D_HCP client ID</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">ip4_dhcp_client_id_entry</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -231,10 +231,10 @@
                   <object class="GtkLabel" id="ip4_dns_searches_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">S_earch domains:</property>
+                    <property name="label" translatable="yes">S_earch domains</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">ip4_dns_searches_entry</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -245,10 +245,10 @@
                   <object class="GtkLabel" id="ip4_dns_servers_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">DNS ser_vers:</property>
+                    <property name="label" translatable="yes">DNS ser_vers</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">ip4_dns_servers_entry</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-ip6.ui b/src/connection-editor/ce-page-ip6.ui
index 20e37b5..ef13947 100644
--- a/src/connection-editor/ce-page-ip6.ui
+++ b/src/connection-editor/ce-page-ip6.ui
@@ -70,10 +70,10 @@
           <object class="GtkLabel" id="label38">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">_Method:</property>
+            <property name="label" translatable="yes">_Method</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">ip6_method</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -217,7 +217,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkEntry" id="ip6_dns_searches_entry">
                     <property name="visible">True</property>
@@ -235,10 +235,10 @@
                   <object class="GtkLabel" id="ip6_dns_searches_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">S_earch domains:</property>
+                    <property name="label" translatable="yes">S_earch domains</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">ip6_dns_searches_entry</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -249,10 +249,10 @@
                   <object class="GtkLabel" id="ip6_dns_servers_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">DNS ser_vers:</property>
+                    <property name="label" translatable="yes">DNS ser_vers</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">ip6_dns_servers_entry</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -276,10 +276,10 @@
                   <object class="GtkLabel" id="ip6_privacy_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">IPv6 _privacy extensions:</property>
+                    <property name="label" translatable="yes">IPv6 _privacy extensions</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">ip6_privacy_combo</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -308,10 +308,10 @@
                   <object class="GtkLabel" id="ip6_addr_gen_mode_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">IPv6 address _generation mode:</property>
+                    <property name="label" translatable="yes">IPv6 address _generation mode</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">ip6_addr_gen_mode_combo</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-macsec.ui b/src/connection-editor/ce-page-macsec.ui
index 5fe7242..3e87379 100644
--- a/src/connection-editor/ce-page-macsec.ui
+++ b/src/connection-editor/ce-page-macsec.ui
@@ -46,13 +46,13 @@
     <property name="border_width">12</property>
     <property name="orientation">vertical</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkLabel" id="name_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Device name:</property>
+        <property name="halign">end</property>
+        <property name="label" translatable="yes">Device name</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -75,9 +75,9 @@
       <object class="GtkLabel" id="device_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
+        <property name="halign">end</property>
         <property name="hexpand">False</property>
-        <property name="label" translatable="yes">Parent device:</property>
+        <property name="label" translatable="yes">Parent device</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -147,8 +147,8 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">CKN:</property>
+        <property name="halign">end</property>
+        <property name="label" translatable="yes">CKN</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -159,9 +159,9 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
+        <property name="halign">end</property>
         <property name="hexpand">False</property>
-        <property name="label" translatable="yes">CAK:</property>
+        <property name="label" translatable="yes">CAK</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -172,9 +172,9 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
+        <property name="halign">end</property>
         <property name="hexpand">False</property>
-        <property name="label" translatable="yes">Mode:</property>
+        <property name="label" translatable="yes">Mode</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -185,8 +185,8 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Keys:</property>
-        <property name="xalign">2.2351741291171123e-10</property>
+        <property name="label" translatable="yes">Keys</property>
+        <property name="xalign">1</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -201,8 +201,8 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Parameters:</property>
-        <property name="xalign">0</property>
+        <property name="label" translatable="yes">Parameters</property>
+        <property name="xalign">1</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -217,8 +217,8 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Validation:</property>
+        <property name="halign">end</property>
+        <property name="label" translatable="yes">Validation</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -229,8 +229,8 @@
       <object class="GtkLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">SCI port:</property>
+        <property name="halign">end</property>
+        <property name="label" translatable="yes">SCI port</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-mobile.ui b/src/connection-editor/ce-page-mobile.ui
index 1dfbfed..cbf75f4 100644
--- a/src/connection-editor/ce-page-mobile.ui
+++ b/src/connection-editor/ce-page-mobile.ui
@@ -35,15 +35,15 @@
             <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="row_spacing">6</property>
-            <property name="column_spacing">12</property>
+            <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="label28">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Nu_mber:</property>
+                <property name="label" translatable="yes">Nu_mber</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">mobile_number</property>
-                <property name="xalign">0</property>
+                <property name="xalign">1</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -54,10 +54,10 @@
               <object class="GtkLabel" id="label24">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Username:</property>
+                <property name="label" translatable="yes">_Username</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">mobile_username</property>
-                <property name="xalign">0</property>
+                <property name="xalign">1</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -68,10 +68,10 @@
               <object class="GtkLabel" id="label25">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Password:</property>
+                <property name="label" translatable="yes">_Password</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">mobile_password</property>
-                <property name="xalign">0</property>
+                <property name="xalign">1</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -151,15 +151,15 @@
             <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="row_spacing">6</property>
-            <property name="column_spacing">12</property>
+            <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="label29">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_APN:</property>
+                <property name="label" translatable="yes">_APN</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">mobile_apn</property>
-                <property name="xalign">0</property>
+                <property name="xalign">1</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -170,10 +170,10 @@
               <object class="GtkLabel" id="label30">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">N_etwork ID:</property>
+                <property name="label" translatable="yes">N_etwork ID</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">mobile_network_id</property>
-                <property name="xalign">0</property>
+                <property name="xalign">1</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -232,10 +232,10 @@
               <object class="GtkLabel" id="label33">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">P_IN:</property>
+                <property name="label" translatable="yes">P_IN</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">mobile_pin</property>
-                <property name="xalign">0</property>
+                <property name="xalign">1</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-ppp.ui b/src/connection-editor/ce-page-ppp.ui
index fc2a25e..a1ef86f 100644
--- a/src/connection-editor/ce-page-ppp.ui
+++ b/src/connection-editor/ce-page-ppp.ui
@@ -43,8 +43,8 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Allowed methods:</property>
-                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Allowed methods</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/src/connection-editor/ce-page-proxy.ui b/src/connection-editor/ce-page-proxy.ui
index 1279646..f2a6686 100644
--- a/src/connection-editor/ce-page-proxy.ui
+++ b/src/connection-editor/ce-page-proxy.ui
@@ -9,7 +9,7 @@
     <property name="vexpand">True</property>
     <property name="border_width">12</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkComboBoxText" id="proxy_method">
         <property name="visible">True</property>
@@ -47,8 +47,8 @@
       <object class="GtkLabel" id="proxy_pac_url_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">PAC URL:</property>
-        <property name="xalign">0</property>
+        <property name="label" translatable="yes">PAC URL</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -59,8 +59,8 @@
       <object class="GtkLabel" id="proxy_pac_script_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">PAC script:</property>
-        <property name="xalign">0</property>
+        <property name="label" translatable="yes">PAC script</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -96,8 +96,8 @@
       <object class="GtkLabel" id="proxy_method_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Method:</property>
-        <property name="xalign">0</property>
+        <property name="label" translatable="yes">Method</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-team-port.ui b/src/connection-editor/ce-page-team-port.ui
index 6490101..d31903a 100644
--- a/src/connection-editor/ce-page-team-port.ui
+++ b/src/connection-editor/ce-page-team-port.ui
@@ -9,7 +9,7 @@
     <property name="vexpand">True</property>
     <property name="border_width">12</property>
     <property name="row_spacing">8</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkButton" id="advanced_button">
         <property name="visible">True</property>
@@ -216,10 +216,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Queue ID:</property>
+                    <property name="label" translatable="yes">_Queue ID</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">queue_id</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -262,9 +262,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Port priority:</property>
+                    <property name="label" translatable="yes">_Port priority</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -323,9 +323,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_LACP port priority:</property>
+                    <property name="label" translatable="yes">_LACP port priority</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -337,9 +337,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">LACP port _key:</property>
+                    <property name="label" translatable="yes">LACP port _key</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -398,16 +398,16 @@
                 <property name="valign">start</property>
                 <property name="border_width">12</property>
                 <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="link_watcher_name_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Link watcher:</property>
+                    <property name="label" translatable="yes">_Link watcher</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">link_watcher_name</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -419,10 +419,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Up delay:</property>
+                    <property name="label" translatable="yes">_Up delay</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">delay_up</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -434,10 +434,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Down delay:</property>
+                    <property name="label" translatable="yes">_Down delay</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">delay_down</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -449,10 +449,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Send _interval:</property>
+                    <property name="label" translatable="yes">Send _interval</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">send_interval</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -464,10 +464,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Delay _before first send:</property>
+                    <property name="label" translatable="yes">Delay _before first send</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">init_wait</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -479,10 +479,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Maximum missed replies:</property>
+                    <property name="label" translatable="yes">_Maximum missed replies</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">missed_max</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -494,10 +494,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Source host:</property>
+                    <property name="label" translatable="yes">_Source host</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">source_host</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -509,10 +509,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Target host:</property>
+                    <property name="label" translatable="yes">_Target host</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">target_host</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -772,7 +772,7 @@
                 <property name="vexpand">True</property>
                 <property name="border_width">12</property>
                 <property name="row_spacing">8</property>
-                <property name="column_spacing">12</property>
+                <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkButton" id="import_config_button">
                     <property name="label" translatable="yes">Im_port team configuration from a 
file…</property>
@@ -811,10 +811,10 @@
                   <object class="GtkLabel" id="team_port_json_config_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Edit _JSON configuration:</property>
+                    <property name="label" translatable="yes">Edit _JSON configuration</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">team_port_json_config</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-team.ui b/src/connection-editor/ce-page-team.ui
index a366710..553da7c 100644
--- a/src/connection-editor/ce-page-team.ui
+++ b/src/connection-editor/ce-page-team.ui
@@ -162,15 +162,15 @@
     <property name="vexpand">True</property>
     <property name="border_width">12</property>
     <property name="row_spacing">8</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkLabel" id="master_connections_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
-        <property name="label" translatable="yes">_Teamed connections:</property>
+        <property name="label" translatable="yes">_Teamed connections</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -285,9 +285,9 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
-        <property name="label" translatable="yes">_Interface name:</property>
+        <property name="label" translatable="yes">_Interface name</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -311,10 +311,10 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
-        <property name="label" translatable="yes">_MTU:</property>
+        <property name="label" translatable="yes">_MTU</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">team_mtu</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -588,10 +588,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Peer notification count:</property>
+                    <property name="label" translatable="yes">_Peer notification count</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">notify_peers_count</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -603,10 +603,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Peer _notification interval:</property>
+                    <property name="label" translatable="yes">Peer _notification interval</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">notify_peers_interval</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -618,10 +618,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Multicast rejoin count:</property>
+                    <property name="label" translatable="yes">_Multicast rejoin count</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">mcast_rejoin_count</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -633,10 +633,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Multicast _rejoin interval:</property>
+                    <property name="label" translatable="yes">Multicast _rejoin interval</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">mcast_rejoin_interval</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -724,9 +724,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Hardware Address:</property>
+                    <property name="label" translatable="yes">_Hardware Address</property>
                     <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -773,17 +773,17 @@
                 <property name="vexpand">True</property>
                 <property name="border_width">12</property>
                 <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="column_spacing">6</property>
                 <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkLabel" id="team_runner_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Runner:</property>
+                    <property name="label" translatable="yes">_Runner</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">team_runner</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -795,10 +795,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Hardware address policy:</property>
+                    <property name="label" translatable="yes">_Hardware address policy</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">hwaddr_policy</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -885,10 +885,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_System priority:</property>
+                    <property name="label" translatable="yes">_System priority</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">system_priority</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -900,10 +900,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Minimum ports:</property>
+                    <property name="label" translatable="yes">_Minimum ports</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">minimum_ports</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -915,10 +915,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Aggregator selection policy:</property>
+                    <property name="label" translatable="yes">_Aggregator selection policy</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">agg_selection_policy</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1067,10 +1067,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Transmission _balancing interval:</property>
+                    <property name="label" translatable="yes">Transmission _balancing interval</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">tx_balancing_interval</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1082,10 +1082,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Transmission balancer:</property>
+                    <property name="label" translatable="yes">_Transmission balancer</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">tx_balancer</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1115,16 +1115,16 @@
                 <property name="valign">start</property>
                 <property name="border_width">12</property>
                 <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="link_watcher_name_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Link watcher:</property>
+                    <property name="label" translatable="yes">_Link watcher</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">link_watcher_name</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1136,10 +1136,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Up delay:</property>
+                    <property name="label" translatable="yes">_Up delay</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">delay_up</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1151,10 +1151,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Down delay:</property>
+                    <property name="label" translatable="yes">_Down delay</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">delay_down</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1166,10 +1166,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Send _interval:</property>
+                    <property name="label" translatable="yes">Send _interval</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">send_interval</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1181,10 +1181,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Delay _before first send:</property>
+                    <property name="label" translatable="yes">Delay _before first send</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">init_wait</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1196,10 +1196,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Maximum missed replies:</property>
+                    <property name="label" translatable="yes">_Maximum missed replies</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">missed_max</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1211,10 +1211,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Source host:</property>
+                    <property name="label" translatable="yes">_Source host</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">source_host</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1226,10 +1226,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">_Target host:</property>
+                    <property name="label" translatable="yes">_Target host</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">target_host</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -1489,7 +1489,7 @@
                 <property name="vexpand">True</property>
                 <property name="border_width">12</property>
                 <property name="row_spacing">8</property>
-                <property name="column_spacing">12</property>
+                <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkButton" id="import_config_button">
                     <property name="label" translatable="yes">Im_port team configuration from a 
file…</property>
@@ -1528,10 +1528,10 @@
                   <object class="GtkLabel" id="team_json_config_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Edit _JSON configuration:</property>
+                    <property name="label" translatable="yes">Edit _JSON configuration</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">team_json_config</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-vlan.ui b/src/connection-editor/ce-page-vlan.ui
index 9a99950..8de06ed 100644
--- a/src/connection-editor/ce-page-vlan.ui
+++ b/src/connection-editor/ce-page-vlan.ui
@@ -17,14 +17,14 @@
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkLabel" id="vlan_parent_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Parent interface:</property>
+        <property name="label" translatable="yes">_Parent interface</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -35,10 +35,10 @@
       <object class="GtkLabel" id="vlan_name_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">VLAN inter_face name:</property>
+        <property name="label" translatable="yes">VLAN inter_face name</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">vlan_name_entry</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -49,10 +49,10 @@
       <object class="GtkLabel" id="vlan_cloned_mac_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Cloned MAC _address:</property>
+        <property name="label" translatable="yes">Cloned MAC _address</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">vlan_cloned_mac_entry</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -81,10 +81,10 @@
       <object class="GtkLabel" id="vlan_mtu_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_MTU:</property>
+        <property name="label" translatable="yes">_MTU</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">vlan_mtu</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -133,10 +133,10 @@
       <object class="GtkLabel" id="vlan_id_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">VLAN _id:</property>
+        <property name="label" translatable="yes">VLAN _id</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">vlan_id_entry</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -189,8 +189,8 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
-        <property name="label" translatable="yes">Flags:</property>
-        <property name="xalign">0</property>
+        <property name="label" translatable="yes">Flags</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-wifi-security.ui b/src/connection-editor/ce-page-wifi-security.ui
index 0ddbd98..15a8c3b 100644
--- a/src/connection-editor/ce-page-wifi-security.ui
+++ b/src/connection-editor/ce-page-wifi-security.ui
@@ -18,15 +18,15 @@
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkLabel" id="wifi_security_combo_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">S_ecurity:</property>
+        <property name="label" translatable="yes">S_ecurity</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">wifi_security_combo</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/src/connection-editor/ce-page-wifi.ui b/src/connection-editor/ce-page-wifi.ui
index 10072ac..a6dc05a 100644
--- a/src/connection-editor/ce-page-wifi.ui
+++ b/src/connection-editor/ce-page-wifi.ui
@@ -61,7 +61,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkHBox" id="wifi_mtu_hbox">
         <property name="visible">True</property>
@@ -104,10 +104,10 @@
       <object class="GtkLabel" id="wifi_mtu_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_MTU:</property>
+        <property name="label" translatable="yes">_MTU</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">wifi_mtu</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -131,9 +131,9 @@
       <object class="GtkLabel" id="wifi_device_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Device:</property>
+        <property name="label" translatable="yes">_Device</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -161,10 +161,10 @@
       <object class="GtkLabel" id="wifi_cloned_mac_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">C_loned MAC address:</property>
+        <property name="label" translatable="yes">C_loned MAC address</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">wifi_cloned_mac</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -213,10 +213,10 @@
       <object class="GtkLabel" id="wifi_tx_power_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Transmission po_wer:</property>
+        <property name="label" translatable="yes">Transmission po_wer</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">wifi_tx_power</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -265,10 +265,10 @@
       <object class="GtkLabel" id="wifi_rate_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_Rate:</property>
+        <property name="label" translatable="yes">_Rate</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">wifi_rate</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -300,9 +300,9 @@
       <object class="GtkLabel" id="wifi_bssid_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">_BSSID:</property>
+        <property name="label" translatable="yes">_BSSID</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -325,10 +325,10 @@
       <object class="GtkLabel" id="wifi_channel_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">C_hannel:</property>
+        <property name="label" translatable="yes">C_hannel</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">wifi_channel</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -357,10 +357,10 @@
       <object class="GtkLabel" id="wifi_band_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Ban_d:</property>
+        <property name="label" translatable="yes">Ban_d</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">wifi_band</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -389,10 +389,10 @@
       <object class="GtkLabel" id="wifi_mode_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">M_ode:</property>
+        <property name="label" translatable="yes">M_ode</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">wifi_mode</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
@@ -403,10 +403,10 @@
       <object class="GtkLabel" id="wifi_ssid_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">SS_ID:</property>
+        <property name="label" translatable="yes">SS_ID</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">wifi_ssid</property>
-        <property name="xalign">0</property>
+        <property name="xalign">1</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/src/connection-editor/nm-connection-editor.ui b/src/connection-editor/nm-connection-editor.ui
index 209da9e..73f7760 100644
--- a/src/connection-editor/nm-connection-editor.ui
+++ b/src/connection-editor/nm-connection-editor.ui
@@ -101,10 +101,10 @@
                   <object class="GtkLabel" id="connection_name_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Connection _name:</property>
+                    <property name="label" translatable="yes">Connection _name</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">connection_name</property>
-                    <property name="xalign">0</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index bb3dbe9..b345691 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -358,18 +358,18 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 
        gtk_widget_set_sensitive (priv->dns_servers_label, dns_enabled);
        if (method_auto)
-               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), _("Additional DNS 
ser_vers:"));
+               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), _("Additional DNS 
ser_vers"));
        else
-               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), _("DNS ser_vers:"));
+               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), _("DNS ser_vers"));
        gtk_widget_set_sensitive (GTK_WIDGET (priv->dns_servers), dns_enabled);
        if (!dns_enabled)
                gtk_entry_set_text (priv->dns_servers, "");
 
        gtk_widget_set_sensitive (priv->dns_searches_label, dns_enabled);
        if (method_auto)
-               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_searches_label), _("Additional s_earch 
domains:"));
+               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_searches_label), _("Additional s_earch 
domains"));
        else
-               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_searches_label), _("S_earch 
domains:"));
+               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_searches_label), _("S_earch domains"));
        gtk_widget_set_sensitive (GTK_WIDGET (priv->dns_searches), dns_enabled);
        if (!dns_enabled)
                gtk_entry_set_text (priv->dns_searches, "");
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index 5b60f9b..d8c0b7c 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -332,18 +332,18 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 
        gtk_widget_set_sensitive (priv->dns_servers_label, dns_enabled);
        if (method_auto)
-               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), _("Additional DNS 
ser_vers:"));
+               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), _("Additional DNS 
ser_vers"));
        else
-               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), _("DNS ser_vers:"));
+               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), _("DNS ser_vers"));
        gtk_widget_set_sensitive (GTK_WIDGET (priv->dns_servers), dns_enabled);
        if (!dns_enabled)
                gtk_entry_set_text (priv->dns_servers, "");
 
        gtk_widget_set_sensitive (priv->dns_searches_label, dns_enabled);
        if (method_auto)
-               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_searches_label), _("Additional s_earch 
domains:"));
+               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_searches_label), _("Additional s_earch 
domains"));
        else
-               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_searches_label), _("S_earch 
domains:"));
+               gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_searches_label), _("S_earch domains"));
        gtk_widget_set_sensitive (GTK_WIDGET (priv->dns_searches), dns_enabled);
        if (!dns_enabled)
                gtk_entry_set_text (priv->dns_searches, "");



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