[gdm] String fixes. Patch by Philip Withnall. Fixes bug #609178.



commit 1842b8bfd6ef42db24ea32bf75f103e973cba923
Author: Brian Cameron <Brian Cameron sun com>
Date:   Mon May 3 16:02:59 2010 -0500

    String fixes.  Patch by Philip Withnall.  Fixes bug #609178.

 daemon/gdm-factory-slave.c                         |    2 +-
 daemon/gdm-product-slave.c                         |    2 +-
 daemon/gdm-server.c                                |    2 +-
 daemon/gdm-session-worker.c                        |   18 +++++++++---------
 daemon/gdm-simple-slave.c                          |    2 +-
 daemon/main.c                                      |    6 +++---
 .../at-spi-registryd-wrapper.desktop.in.in         |    2 +-
 data/greeter-autostart/gok.desktop.in              |    4 ++--
 gui/simple-greeter/gdm-greeter-login-window.c      |    4 ++--
 gui/simple-greeter/gdm-greeter-panel.c             |    2 +-
 gui/simple-greeter/gdm-language-option-widget.c    |    2 +-
 gui/simple-greeter/gdm-layout-option-widget.c      |    2 +-
 gui/simple-greeter/gdm-remote-login-window.c       |    2 +-
 gui/simple-greeter/gdm-simple-greeter.schemas.in   |   16 ++++++++--------
 gui/simple-greeter/gdm-user-chooser-widget.c       |    6 +++---
 gui/user-switch-applet/applet.c                    |    4 ++--
 utils/gdmflexiserver.c                             |    8 ++++----
 17 files changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c
