GNOME.org
 

[network-manager-applet] ui: adjust mnemonics keys not to collide

commit 27a5ce84c041f91b1ca07d1524ab0c222f469df9
Author: JiÅÃ KlimeÅ <jklimes redhat com>
Date:   Thu Feb 9 13:13:16 2012 +0100

    ui: adjust mnemonics keys not to collide

 src/connection-editor/ce-ip4-routes.ui             |    2 +-
 src/connection-editor/ce-ip6-routes.ui             |    2 +-
 src/connection-editor/ce-page-ip4.ui               |    5 +++--
 src/connection-editor/ce-page-ip6.ui               |    5 +++--
 src/connection-editor/ce-page-mobile.ui            |    5 +++--
 src/connection-editor/ce-page-wireless-security.ui |    2 +-
 src/connection-editor/page-wired-security.c        |    4 ++--
 src/wireless-security/eap-method-fast.ui           |    6 +++---
 src/wireless-security/eap-method-peap.ui           |    4 ++--
 src/wireless-security/eap-method-ttls.ui           |    2 +-
 src/wireless-security/ws-dynamic-wep.ui            |    2 +-
 src/wireless-security/ws-wep-key.ui                |    2 +-
 src/wireless-security/ws-wpa-eap.ui                |    2 +-
 13 files changed, 23 insertions(+), 20 deletions(-)
---
diff --git a/src/connection-editor/ce-ip4-routes.ui b/src/connection-editor/ce-ip4-routes.ui
index fa0281c..0242076 100644
--- a/src/connection-editor/ce-ip4-routes.ui
+++ b/src/connection-editor/ce-ip4-routes.ui
@@ -110,7 +110,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="ip4_never_default">
-                <property name="label" translatable="yes">Use this c_onnection only for resources on its network</property>
+                <property name="label" translatable="yes">_Use this connection only for resources on its network</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/src/connection-editor/ce-ip6-routes.ui b/src/connection-editor/ce-ip6-routes.ui
index bc9799b..db936c8 100644
--- a/src/connection-editor/ce-ip6-routes.ui
+++ b/src/connection-editor/ce-ip6-routes.ui
@@ -109,7 +109,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="ip6_never_default">
-                <property name="label" translatable="yes">Use this c_onnection only for resources on its network</property>
+                <property name="label" translatable="yes">_Use this connection only for resources on its network</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/src/connection-editor/ce-page-ip4.ui b/src/connection-editor/ce-page-ip4.ui
index bb40efb..15ebe0f 100644
--- a/src/connection-editor/ce-page-ip4.ui
+++ b/src/connection-editor/ce-page-ip4.ui
@@ -228,7 +228,7 @@
                           <object class="GtkLabel" id="ip4_dns_searches_label">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Search 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>
                           </object>
@@ -274,7 +274,8 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="ip4_required_checkbutton">
-                        <property name="label" translatable="yes">Require IPv4 addressing for this connection to complete</property>
+                        <property name="label" translatable="yes">Require IPv_4 addressing for this connection to complete</property>
+                        <property name="use_underline">True</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
diff --git a/src/connection-editor/ce-page-ip6.ui b/src/connection-editor/ce-page-ip6.ui
index 0c5e585..59570c0 100644
--- a/src/connection-editor/ce-page-ip6.ui
+++ b/src/connection-editor/ce-page-ip6.ui
@@ -199,7 +199,7 @@
                           <object class="GtkLabel" id="ip6_dns_searches_label">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Search 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>
                           </object>
@@ -245,7 +245,8 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="ip6_required_checkbutton">
-                        <property name="label" translatable="yes">Require IPv6 addressing for this connection to complete</property>
+                        <property name="label" translatable="yes">Require IPv_6 addressing for this connection to complete</property>
+                        <property name="use_underline">True</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
diff --git a/src/connection-editor/ce-page-mobile.ui b/src/connection-editor/ce-page-mobile.ui
index b4a1c15..8d88c3f 100644
--- a/src/connection-editor/ce-page-mobile.ui
+++ b/src/connection-editor/ce-page-mobile.ui
@@ -300,7 +300,7 @@
                       <object class="GtkLabel" id="label33">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">PI_N:</property>
+                        <property name="label" translatable="yes">P_IN:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">mobile_pin</property>
                       </object>
@@ -328,7 +328,8 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="mobile_roaming_allowed">
-                        <property name="label" translatable="yes">Allow roaming if home network is not available</property>
+                        <property name="label" translatable="yes">Allow _roaming if home network is not available</property>
+                        <property name="use_underline">True</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
diff --git a/src/connection-editor/ce-page-wireless-security.ui b/src/connection-editor/ce-page-wireless-security.ui
index 6f801d8..63b5033 100644
--- a/src/connection-editor/ce-page-wireless-security.ui
+++ b/src/connection-editor/ce-page-wireless-security.ui
@@ -24,7 +24,7 @@
           <object class="GtkLabel" id="wireless_security_combo_label">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">_Security:</property>
