[gdm: 38/70] One more crack at bug 517558. Use the correct context for keyboard layout

[Ray Strode <halfline src gnome org>]

commit 78979f6e4a74cdb095bbcafd9fb70a97ee57ab67
Author: Ray Strode <rstrode redhat com>
Date:   Thu Feb 12 03:20:12 2009 +0000

    One more crack at bug 517558. Use the correct context for keyboard layout
    
    2009-02-11  Ray Strode  <rstrode redhat com>
    
    	* gui/simple-greeter/gdm-language-option-widget.c
    	(gdm_language_option_widget_init):
    	* gui/simple-greeter/gdm-layout-option-widget.c
    	(gdm_layout_option_widget_init):
    	* gui/simple-greeter/gdm-user-chooser-widget.c
    	(add_other_user): One more crack at bug 517558.
    	Use the correct context for keyboard layout
    	"Other..." menu item, and add translator comment
    	explaining in more detail what the various
    	"Other..." items mean.
    
    svn path=/trunk/; revision=6698
---
 ChangeLog                                       |   13 +++++++++++++
 gui/simple-greeter/gdm-language-option-widget.c |    3 +++
 gui/simple-greeter/gdm-layout-option-widget.c   |    5 ++++-
 gui/simple-greeter/gdm-user-chooser-widget.c    |    5 +++++
 4 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b2f05a3..74fb36a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-02-11  Ray Strode  <rstrode redhat com>
+
+	* gui/simple-greeter/gdm-language-option-widget.c
+	(gdm_language_option_widget_init):
+	* gui/simple-greeter/gdm-layout-option-widget.c
+	(gdm_layout_option_widget_init):
+	* gui/simple-greeter/gdm-user-chooser-widget.c
+	(add_other_user): One more crack at bug 517558.
+	Use the correct context for keyboard layout
+	"Other..." menu item, and add translator comment
+	explaining in more detail what the various
+	"Other..." items mean.
+
 2009-02-11 Brian Cameron <brian cameron sun com>
 
 	* config/Makefile.am, config/Xsession.common, config/Xsession.in
diff --git a/gui/simple-greeter/gdm-language-option-widget.c b/gui/simple-greeter/gdm-language-option-widget.c
index e28c4ca..b31bd0b 100644
--- a/gui/simple-greeter/gdm-language-option-widget.c
+++ b/gui/simple-greeter/gdm-language-option-widget.c
@@ -225,6 +225,9 @@ gdm_language_option_widget_init (GdmLanguageOptionWidget *widget)
 
         gdm_option_widget_add_item (GDM_OPTION_WIDGET (widget),
                                     "__other",
+                                    /* translators: This brings up a dialog
+                                     * with a list of languages to choose from
+                                     */
                                     C_("language", "Other..."),
                                     _("Choose a language from the "
                                       "full list of available languages."),
diff --git a/gui/simple-greeter/gdm-layout-option-widget.c b/gui/simple-greeter/gdm-layout-option-widget.c
index 2fcced4..a6eb1b9 100644
--- a/gui/simple-greeter/gdm-layout-option-widget.c
+++ b/gui/simple-greeter/gdm-layout-option-widget.c
@@ -217,7 +217,10 @@ gdm_layout_option_widget_init (GdmLayoutOptionWidget *widget)
 
         gdm_option_widget_add_item (GDM_OPTION_WIDGET (widget),
                                     "__other",
-                                    C_("language", "Other..."),
+                                    /* translators: This brings up a dialog of
+                                     * available keyboard layouts
+                                     */
+                                    C_("keyboard", "Other..."),
                                     _("Choose a keyboard layout from the "
                                       "full list of available layouts."),
                                     GDM_OPTION_WIDGET_POSITION_BOTTOM);
diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
index 063e2d0..79eb982 100644
--- a/gui/simple-greeter/gdm-user-chooser-widget.c
+++ b/gui/simple-greeter/gdm-user-chooser-widget.c
@@ -128,6 +128,11 @@ add_user_other (GdmUserChooserWidget *widget)
         gdm_chooser_widget_add_item (GDM_CHOOSER_WIDGET (widget),
                                      GDM_USER_CHOOSER_USER_OTHER,
                                      NULL,
+                                     /* translators: This option prompts
+                                      * the user to type in a username
+                                      * manually instead of choosing from
+                                      * a list.
+                                      */
                                      C_("user", "Other..."),
                                      _("Choose a different account"),
                                      0,