[gnome-control-center] network: Update wireless-security UI from network-manager-applet

From: Bastien Nocera <hadess src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-control-center] network: Update wireless-security UI from network-manager-applet
Date: Tue, 7 Jun 2016 12:26:34 +0000 (UTC)
commit 27c9aff3af4e5b5d9ae396fa2ac4f2fed82c761e
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jun 7 13:09:44 2016 +0200

    network: Update wireless-security UI from network-manager-applet
    
    The list of changes compared to the nm-connection-editor code is:
    - Remove ":" from the control labels
    - Right-justify the control labels
    - Shrink the column spacing to 6

 panels/network/wireless-security/Makefile.am       |    3 +-
 .../network/wireless-security/eap-method-fast.ui   |   14 +-
 .../network/wireless-security/eap-method-leap.ui   |   10 +-
 .../network/wireless-security/eap-method-peap.ui   |   18 +-
 .../network/wireless-security/eap-method-simple.ui |   10 +-
 panels/network/wireless-security/eap-method-tls.ui |   22 +-
 .../network/wireless-security/eap-method-ttls.ui   |   14 +-
 .../nm-connection-editor-ui-to-network-panel.patch |  495 ++++++++++++++++++++
 panels/network/wireless-security/ws-dynamic-wep.ui |    6 +-
 panels/network/wireless-security/ws-leap.ui        |   10 +-
 panels/network/wireless-security/ws-wep-key.ui     |   14 +-
 panels/network/wireless-security/ws-wpa-eap.ui     |    6 +-
 panels/network/wireless-security/ws-wpa-psk.ui     |   10 +-
 13 files changed, 564 insertions(+), 68 deletions(-)
---
diff --git a/panels/network/wireless-security/Makefile.am b/panels/network/wireless-security/Makefile.am
index d7898da..2f584fa 100644
--- a/panels/network/wireless-security/Makefile.am
+++ b/panels/network/wireless-security/Makefile.am
@@ -60,8 +60,9 @@ WIRELESS_SECURITY_FILES=$(NM_APPLET_SOURCES) $(resource_files)
 update-from-nma:
        FILES="$(WIRELESS_SECURITY_FILES)" DIR="$(WIRELESS_SECURITY_DIR)" $(top_srcdir)/update-from-gsd.sh && 
changed=true ; \
        patch -p4 < $(srcdir)/nm-connection-editor-to-network-panel.patch ; \
+       patch -p4 < $(srcdir)/nm-connection-editor-ui-to-network-panel.patch ; \
        git commit -m "network: Update wireless-security from network-manager-applet" 
$(WIRELESS_SECURITY_FILES)
 
-EXTRA_DIST = $(resource_files) wireless-security.gresource.xml nm-connection-editor-to-network-panel.patch
+EXTRA_DIST = $(resource_files) wireless-security.gresource.xml nm-connection-editor-to-network-panel.patch 
nm-connection-editor-ui-to-network-panel.patch
 
 -include $(top_srcdir)/git.mk
diff --git a/panels/network/wireless-security/eap-method-fast.ui 
b/panels/network/wireless-security/eap-method-fast.ui
index 4b19a66..36e74c3 100644
--- a/panels/network/wireless-security/eap-method-fast.ui
+++ b/panels/network/wireless-security/eap-method-fast.ui
@@ -40,14 +40,14 @@
         <property name="can_focus">False</property>
         <property name="n_rows">5</property>
         <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <property name="row_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="xalign">0</property>
-            <property name="label" translatable="yes">Anony_mous identity:</property>
+            <property name="xalign">1</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>
           </object>
@@ -72,8 +72,8 @@
           <object class="GtkLabel" id="eap_fast_pac_file_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">PAC _file:</property>
+            <property name="xalign">1</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>
           </object>
@@ -117,8 +117,8 @@
           <object class="GtkLabel" id="eap_fast_inner_auth_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Inner authentication:</property>
+            <property name="xalign">1</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>
           </object>
diff --git a/panels/network/wireless-security/eap-method-leap.ui 
b/panels/network/wireless-security/eap-method-leap.ui
index 1d1f23d..c4de1dc 100644
--- a/panels/network/wireless-security/eap-method-leap.ui
+++ b/panels/network/wireless-security/eap-method-leap.ui
@@ -13,7 +13,7 @@
         <property name="valign">start</property>
         <property name="n_rows">3</property>
         <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <property name="row_spacing">6</property>
         <child>
           <placeholder/>