index 606c995..16553e6 100644
--- a/daemon/gdm-factory-slave.c
+++ b/daemon/gdm-factory-slave.c
@@ -682,7 +682,7 @@ gdm_factory_slave_run (GdmFactorySlave *slave)
                 if (! res) {
                         g_warning (_("Could not start the X "
                                      "server (your graphical environment) "
-                                     "due to some internal error. "
+                                     "due to an internal error. "
                                      "Please contact your system administrator "
                                      "or check your syslog to diagnose. "
                                      "In the meantime this display will be "
diff --git a/daemon/gdm-product-slave.c b/daemon/gdm-product-slave.c
index 1fff780..fac492c 100644
--- a/daemon/gdm-product-slave.c
+++ b/daemon/gdm-product-slave.c
@@ -448,7 +448,7 @@ gdm_product_slave_create_server (GdmProductSlave *slave)
                 if (! res) {
                         g_warning (_("Could not start the X "
                                      "server (your graphical environment) "
-                                     "due to some internal error. "
+                                     "due to an internal error. "
                                      "Please contact your system administrator "
                                      "or check your syslog to diagnose. "
                                      "In the meantime this display will be "
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index 9dc01f7..840a030 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -428,7 +428,7 @@ server_child_setup (GdmServer *server)
                 VE_IGNORE_EINTR (dup2 (logfd, 2));
                 close (logfd);
         } else {
-                g_warning (_("%s: Could not open logfile for display %s!"),
+                g_warning (_("%s: Could not open log file for display %s!"),
                            "gdm_server_spawn",
                            server->priv->display_name);
         }
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index 5e34fb9..ec1d5b0 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -1295,7 +1295,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
                 g_set_error (error,
                              GDM_SESSION_WORKER_ERROR,
                              GDM_SESSION_WORKER_ERROR_AUTHENTICATING,
-                             _("error initiating conversation with authentication system - %s"),
+                             _("error initiating conversation with authentication system: %s"),
                              error_code == PAM_ABORT? _("general failure") :
                              error_code == PAM_BUF_ERR? _("out of memory") :
                              error_code == PAM_SYSTEM_ERR? _("application programmer error") :
@@ -1312,7 +1312,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
                         g_set_error (error,
                                      GDM_SESSION_WORKER_ERROR,
                                      GDM_SESSION_WORKER_ERROR_AUTHENTICATING,
-                                     _("error informing authentication system of preferred username prompt - %s"),
+                                     _("error informing authentication system of preferred username prompt: %s"),
                                      pam_strerror (worker->priv->pam_handle, error_code));
                         goto out;
                 }
@@ -1326,7 +1326,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
                         g_set_error (error,
                                      GDM_SESSION_WORKER_ERROR,
                                      GDM_SESSION_WORKER_ERROR_AUTHENTICATING,
-                                     _("error informing authentication system of user's hostname - %s"),
+                                     _("error informing authentication system of user's hostname: %s"),
                                      pam_strerror (worker->priv->pam_handle, error_code));
                         goto out;
                 }
@@ -1341,7 +1341,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
                 g_set_error (error,
                              GDM_SESSION_WORKER_ERROR,
                              GDM_SESSION_WORKER_ERROR_AUTHENTICATING,
-                             _("error informing authentication system of user's console - %s"),
+                             _("error informing authentication system of user's console: %s"),
                              pam_strerror (worker->priv->pam_handle, error_code));
                 goto out;
         }
@@ -1354,7 +1354,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
                 g_set_error (error,
                              GDM_SESSION_WORKER_ERROR,
                              GDM_SESSION_WORKER_ERROR_AUTHENTICATING,
-                             _("error informing authentication system of display string - %s"),
+                             _("error informing authentication system of display string: %s"),
                              pam_strerror (worker->priv->pam_handle, error_code));
                 goto out;
         }
@@ -1369,7 +1369,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
                 g_set_error (error,
                              GDM_SESSION_WORKER_ERROR,
                              GDM_SESSION_WORKER_ERROR_AUTHENTICATING,
-                             _("error informing authentication system of display xauth credentials - %s"),
+                             _("error informing authentication system of display xauth credentials: %s"),
                              pam_strerror (worker->priv->pam_handle, error_code));
                 goto out;
         }
@@ -2015,12 +2015,12 @@ gdm_session_worker_start_user_session (GdmSessionWorker  *worker,
                 g_free (cachedirname);
 
                 if (setuid (worker->priv->uid) < 0) {
-                        g_debug ("GdmSessionWorker: could not reset uid - %s", g_strerror (errno));
+                        g_debug ("GdmSessionWorker: could not reset uid: %s", g_strerror (errno));
                         _exit (1);
                 }
 
                 if (setsid () < 0) {
-                        g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group - %s",
+                        g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group: %s",
                                  (guint) getpid (), g_strerror (errno));
                         _exit (2);
                 }
@@ -2052,7 +2052,7 @@ gdm_session_worker_start_user_session (GdmSessionWorker  *worker,
                                      environment,
                                      TRUE);
 
-                g_debug ("GdmSessionWorker: child '%s' could not be started - %s",
+                g_debug ("GdmSessionWorker: child '%s' could not be started: %s",
                          worker->priv->arguments[0],
                          g_strerror (errno));
                 g_strfreev (environment);
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 2910366..04c0485 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -1152,7 +1152,7 @@ gdm_simple_slave_run (GdmSimpleSlave *slave)
                 if (! res) {
                         g_warning (_("Could not start the X "
                                      "server (your graphical environment) "
-                                     "due to some internal error. "
+                                     "due to an internal error. "
                                      "Please contact your system administrator "
                                      "or check your syslog to diagnose. "
                                      "In the meantime this display will be "
diff --git a/daemon/main.c b/daemon/main.c
index cfc3655..01fa52d 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -234,7 +234,7 @@ write_pid (void)
         errno = 0;
         pf = open (GDM_PID_FILE, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL, 0644);
         if (pf < 0) {
-                g_warning (_("Cannot write PID file %s: possibly out of diskspace: %s"),
+                g_warning (_("Cannot write PID file %s: possibly out of disk space: %s"),
                            GDM_PID_FILE,
                            g_strerror (errno));
 
@@ -247,7 +247,7 @@ write_pid (void)
         close (pf);
 
         if (written < 0) {
-                g_warning (_("Cannot write PID file %s: possibly out of diskspace: %s"),
+                g_warning (_("Cannot write PID file %s: possibly out of disk space: %s"),
                            GDM_PID_FILE,
                            g_strerror (errno));
                 return;
@@ -531,7 +531,7 @@ main (int    argc,
         static gboolean     fatal_warnings   = FALSE;
         static GOptionEntry entries []   = {
                 { "fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &fatal_warnings, N_("Make all warnings fatal"), NULL },
-                { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time - for debugging"), NULL },
+                { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time (for debugging)"), NULL },
                 { "version", 0, 0, G_OPTION_ARG_NONE, &print_version, N_("Print GDM version"), NULL },
 
                 { NULL }
diff --git a/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in b/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
index 7ac4311..d511e00 100644
--- a/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
+++ b/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-_Name=AT SPI Registry Wrapper
+_Name=AT-SPI Registry Wrapper
 Exec= AT_SPI_REGISTRYD_DIR@/at-spi-registryd
 OnlyShowIn=GNOME;
 AutostartCondition=GNOME /desktop/gnome/interface/accessibility
diff --git a/data/greeter-autostart/gok.desktop.in b/data/greeter-autostart/gok.desktop.in
index f716ac8..04888e2 100644
--- a/data/greeter-autostart/gok.desktop.in
+++ b/data/greeter-autostart/gok.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=GNOME Onscreen Keyboard
-_Comment=Use an onscreen keyboard
+_Name=GNOME On-Screen Keyboard
+_Comment=Use an on-screen keyboard
 TryExec=gok
 Exec=gok --login --access-method=directselection
 Terminal=false
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
index 01d26fa..946f9c5 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -281,7 +281,7 @@ static gboolean
 timed_login_timer (GdmGreeterLoginWindow *login_window)
 {
         set_sensitive (login_window, FALSE);
-        set_message (login_window, _("Automatically logging in..."));
+        set_message (login_window, _("Automatically logging inâ?¦"));
 
         g_debug ("GdmGreeterLoginWindow: timer expired");
         _gdm_greeter_login_window_set_interactive (login_window, TRUE);
@@ -585,7 +585,7 @@ static void
 do_cancel (GdmGreeterLoginWindow *login_window)
 {
         /* need to wait for response from backend */
-        set_message (login_window, _("Cancelling..."));
+        set_message (login_window, _("Cancellingâ?¦"));
         set_busy (login_window);
         set_sensitive (login_window, FALSE);
         g_signal_emit (login_window, signals[CANCELLED], 0);
diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c
index 8452fe3..b46378d 100644
--- a/gui/simple-greeter/gdm-greeter-panel.c
+++ b/gui/simple-greeter/gdm-greeter-panel.c
@@ -921,7 +921,7 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel)
                 panel->priv->shutdown_button = gtk_toggle_button_new ();
 
                 gtk_widget_set_tooltip_text (panel->priv->shutdown_button,
-                                             _("Shutdown Options..."));
+                                             _("Shutdown Optionsâ?¦"));
                 gtk_button_set_relief (GTK_BUTTON (panel->priv->shutdown_button),
                                        GTK_RELIEF_NONE);
 
diff --git a/gui/simple-greeter/gdm-language-option-widget.c b/gui/simple-greeter/gdm-language-option-widget.c
index 72a5dcb..4c0729b 100644
--- a/gui/simple-greeter/gdm-language-option-widget.c
+++ b/gui/simple-greeter/gdm-language-option-widget.c
@@ -240,7 +240,7 @@ gdm_language_option_widget_init (GdmLanguageOptionWidget *widget)
                                     /* translators: This brings up a dialog
                                      * with a list of languages to choose from
                                      */
-                                    C_("language", "Other..."),
+                                    C_("language", "Otherâ?¦"),
                                     _("Choose a language from the "
                                       "full list of available languages."),
                                     GDM_OPTION_WIDGET_POSITION_BOTTOM);
diff --git a/gui/simple-greeter/gdm-layout-option-widget.c b/gui/simple-greeter/gdm-layout-option-widget.c
index 50eb276..ad30fd2 100644
--- a/gui/simple-greeter/gdm-layout-option-widget.c
+++ b/gui/simple-greeter/gdm-layout-option-widget.c
@@ -232,7 +232,7 @@ gdm_layout_option_widget_init (GdmLayoutOptionWidget *widget)
                                     /* translators: This brings up a dialog of
                                      * available keyboard layouts
                                      */
-                                    C_("keyboard", "Other..."),
+                                    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-remote-login-window.c b/gui/simple-greeter/gdm-remote-login-window.c
index 932571f..e673d91 100644
--- a/gui/simple-greeter/gdm-remote-login-window.c
+++ b/gui/simple-greeter/gdm-remote-login-window.c
@@ -185,7 +185,7 @@ gdm_remote_login_window_connect (GdmRemoteLoginWindow *login_window,
         gboolean res;
         char    *title;
 
-        title = g_strdup_printf (_("Remote Login (Connecting to %s...)"), hostname);
+        title = g_strdup_printf (_("Remote Login (Connecting to %sâ?¦)"), hostname);
 
         gtk_window_set_title (GTK_WINDOW (login_window), title);
 
diff --git a/gui/simple-greeter/gdm-simple-greeter.schemas.in b/gui/simple-greeter/gdm-simple-greeter.schemas.in
index b69335d..be94f24 100644
--- a/gui/simple-greeter/gdm-simple-greeter.schemas.in
+++ b/gui/simple-greeter/gdm-simple-greeter.schemas.in
@@ -19,7 +19,7 @@
       <default></default>
       <locale name="C">
         <short>Banner message text</short>
-        <long>Text banner message to show on the login window.</long>
+        <long>Text banner message to show in the login window.</long>
       </locale>
     </schema>
     <schema>
@@ -30,7 +30,7 @@
       <default></default>
       <locale name="C">
         <short>Banner message text when chooser is empty</short>
-        <long>Text banner message to show on the login window when the user chooser is empty, instead of banner_message_text.</long>
+        <long>Text banner message to show in the login window when the user chooser is empty, instead of banner_message_text.</long>
       </locale>
     </schema>
     <schema>
@@ -75,7 +75,7 @@
       <default>[]</default>
       <locale name="C">
         <short>Recently selected languages</short>
-        <long>Set to a list of languages to be shown by default at the login window.</long>
+        <long>Set to a list of languages to be shown by default in the login window.</long>
       </locale>
     </schema>
     <schema>
@@ -87,7 +87,7 @@
       <default>[]</default>
       <locale name="C">
         <short>Recently selected keyboard layouts</short>
-        <long>Set to a list of keyboard layouts to be shown by default at the login window.</long>
+        <long>Set to a list of keyboard layouts to be shown by default in the login window.</long>
       </locale>
     </schema>
     <schema>
@@ -97,8 +97,8 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-        <short>Use compiz as the window manager</short>
-        <long>Set to true to use compiz as the window manager.</long>
+        <short>Use Compiz as the window manager</short>
+        <long>Set to true to use Compiz as the window manager.</long>
       </locale>
     </schema>
 
@@ -233,8 +233,8 @@
       <type>bool</type>
       <default>TRUE</default>
       <locale name="C">
-        <short>True if the xrandr settings manager plugin is enabled.</short>
-        <long>Set to true to enable the xrandr settings manager plugin.</long>
+        <short>True if the XRandR settings manager plugin is enabled.</short>
+        <long>Set to true to enable the XRandR settings manager plugin.</long>
       </locale>
     </schema>
     <schema>
diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
index c43b0cb..1a9b80c 100644
--- a/gui/simple-greeter/gdm-user-chooser-widget.c
+++ b/gui/simple-greeter/gdm-user-chooser-widget.c
@@ -163,7 +163,7 @@ add_user_other (GdmUserChooserWidget *widget)
                                       * manually instead of choosing from
                                       * a list.
                                       */
-                                     C_("user", "Other..."),
+                                     C_("user", "Otherâ?¦"),
                                      _("Choose a different account"),
                                      0,
                                      FALSE,
@@ -177,7 +177,7 @@ add_user_guest (GdmUserChooserWidget *widget)
                                      GDM_USER_CHOOSER_USER_GUEST,
                                      widget->priv->stock_person_pixbuf,
                                      _("Guest"),
-                                     _("Login as a temporary guest"),
+                                     _("Log in as a temporary guest"),
                                      0,
                                      FALSE,
                                      TRUE);
@@ -191,7 +191,7 @@ add_user_auto (GdmUserChooserWidget *widget)
                                      GDM_USER_CHOOSER_USER_AUTO,
                                      NULL,
                                      _("Automatic Login"),
-                                     _("Automatically login to the system after selecting options"),
+                                     _("Automatically log into the system after selecting options"),
                                      0,
                                      FALSE,
                                      TRUE);
diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c
index c240479..0d766a2 100644
--- a/gui/user-switch-applet/applet.c
+++ b/gui/user-switch-applet/applet.c
@@ -886,7 +886,7 @@ on_quit_session_activate (GtkMenuItem   *item,
                                    NULL,
                                    &error);
         if (! res) {
-                g_warning (_("Can't logout: %s"), error->message);
+                g_warning (_("Can't log out: %s"), error->message);
                 g_error_free (error);
         }
 
@@ -1183,7 +1183,7 @@ create_sub_menu (GdmAppletData *adata)
                           G_CALLBACK (on_login_screen_activate), adata);
         /* Only show switch user if there are other users */
 
-        adata->quit_session_item = gtk_image_menu_item_new_with_label (_("Quit..."));
+        adata->quit_session_item = gtk_image_menu_item_new_with_label (_("Quitâ?¦"));
         gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->quit_session_item),
                                        gtk_image_new ());
         gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu),
diff --git a/utils/gdmflexiserver.c b/utils/gdmflexiserver.c
index c02976f..0d8f9bf 100644
--- a/utils/gdmflexiserver.c
+++ b/utils/gdmflexiserver.c
@@ -59,11 +59,11 @@ static char      **args_remaining   = NULL;
 /* Keep all config options for compatibility even if they are noops */
 GOptionEntry options [] = {
         { "command", 'c', 0, G_OPTION_ARG_STRING, &send_command, N_("Only the VERSION command is supported"), N_("COMMAND") },
-        { "xnest", 'n', 0, G_OPTION_ARG_NONE, &use_xnest, N_("Ignored - retained for compatibility"), NULL },
-        { "no-lock", 'l', 0, G_OPTION_ARG_NONE, &no_lock, N_("Ignored - retained for compatibility"), NULL },
+        { "xnest", 'n', 0, G_OPTION_ARG_NONE, &use_xnest, N_("Ignored â?? retained for compatibility"), NULL },
+        { "no-lock", 'l', 0, G_OPTION_ARG_NONE, &no_lock, N_("Ignored â?? retained for compatibility"), NULL },
         { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug_in, N_("Debugging output"), NULL },
-        { "authenticate", 'a', 0, G_OPTION_ARG_NONE, &authenticate, N_("Ignored - retained for compatibility"), NULL },
-        { "startnew", 's', 0, G_OPTION_ARG_NONE, &startnew, N_("Ignored - retained for compatibility"), NULL },
+        { "authenticate", 'a', 0, G_OPTION_ARG_NONE, &authenticate, N_("Ignored â?? retained for compatibility"), NULL },
+        { "startnew", 's', 0, G_OPTION_ARG_NONE, &startnew, N_("Ignored â?? retained for compatibility"), NULL },
         { "monte-carlo-pi", 0, 0, G_OPTION_ARG_NONE, &monte_carlo_pi, NULL, NULL },
         { "version", 0, 0, G_OPTION_ARG_NONE, &show_version, N_("Version of this application"), NULL },
         { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &args_remaining, NULL, NULL },



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