+            <property name="label" translatable="yes">S_ecurity:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">wireless_security_combo</property>
           </object>
diff --git a/src/connection-editor/page-wired-security.c b/src/connection-editor/page-wired-security.c
index 1787087..2979036 100644
--- a/src/connection-editor/page-wired-security.c
+++ b/src/connection-editor/page-wired-security.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2008 - 2011 Red Hat, Inc.
+ * (C) Copyright 2008 - 2012 Red Hat, Inc.
  */
 
 #include "config.h"
@@ -133,7 +133,7 @@ ce_page_wired_security_new (NMConnection *connection,
 	if (nm_connection_get_setting (connection, NM_TYPE_SETTING_802_1X))
 		priv->initial_have_8021x = TRUE;
 
-	priv->enabled = GTK_TOGGLE_BUTTON (gtk_check_button_new_with_label (_("Use 802.1X security for this connection")));
+	priv->enabled = GTK_TOGGLE_BUTTON (gtk_check_button_new_with_mnemonic (_("Use 802.1_X security for this connection")));
 
 	g_signal_connect (self, "initialized", G_CALLBACK (finish_setup), NULL);
 
diff --git a/src/wireless-security/eap-method-fast.ui b/src/wireless-security/eap-method-fast.ui
index 3129e0b..362b140 100644
--- a/src/wireless-security/eap-method-fast.ui
+++ b/src/wireless-security/eap-method-fast.ui
@@ -68,7 +68,7 @@
               <object class="GtkLabel" id="eap_fast_pac_file_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</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>
               </object>
@@ -111,7 +111,7 @@
               <object class="GtkLabel" id="eap_fast_inner_auth_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">I_nner 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>
               </object>
@@ -144,7 +144,7 @@
             </child>
             <child>
               <object class="GtkCheckButton" id="eap_fast_pac_provision_checkbutton">
-                <property name="label" translatable="yes">_Allow automatic PAC provisioning</property>
+                <property name="label" translatable="yes">Allow automatic PAC pro_visioning</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/src/wireless-security/eap-method-peap.ui b/src/wireless-security/eap-method-peap.ui
index 04d0a0a..dcfa9d5 100644
--- a/src/wireless-security/eap-method-peap.ui
+++ b/src/wireless-security/eap-method-peap.ui
@@ -111,7 +111,7 @@
               <object class="GtkLabel" id="eap_peap_inner_auth_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">I_nner authentication:</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>
@@ -146,7 +146,7 @@
               <object class="GtkLabel" id="eap_peap_version_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</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="mnemonic_widget">eap_peap_version_combo</property>
               </object>
diff --git a/src/wireless-security/eap-method-ttls.ui b/src/wireless-security/eap-method-ttls.ui
index d77fcb4..c3046c1 100644
--- a/src/wireless-security/eap-method-ttls.ui
+++ b/src/wireless-security/eap-method-ttls.ui
@@ -80,7 +80,7 @@
               <object class="GtkLabel" id="eap_ttls_inner_auth_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">I_nner authentication:</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/src/wireless-security/ws-dynamic-wep.ui b/src/wireless-security/ws-dynamic-wep.ui
index d993f60..b5c02b7 100644
--- a/src/wireless-security/ws-dynamic-wep.ui
+++ b/src/wireless-security/ws-dynamic-wep.ui
@@ -27,7 +27,7 @@
               <object class="GtkLabel" id="dynamic_wep_auth_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Authentication:</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/src/wireless-security/ws-wep-key.ui b/src/wireless-security/ws-wep-key.ui
index 7282c67..9b5e734 100644
--- a/src/wireless-security/ws-wep-key.ui
+++ b/src/wireless-security/ws-wep-key.ui
@@ -105,7 +105,7 @@
               <object class="GtkLabel" id="auth_method_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Authentication:</property>
+                <property name="label" translatable="yes">Au_thentication:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">auth_method_combo</property>
               </object>
diff --git a/src/wireless-security/ws-wpa-eap.ui b/src/wireless-security/ws-wpa-eap.ui
index e98290c..646c4d3 100644
--- a/src/wireless-security/ws-wpa-eap.ui
+++ b/src/wireless-security/ws-wpa-eap.ui
@@ -27,7 +27,7 @@
               <object class="GtkLabel" id="wpa_eap_auth_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Authentication:</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>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]