@@ -22,8 +22,8 @@
           <object class="GtkLabel" id="eap_leap_username_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Username:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Username</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_leap_username_entry</property>
           </object>
@@ -36,8 +36,8 @@
           <object class="GtkLabel" id="eap_leap_password_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Password:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Password</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_leap_password_entry</property>
           </object>
diff --git a/panels/network/wireless-security/eap-method-peap.ui 
b/panels/network/wireless-security/eap-method-peap.ui
index a97123a..d16e00a 100644
--- a/panels/network/wireless-security/eap-method-peap.ui
+++ b/panels/network/wireless-security/eap-method-peap.ui
@@ -40,14 +40,14 @@
         <property name="can_focus">False</property>
         <property name="n_rows">5</property>
         <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <property name="row_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="xalign">0</property>
-            <property name="label" translatable="yes">Anony_mous identity:</property>
+            <property name="xalign">1</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>
           </object>
@@ -72,8 +72,8 @@
           <object class="GtkLabel" id="eap_peap_ca_cert_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">C_A certificate:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">C_A certificate</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_peap_ca_cert_button</property>
           </object>
@@ -135,8 +135,8 @@
           <object class="GtkLabel" id="eap_peap_inner_auth_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Inner authentication:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Inner authentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_peap_inner_auth_combo</property>
           </object>
@@ -172,8 +172,8 @@
           <object class="GtkLabel" id="eap_peap_version_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">PEAP _version:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">PEAP _version</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_peap_version_combo</property>
           </object>
diff --git a/panels/network/wireless-security/eap-method-simple.ui 
b/panels/network/wireless-security/eap-method-simple.ui
index b3318e4..af00cb9 100644
--- a/panels/network/wireless-security/eap-method-simple.ui
+++ b/panels/network/wireless-security/eap-method-simple.ui
@@ -13,7 +13,7 @@
         <property name="valign">start</property>
         <property name="n_rows">3</property>
         <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <property name="row_spacing">6</property>
         <child>
           <placeholder/>
@@ -22,8 +22,8 @@
           <object class="GtkLabel" id="eap_simple_username_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Username:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Username</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_simple_username_entry</property>
           </object>
@@ -36,8 +36,8 @@
           <object class="GtkLabel" id="eap_simple_password_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Password:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Password</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_simple_password_entry</property>
           </object>
diff --git a/panels/network/wireless-security/eap-method-tls.ui 
b/panels/network/wireless-security/eap-method-tls.ui
index 5557593..0079715 100644
--- a/panels/network/wireless-security/eap-method-tls.ui
+++ b/panels/network/wireless-security/eap-method-tls.ui
@@ -13,7 +13,7 @@
         <property name="valign">start</property>
         <property name="n_rows">6</property>
         <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <property name="row_spacing">6</property>
         <child>
           <placeholder/>
@@ -22,8 +22,8 @@
           <object class="GtkLabel" id="eap_tls_identity_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">I_dentity:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">I_dentity</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_tls_identity_entry</property>
           </object>
@@ -48,8 +48,8 @@
           <object class="GtkLabel" id="eap_tls_user_cert_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_User certificate:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_User certificate</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_tls_user_cert_button</property>
           </object>
@@ -64,8 +64,8 @@
           <object class="GtkLabel" id="eap_tls_ca_cert_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">C_A certificate:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">C_A certificate</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_tls_ca_cert_button</property>
           </object>
@@ -112,8 +112,8 @@
           <object class="GtkLabel" id="eap_tls_private_key_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Private _key:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Private _key</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_tls_private_key_button</property>
           </object>
@@ -142,8 +142,8 @@
           <object class="GtkLabel" id="eap_tls_private_key_password_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Private key password:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Private key password</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_tls_private_key_password_entry</property>
           </object>
diff --git a/panels/network/wireless-security/eap-method-ttls.ui 
b/panels/network/wireless-security/eap-method-ttls.ui
index ce00c26..df942d9 100644
--- a/panels/network/wireless-security/eap-method-ttls.ui
+++ b/panels/network/wireless-security/eap-method-ttls.ui
@@ -23,14 +23,14 @@
         <property name="can_focus">False</property>
         <property name="n_rows">4</property>
         <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <property name="row_spacing">6</property>
         <child>
           <object class="GtkLabel" id="eap_ttls_anon_identity_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Anony_mous identity:</property>
