wireless-security: 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

11 files changed, 61 insertions, 61 deletions

diff --git a/src/wireless-security/eap-method-fast.ui b/src/wireless-security/eap-method-fast.ui
index de0581e1..c862f57e 100644
--- a/src/wireless-security/eap-method-fast.ui
+++ b/src/wireless-security/eap-method-fast.ui
@@ -40,15 +40,15 @@
         <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="eap_fast_anon_identity_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Anony_mous identity:</property>
+            <property name="label" translatable="yes">Anony_mous identity</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_fast_anon_identity_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -71,10 +71,10 @@
           <object class="GtkLabel" id="eap_fast_pac_file_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">PAC _file:</property>
+            <property name="label" translatable="yes">PAC _file</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_fast_pac_file_button</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -109,10 +109,10 @@
           <object class="GtkLabel" id="eap_fast_inner_auth_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">_Inner authentication:</property>
+            <property name="label" translatable="yes">_Inner authentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_fast_inner_auth_combo</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/src/wireless-security/eap-method-leap.ui b/src/wireless-security/eap-method-leap.ui
index 8bfe278e..243d32af 100644
--- a/src/wireless-security/eap-method-leap.ui
+++ b/src/wireless-security/eap-method-leap.ui
@@ -13,15 +13,15 @@
         <property name="can_focus">False</property>
         <property name="valign">start</property>
         <property name="row_spacing">6</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <child>
           <object class="GtkLabel" id="eap_leap_username_label">
             <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">eap_leap_username_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -32,10 +32,10 @@
           <object class="GtkLabel" id="eap_leap_password_label">
             <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">eap_leap_password_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/src/wireless-security/eap-method-peap.ui b/src/wireless-security/eap-method-peap.ui
index 4b8c6484..a75669bd 100644
--- a/src/wireless-security/eap-method-peap.ui
+++ b/src/wireless-security/eap-method-peap.ui
@@ -40,15 +40,15 @@
         <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="eap_peap_anon_identity_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Anony_mous identity:</property>
+            <property name="label" translatable="yes">Anony_mous identity</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_peap_anon_identity_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -86,9 +86,9 @@
           <object class="GtkLabel" id="eap_peap_version_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">PEAP _version:</property>
+            <property name="label" translatable="yes">PEAP _version</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>
@@ -117,9 +117,9 @@
           <object class="GtkLabel" id="eap_peap_inner_auth_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">_Inner authentication:</property>
+            <property name="label" translatable="yes">_Inner authentication</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>
@@ -163,10 +163,10 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="tooltip_text" translatable="yes">Suffix of the server certificate name.</property>
-            <property name="label" translatable="yes">_Domain:</property>
+            <property name="label" translatable="yes">_Domain</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_peap_domain_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/src/wireless-security/eap-method-simple.ui b/src/wireless-security/eap-method-simple.ui
index 99a1801e..eae8cf3e 100644
--- a/src/wireless-security/eap-method-simple.ui
+++ b/src/wireless-security/eap-method-simple.ui
@@ -13,15 +13,15 @@
         <property name="can_focus">False</property>
         <property name="valign">start</property>
         <property name="row_spacing">6</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <child>
           <object class="GtkLabel" id="eap_simple_username_label">
             <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">eap_simple_username_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -32,10 +32,10 @@
           <object class="GtkLabel" id="eap_simple_password_label">
             <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">eap_simple_password_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/src/wireless-security/eap-method-tls.ui b/src/wireless-security/eap-method-tls.ui
index 55fb9b72..49ee4fce 100644
--- a/src/wireless-security/eap-method-tls.ui
+++ b/src/wireless-security/eap-method-tls.ui
@@ -12,15 +12,15 @@
         <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="eap_tls_identity_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">I_dentity:</property>