+            <property name="xalign">1</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>
           </object>
@@ -55,8 +55,8 @@
           <object class="GtkLabel" id="eap_ttls_ca_cert_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">C_A certificate:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">C_A certificate</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_ttls_ca_cert_button</property>
           </object>
@@ -103,8 +103,8 @@
           <object class="GtkLabel" id="eap_ttls_inner_auth_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Inner authentication:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Inner authentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">eap_ttls_inner_auth_combo</property>
           </object>
diff --git a/panels/network/wireless-security/nm-connection-editor-ui-to-network-panel.patch 
b/panels/network/wireless-security/nm-connection-editor-ui-to-network-panel.patch
new file mode 100644
index 0000000..a99c31b
--- /dev/null
+++ b/panels/network/wireless-security/nm-connection-editor-ui-to-network-panel.patch
@@ -0,0 +1,495 @@
+diff --git a/panels/network/wireless-security/eap-method-fast.ui 
b/panels/network/wireless-security/eap-method-fast.ui
+index 4b19a66..5307ddb 100644
+--- a/panels/network/wireless-security/eap-method-fast.ui
++++ b/panels/network/wireless-security/eap-method-fast.ui
+@@ -46,8 +46,8 @@
+           <object class="GtkLabel" id="eap_fast_anon_identity_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">Anony_mous identity:</property>
++            <property name="xalign">1</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>
+           </object>
+@@ -72,8 +72,8 @@
+           <object class="GtkLabel" id="eap_fast_pac_file_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">PAC _file:</property>
++            <property name="xalign">1</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>
+           </object>
+@@ -117,8 +117,8 @@
+           <object class="GtkLabel" id="eap_fast_inner_auth_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_Inner authentication:</property>
++            <property name="xalign">1</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>
+           </object>
+diff --git a/panels/network/wireless-security/eap-method-leap.ui 
b/panels/network/wireless-security/eap-method-leap.ui
+index 1d1f23d..d4c0625 100644
+--- a/panels/network/wireless-security/eap-method-leap.ui
++++ b/panels/network/wireless-security/eap-method-leap.ui
+@@ -22,8 +22,8 @@
+           <object class="GtkLabel" id="eap_leap_username_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_Username:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">_Username</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_leap_username_entry</property>
+           </object>
+@@ -36,8 +36,8 @@
+           <object class="GtkLabel" id="eap_leap_password_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_Password:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">_Password</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_leap_password_entry</property>
+           </object>
+diff --git a/panels/network/wireless-security/eap-method-peap.ui 
b/panels/network/wireless-security/eap-method-peap.ui
+index a97123a..2f8b8cd 100644
+--- a/panels/network/wireless-security/eap-method-peap.ui
++++ b/panels/network/wireless-security/eap-method-peap.ui
+@@ -46,8 +46,8 @@
+           <object class="GtkLabel" id="eap_peap_anon_identity_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">Anony_mous identity:</property>
++            <property name="xalign">1</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>
+           </object>
+@@ -72,8 +72,8 @@
+           <object class="GtkLabel" id="eap_peap_ca_cert_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">C_A certificate:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">C_A certificate</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_peap_ca_cert_button</property>
+           </object>
+@@ -135,8 +135,8 @@
+           <object class="GtkLabel" id="eap_peap_inner_auth_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_Inner authentication:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">_Inner authentication</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_peap_inner_auth_combo</property>
+           </object>
+@@ -172,8 +172,8 @@
+           <object class="GtkLabel" id="eap_peap_version_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">PEAP _version:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">PEAP _version</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_peap_version_combo</property>
+           </object>
+diff --git a/panels/network/wireless-security/eap-method-simple.ui 
b/panels/network/wireless-security/eap-method-simple.ui
+index b3318e4..7d95d28 100644
+--- a/panels/network/wireless-security/eap-method-simple.ui
++++ b/panels/network/wireless-security/eap-method-simple.ui
+@@ -22,8 +22,8 @@
+           <object class="GtkLabel" id="eap_simple_username_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_Username:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">_Username</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_simple_username_entry</property>
+           </object>
+@@ -36,8 +36,8 @@
+           <object class="GtkLabel" id="eap_simple_password_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_Password:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">_Password</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_simple_password_entry</property>
+           </object>
+diff --git a/panels/network/wireless-security/eap-method-tls.ui 
b/panels/network/wireless-security/eap-method-tls.ui
+index 5557593..3c6291b 100644
+--- a/panels/network/wireless-security/eap-method-tls.ui
++++ b/panels/network/wireless-security/eap-method-tls.ui
+@@ -22,8 +22,8 @@
+           <object class="GtkLabel" id="eap_tls_identity_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">I_dentity:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">I_dentity</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_tls_identity_entry</property>
+           </object>
+@@ -48,8 +48,8 @@
+           <object class="GtkLabel" id="eap_tls_user_cert_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_User certificate:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">_User certificate</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_tls_user_cert_button</property>
+           </object>
+@@ -64,8 +64,8 @@
+           <object class="GtkLabel" id="eap_tls_ca_cert_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">C_A certificate:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">C_A certificate</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_tls_ca_cert_button</property>
+           </object>
+@@ -112,8 +112,8 @@
+           <object class="GtkLabel" id="eap_tls_private_key_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">Private _key:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">Private _key</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_tls_private_key_button</property>
+           </object>
+@@ -142,8 +142,8 @@
+           <object class="GtkLabel" id="eap_tls_private_key_password_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_Private key password:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">_Private key password</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_tls_private_key_password_entry</property>
+           </object>
+diff --git a/panels/network/wireless-security/eap-method-ttls.ui 
b/panels/network/wireless-security/eap-method-ttls.ui
+index ce00c26..70db9ed 100644
+--- a/panels/network/wireless-security/eap-method-ttls.ui
++++ b/panels/network/wireless-security/eap-method-ttls.ui
+@@ -29,8 +29,8 @@
+           <object class="GtkLabel" id="eap_ttls_anon_identity_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">Anony_mous identity:</property>
++            <property name="xalign">1</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>
+           </object>
+@@ -55,8 +55,8 @@
+           <object class="GtkLabel" id="eap_ttls_ca_cert_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">C_A certificate:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">C_A certificate</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_ttls_ca_cert_button</property>
+           </object>
+@@ -103,8 +103,8 @@
+           <object class="GtkLabel" id="eap_ttls_inner_auth_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_Inner authentication:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">_Inner authentication</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">eap_ttls_inner_auth_combo</property>
+           </object>
+diff --git a/panels/network/wireless-security/ws-dynamic-wep.ui 
b/panels/network/wireless-security/ws-dynamic-wep.ui
+index 4bd8520..cf31f12 100644
+--- a/panels/network/wireless-security/ws-dynamic-wep.ui
++++ b/panels/network/wireless-security/ws-dynamic-wep.ui
+@@ -35,8 +35,8 @@
+           <object class="GtkLabel" id="dynamic_wep_auth_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">Au_thentication:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">Au_thentication</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">dynamic_wep_auth_combo</property>
+           </object>
+diff --git a/panels/network/wireless-security/ws-leap.ui b/panels/network/wireless-security/ws-leap.ui
+index dc936ad..b4d9bec 100644
+--- a/panels/network/wireless-security/ws-leap.ui
++++ b/panels/network/wireless-security/ws-leap.ui
+@@ -22,8 +22,8 @@
+           <object class="GtkLabel" id="leap_username_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_Username:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">_Username</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">leap_username_entry</property>
+           </object>
+@@ -36,8 +36,8 @@
+           <object class="GtkLabel" id="leap_password_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_Password:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">_Password</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">leap_password_entry</property>
+           </object>
+diff --git a/panels/network/wireless-security/ws-wep-key.ui b/panels/network/wireless-security/ws-wep-key.ui
+index 62b11a5..c0e5f55 100644
+--- a/panels/network/wireless-security/ws-wep-key.ui
++++ b/panels/network/wireless-security/ws-wep-key.ui
+@@ -52,8 +52,8 @@
+           <object class="GtkLabel" id="wep_key_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_Key:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">_Key</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">wep_key_entry</property>
+           </object>
+@@ -111,8 +111,8 @@
+           <object class="GtkLabel" id="auth_method_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">Au_thentication:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">Au_thentication</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">auth_method_combo</property>
+           </object>
+@@ -148,8 +148,8 @@
+           <object class="GtkLabel" id="key_index_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">WEP inde_x:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">WEP inde_x</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">key_index_combo</property>
+           </object>
+diff --git a/panels/network/wireless-security/ws-wpa-eap.ui b/panels/network/wireless-security/ws-wpa-eap.ui
+index 2da2148..942af88 100644
+--- a/panels/network/wireless-security/ws-wpa-eap.ui
++++ b/panels/network/wireless-security/ws-wpa-eap.ui
+@@ -29,8 +29,8 @@
+           <object class="GtkLabel" id="wpa_eap_auth_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">Au_thentication:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">Au_thentication</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">wpa_eap_auth_combo</property>
+           </object>
+diff --git a/panels/network/wireless-security/ws-wpa-psk.ui b/panels/network/wireless-security/ws-wpa-psk.ui
+index 4ec6909..b34720a 100644
+--- a/panels/network/wireless-security/ws-wpa-psk.ui
++++ b/panels/network/wireless-security/ws-wpa-psk.ui
+@@ -18,8 +18,8 @@
+           <object class="GtkLabel" id="wpa_psk_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_Password:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">_Password</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">wpa_psk_entry</property>
+           </object>
+@@ -46,8 +46,8 @@
+           <object class="GtkLabel" id="wpa_psk_type_label">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+-            <property name="xalign">0</property>
+-            <property name="label" translatable="yes">_Type:</property>
++            <property name="xalign">1</property>
++            <property name="label" translatable="yes">_Type</property>
+             <property name="use_underline">True</property>
+             <property name="mnemonic_widget">wpa_psk_type_combo</property>
+           </object>
+diff --git a/panels/network/wireless-security/eap-method-fast.ui 
b/panels/network/wireless-security/eap-method-fast.ui
+index 5307ddb..36e74c3 100644
+--- a/panels/network/wireless-security/eap-method-fast.ui
++++ b/panels/network/wireless-security/eap-method-fast.ui
+@@ -40,7 +40,7 @@
+         <property name="can_focus">False</property>
+         <property name="n_rows">5</property>
+         <property name="n_columns">2</property>
+-        <property name="column_spacing">12</property>
++        <property name="column_spacing">6</property>
+         <property name="row_spacing">6</property>
+         <child>
+           <object class="GtkLabel" id="eap_fast_anon_identity_label">
+diff --git a/panels/network/wireless-security/eap-method-leap.ui 
b/panels/network/wireless-security/eap-method-leap.ui
+index d4c0625..c4de1dc 100644
+--- a/panels/network/wireless-security/eap-method-leap.ui
++++ b/panels/network/wireless-security/eap-method-leap.ui
+@@ -13,7 +13,7 @@
+         <property name="valign">start</property>
+         <property name="n_rows">3</property>
+         <property name="n_columns">2</property>
+-        <property name="column_spacing">12</property>
++        <property name="column_spacing">6</property>
+         <property name="row_spacing">6</property>
+         <child>
+           <placeholder/>
+diff --git a/panels/network/wireless-security/eap-method-peap.ui 
b/panels/network/wireless-security/eap-method-peap.ui
+index 2f8b8cd..d16e00a 100644
+--- a/panels/network/wireless-security/eap-method-peap.ui
++++ b/panels/network/wireless-security/eap-method-peap.ui
+@@ -40,7 +40,7 @@
+         <property name="can_focus">False</property>
+         <property name="n_rows">5</property>
+         <property name="n_columns">2</property>
+-        <property name="column_spacing">12</property>
++        <property name="column_spacing">6</property>
+         <property name="row_spacing">6</property>
+         <child>
+           <object class="GtkLabel" id="eap_peap_anon_identity_label">
+diff --git a/panels/network/wireless-security/eap-method-simple.ui 
b/panels/network/wireless-security/eap-method-simple.ui
+index 7d95d28..af00cb9 100644
+--- a/panels/network/wireless-security/eap-method-simple.ui
++++ b/panels/network/wireless-security/eap-method-simple.ui
+@@ -13,7 +13,7 @@
+         <property name="valign">start</property>
+         <property name="n_rows">3</property>
+         <property name="n_columns">2</property>
+-        <property name="column_spacing">12</property>
++        <property name="column_spacing">6</property>
+         <property name="row_spacing">6</property>
+         <child>
+           <placeholder/>
+diff --git a/panels/network/wireless-security/eap-method-tls.ui 
b/panels/network/wireless-security/eap-method-tls.ui
+index 3c6291b..0079715 100644
+--- a/panels/network/wireless-security/eap-method-tls.ui
++++ b/panels/network/wireless-security/eap-method-tls.ui
+@@ -13,7 +13,7 @@
+         <property name="valign">start</property>
+         <property name="n_rows">6</property>
+         <property name="n_columns">2</property>
+-        <property name="column_spacing">12</property>
++        <property name="column_spacing">6</property>
+         <property name="row_spacing">6</property>
+         <child>
+           <placeholder/>
+diff --git a/panels/network/wireless-security/eap-method-ttls.ui 
b/panels/network/wireless-security/eap-method-ttls.ui
+index 70db9ed..df942d9 100644
+--- a/panels/network/wireless-security/eap-method-ttls.ui
++++ b/panels/network/wireless-security/eap-method-ttls.ui
+@@ -23,7 +23,7 @@
+         <property name="can_focus">False</property>
+         <property name="n_rows">4</property>
+         <property name="n_columns">2</property>
+-        <property name="column_spacing">12</property>
++        <property name="column_spacing">6</property>
+         <property name="row_spacing">6</property>
+         <child>
+           <object class="GtkLabel" id="eap_ttls_anon_identity_label">
+diff --git a/panels/network/wireless-security/ws-dynamic-wep.ui 
b/panels/network/wireless-security/ws-dynamic-wep.ui
+index cf31f12..d6bc12b 100644
+--- a/panels/network/wireless-security/ws-dynamic-wep.ui
++++ b/panels/network/wireless-security/ws-dynamic-wep.ui
+@@ -23,7 +23,7 @@
+         <property name="can_focus">False</property>
+         <property name="n_rows">3</property>
+         <property name="n_columns">2</property>
+-        <property name="column_spacing">12</property>
++        <property name="column_spacing">6</property>
+         <property name="row_spacing">6</property>
+         <child>
+           <placeholder/>
+diff --git a/panels/network/wireless-security/ws-leap.ui b/panels/network/wireless-security/ws-leap.ui
+index b4d9bec..06cb645 100644
+--- a/panels/network/wireless-security/ws-leap.ui
++++ b/panels/network/wireless-security/ws-leap.ui
+@@ -13,7 +13,7 @@
+         <property name="valign">start</property>
+         <property name="n_rows">3</property>
+         <property name="n_columns">2</property>
+-        <property name="column_spacing">12</property>
++        <property name="column_spacing">6</property>
+         <property name="row_spacing">6</property>
+         <child>
+           <placeholder/>
+diff --git a/panels/network/wireless-security/ws-wep-key.ui b/panels/network/wireless-security/ws-wep-key.ui
+index c0e5f55..a4e14dc 100644
+--- a/panels/network/wireless-security/ws-wep-key.ui
++++ b/panels/network/wireless-security/ws-wep-key.ui
+@@ -46,7 +46,7 @@
+         <property name="can_focus">False</property>
+         <property name="n_rows">4</property>
+         <property name="n_columns">2</property>
+-        <property name="column_spacing">12</property>
++        <property name="column_spacing">6</property>
+         <property name="row_spacing">6</property>
+         <child>
+           <object class="GtkLabel" id="wep_key_label">
+diff --git a/panels/network/wireless-security/ws-wpa-eap.ui b/panels/network/wireless-security/ws-wpa-eap.ui
+index 942af88..5d71936 100644
+--- a/panels/network/wireless-security/ws-wpa-eap.ui
++++ b/panels/network/wireless-security/ws-wpa-eap.ui
+@@ -23,7 +23,7 @@
+         <property name="can_focus">False</property>
+         <property name="n_rows">2</property>
+         <property name="n_columns">2</property>
+-        <property name="column_spacing">12</property>
++        <property name="column_spacing">6</property>
+         <property name="row_spacing">6</property>
+         <child>
+           <object class="GtkLabel" id="wpa_eap_auth_label">
+diff --git a/panels/network/wireless-security/ws-wpa-psk.ui b/panels/network/wireless-security/ws-wpa-psk.ui
+index b34720a..3c689d3 100644
+--- a/panels/network/wireless-security/ws-wpa-psk.ui
++++ b/panels/network/wireless-security/ws-wpa-psk.ui
+@@ -12,7 +12,7 @@
+         <property name="can_focus">False</property>
+         <property name="n_rows">3</property>
+         <property name="n_columns">2</property>
+-        <property name="column_spacing">12</property>
++        <property name="column_spacing">6</property>
+         <property name="row_spacing">6</property>
+         <child>
+           <object class="GtkLabel" id="wpa_psk_label">
diff --git a/panels/network/wireless-security/ws-dynamic-wep.ui 
b/panels/network/wireless-security/ws-dynamic-wep.ui
index 4bd8520..d6bc12b 100644
--- a/panels/network/wireless-security/ws-dynamic-wep.ui
+++ b/panels/network/wireless-security/ws-dynamic-wep.ui
@@ -23,7 +23,7 @@
         <property name="can_focus">False</property>
         <property name="n_rows">3</property>
         <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <property name="row_spacing">6</property>
         <child>
           <placeholder/>
@@ -35,8 +35,8 @@
           <object class="GtkLabel" id="dynamic_wep_auth_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Au_thentication:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Au_thentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">dynamic_wep_auth_combo</property>
           </object>
diff --git a/panels/network/wireless-security/ws-leap.ui b/panels/network/wireless-security/ws-leap.ui
index dc936ad..06cb645 100644
--- a/panels/network/wireless-security/ws-leap.ui
+++ b/panels/network/wireless-security/ws-leap.ui
@@ -13,7 +13,7 @@
         <property name="valign">start</property>
         <property name="n_rows">3</property>
         <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <property name="row_spacing">6</property>
         <child>
           <placeholder/>
@@ -22,8 +22,8 @@
           <object class="GtkLabel" id="leap_username_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Username:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Username</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">leap_username_entry</property>
           </object>
@@ -36,8 +36,8 @@
           <object class="GtkLabel" id="leap_password_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Password:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Password</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">leap_password_entry</property>
           </object>
diff --git a/panels/network/wireless-security/ws-wep-key.ui b/panels/network/wireless-security/ws-wep-key.ui
index 62b11a5..a4e14dc 100644
--- a/panels/network/wireless-security/ws-wep-key.ui
+++ b/panels/network/wireless-security/ws-wep-key.ui
@@ -46,14 +46,14 @@
         <property name="can_focus">False</property>
         <property name="n_rows">4</property>
         <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <property name="row_spacing">6</property>
         <child>
           <object class="GtkLabel" id="wep_key_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Key:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Key</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wep_key_entry</property>
           </object>