+            <property name="label" translatable="yes">I_dentity</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_tls_identity_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -60,10 +60,10 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="tooltip_text" translatable="yes">Suffix of the server certificate name.</property>
-            <property name="label" translatable="yes">_Domain:</property>
+            <property name="label" translatable="yes">_Domain</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_tls_domain_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/src/wireless-security/eap-method-ttls.ui b/src/wireless-security/eap-method-ttls.ui
index 2ab3bd76..6ea1709c 100644
--- a/src/wireless-security/eap-method-ttls.ui
+++ b/src/wireless-security/eap-method-ttls.ui
@@ -23,7 +23,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="eap_ttls_anon_identity_entry">
             <property name="visible">True</property>
@@ -73,9 +73,9 @@
           <object class="GtkLabel" id="eap_ttls_inner_auth_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">_Inner authentication:</property>
+            <property name="label" translatable="yes">_Inner authentication</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>
@@ -114,10 +114,10 @@
           <object class="GtkLabel" id="eap_ttls_anon_identity_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Anony_mous identity:</property>
+            <property name="label" translatable="yes">Anony_mous identity</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_ttls_anon_identity_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -129,10 +129,10 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="tooltip_text" translatable="yes">Suffix of the server certificate name.</property>
-            <property name="label" translatable="yes">_Domain:</property>
+            <property name="label" translatable="yes">_Domain</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_ttls_domain_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/src/wireless-security/ws-dynamic-wep.ui b/src/wireless-security/ws-dynamic-wep.ui
index 54e6d671..5f9bdc1b 100644
--- a/src/wireless-security/ws-dynamic-wep.ui
+++ b/src/wireless-security/ws-dynamic-wep.ui
@@ -23,15 +23,15 @@
         <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="dynamic_wep_auth_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Au_thentication:</property>
+            <property name="label" translatable="yes">Au_thentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">dynamic_wep_auth_combo</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/src/wireless-security/ws-leap.ui b/src/wireless-security/ws-leap.ui
index fadf202f..43894752 100644
--- a/src/wireless-security/ws-leap.ui
+++ b/src/wireless-security/ws-leap.ui
@@ -13,15 +13,15 @@
         <property name="can_focus">False</property>
         <property name="valign">start</property>
         <property name="row_spacing">6</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <child>
           <object class="GtkLabel" id="leap_username_label">
             <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">leap_username_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -32,10 +32,10 @@
           <object class="GtkLabel" id="leap_password_label">
             <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">leap_password_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/src/wireless-security/ws-wep-key.ui b/src/wireless-security/ws-wep-key.ui
index f27ac5f5..5a7828cf 100644
--- a/src/wireless-security/ws-wep-key.ui
+++ b/src/wireless-security/ws-wep-key.ui
@@ -46,15 +46,15 @@
         <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="wep_key_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">_Key:</property>
+            <property name="label" translatable="yes">_Key</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wep_key_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -94,10 +94,10 @@
           <object class="GtkLabel" id="auth_method_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Au_thentication:</property>
+            <property name="label" translatable="yes">Au_thentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">auth_method_combo</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="key_index_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">WEP inde_x:</property>
+            <property name="label" translatable="yes">WEP inde_x</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">key_index_combo</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/src/wireless-security/ws-wpa-eap.ui b/src/wireless-security/ws-wpa-eap.ui
index 04ad0c85..c91a1d3f 100644
--- a/src/wireless-security/ws-wpa-eap.ui
+++ b/src/wireless-security/ws-wpa-eap.ui
@@ -23,15 +23,15 @@
         <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="wpa_eap_auth_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Au_thentication:</property>
+            <property name="label" translatable="yes">Au_thentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wpa_eap_auth_combo</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/src/wireless-security/ws-wpa-psk.ui b/src/wireless-security/ws-wpa-psk.ui
index 447363e8..90bc5d83 100644
--- a/src/wireless-security/ws-wpa-psk.ui
+++ b/src/wireless-security/ws-wpa-psk.ui
@@ -12,15 +12,15 @@
         <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="wpa_psk_label">
             <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">wpa_psk_entry</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -45,10 +45,10 @@
           <object class="GtkLabel" id="wpa_psk_type_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">_Type:</property>
+            <property name="label" translatable="yes">_Type</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wpa_psk_type_combo</property>
-            <property name="xalign">0</property>
+            <property name="xalign">1</property>
           </object>
           <packing>
             <property name="left_attach">0</property>