@@ -111,8 +111,8 @@
           <object class="GtkLabel" id="auth_method_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Au_thentication:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Au_thentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">auth_method_combo</property>
           </object>
@@ -148,8 +148,8 @@
           <object class="GtkLabel" id="key_index_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">WEP inde_x:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">WEP inde_x</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">key_index_combo</property>
           </object>
diff --git a/panels/network/wireless-security/ws-wpa-eap.ui b/panels/network/wireless-security/ws-wpa-eap.ui
index 2da2148..5d71936 100644
--- a/panels/network/wireless-security/ws-wpa-eap.ui
+++ b/panels/network/wireless-security/ws-wpa-eap.ui
@@ -23,14 +23,14 @@
         <property name="can_focus">False</property>
         <property name="n_rows">2</property>
         <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <property name="row_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="xalign">0</property>
-            <property name="label" translatable="yes">Au_thentication:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Au_thentication</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wpa_eap_auth_combo</property>
           </object>
diff --git a/panels/network/wireless-security/ws-wpa-psk.ui b/panels/network/wireless-security/ws-wpa-psk.ui
index 4ec6909..3c689d3 100644
--- a/panels/network/wireless-security/ws-wpa-psk.ui
+++ b/panels/network/wireless-security/ws-wpa-psk.ui
@@ -12,14 +12,14 @@
         <property name="can_focus">False</property>
         <property name="n_rows">3</property>
         <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
+        <property name="column_spacing">6</property>
         <property name="row_spacing">6</property>
         <child>
           <object class="GtkLabel" id="wpa_psk_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Password:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Password</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wpa_psk_entry</property>
           </object>
@@ -46,8 +46,8 @@
           <object class="GtkLabel" id="wpa_psk_type_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Type:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">_Type</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wpa_psk_type_combo</property>
           </object>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]