[gdm] Improve strings for translation. Partially fix bug #582891.

[Brian Cameron <bcameron src gnome org>]

commit 1d1eee0a2408534ce4e41efb801d0fc721611044
Author: Brian Cameron <Brian Cameron sun com>
Date:   Fri Oct 30 21:57:48 2009 -0500

    Improve strings for translation.  Partially fix bug #582891.

 daemon/factory-slave-main.c             |    2 +-
 daemon/gdm-slave.c                      |    8 ++++----
 daemon/gdm-xdmcp-display-factory.c      |    4 ++--
 daemon/main.c                           |    2 +-
 daemon/product-slave-main.c             |    2 +-
 daemon/simple-slave-main.c              |    2 +-
 daemon/xdmcp-chooser-slave-main.c       |    2 +-
 gui/simple-greeter/gdm-chooser-widget.c |    4 ++--
 gui/simple-greeter/gdm-option-widget.c  |    2 +-
 gui/simple-greeter/gdm-user-manager.c   |    6 +++---
 10 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/daemon/factory-slave-main.c b/daemon/factory-slave-main.c
index 7f1ed7e..d8a1338 100644
--- a/daemon/factory-slave-main.c
+++ b/daemon/factory-slave-main.c
@@ -168,7 +168,7 @@ main (int    argc,
         GdmSignalHandler *signal_handler;
         static GOptionEntry entries []   = {
                 { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
-                { "display-id", 0, 0, G_OPTION_ARG_STRING, &display_id, N_("Display ID"), N_("id") },
+                { "display-id", 0, 0, G_OPTION_ARG_STRING, &display_id, N_("Display ID"), N_("ID") },
                 { NULL }
         };
 
diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
index 3307951..e11e16c 100644
--- a/daemon/gdm-slave.c
+++ b/daemon/gdm-slave.c
@@ -520,16 +520,16 @@ gdm_slave_real_start (GdmSlave *slave)
                                  G_TYPE_INVALID);
         if (! res) {
                 if (error != NULL) {
-                        g_warning ("Failed to get display id %s: %s", slave->priv->display_id, error->message);
+                        g_warning ("Failed to get display ID %s: %s", slave->priv->display_id, error->message);
                         g_error_free (error);
                 } else {
-                        g_warning ("Failed to get display id %s", slave->priv->display_id);
+                        g_warning ("Failed to get display ID %s", slave->priv->display_id);
                 }
 
                 return FALSE;
         }
 
-        g_debug ("GdmSlave: Got display id: %s", id);
+        g_debug ("GdmSlave: Got display ID: %s", id);
 
         if (strcmp (id, slave->priv->display_id) != 0) {
                 g_critical ("Display ID doesn't match");
@@ -1062,7 +1062,7 @@ gdm_slave_get_primary_session_id_for_user (GdmSlave   *slave,
         uid_t       uid;
 
         if (slave->priv->display_seat_id == NULL || slave->priv->display_seat_id[0] == '\0') {
-                g_debug ("GdmSlave: display seat id is not set; can't switch sessions");
+                g_debug ("GdmSlave: display seat ID is not set; can't switch sessions");
                 return NULL;
         }
 
diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c
index 838854a..3b94bf8 100644
--- a/daemon/gdm-xdmcp-display-factory.c
+++ b/daemon/gdm-xdmcp-display-factory.c
@@ -2568,10 +2568,10 @@ gdm_xdmcp_handle_manage (GdmXdmcpDisplayFactory *factory,
                 }
         } else if (display != NULL &&
                    gdm_display_get_status (display) == GDM_DISPLAY_MANAGED) {
-                g_debug ("GdmXdmcpDisplayFactory: Session id %ld already managed",
+                g_debug ("GdmXdmcpDisplayFactory: Session ID %ld already managed",
                          (long)clnt_sessid);
         } else {
-                g_warning ("GdmXdmcpDisplayFactory: Failed to look up session id %ld",
+                g_warning ("GdmXdmcpDisplayFactory: Failed to look up session ID %ld",
                            (long)clnt_sessid);
                 gdm_xdmcp_send_refuse (factory, address, clnt_sessid);
         }
diff --git a/daemon/main.c b/daemon/main.c
index 8577ba7..5bb407a 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -596,7 +596,7 @@ main (int    argc,
         /* XDM compliant error message */
         if (getuid () != 0) {
                 /* make sure the pid file doesn't get wiped */
-                g_warning (_("Only root wants to run GDM"));
+                g_warning (_("Only the root user can run GDM"));
                 exit (-1);
         }
 
diff --git a/daemon/product-slave-main.c b/daemon/product-slave-main.c
index f23a28b..3072648 100644
--- a/daemon/product-slave-main.c
+++ b/daemon/product-slave-main.c
@@ -172,7 +172,7 @@ main (int    argc,
         GdmSignalHandler *signal_handler;
         static GOptionEntry entries []   = {
                 { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
-                { "display-id", 0, 0, G_OPTION_ARG_STRING, &display_id, N_("Display ID"), N_("id") },
+                { "display-id", 0, 0, G_OPTION_ARG_STRING, &display_id, N_("Display ID"), N_("ID") },
                 { NULL }
         };
 
diff --git a/daemon/simple-slave-main.c b/daemon/simple-slave-main.c
index 9e71450..b8926d8 100644
--- a/daemon/simple-slave-main.c
+++ b/daemon/simple-slave-main.c
@@ -177,7 +177,7 @@ main (int    argc,
         GdmSignalHandler *signal_handler;
         static GOptionEntry entries []   = {
                 { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
-                { "display-id", 0, 0, G_OPTION_ARG_STRING, &display_id, N_("Display ID"), N_("id") },
+                { "display-id", 0, 0, G_OPTION_ARG_STRING, &display_id, N_("Display ID"), N_("ID") },
                 { NULL }
         };
 
diff --git a/daemon/xdmcp-chooser-slave-main.c b/daemon/xdmcp-chooser-slave-main.c
index 3959f99..b875bfc 100644
--- a/daemon/xdmcp-chooser-slave-main.c
+++ b/daemon/xdmcp-chooser-slave-main.c
@@ -177,7 +177,7 @@ main (int    argc,
         GdmSignalHandler *signal_handler;
         static GOptionEntry entries []   = {
                 { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
-                { "display-id", 0, 0, G_OPTION_ARG_STRING, &display_id, N_("Display ID"), N_("id") },
+                { "display-id", 0, 0, G_OPTION_ARG_STRING, &display_id, N_("Display ID"), N_("ID") },
                 { NULL }
         };
 
diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
index 344ff8e..4fc9ca8 100644
--- a/gui/simple-greeter/gdm-chooser-widget.c
+++ b/gui/simple-greeter/gdm-chooser-widget.c
@@ -2395,7 +2395,7 @@ gdm_chooser_widget_set_item_timer (GdmChooserWidget *widget,
 
         if (timeout == 0) {
                 if (row == NULL) {
-                        g_warning ("could not find item with id '%s' to "
+                        g_warning ("could not find item with ID '%s' to "
                                    "remove timer", id);
                         return;
                 }
@@ -2411,7 +2411,7 @@ gdm_chooser_widget_set_item_timer (GdmChooserWidget *widget,
                 GtkTreePath *path;
 
                 if (!find_item (widget, id, &iter)) {
-                        g_warning ("could not find item with id '%s' to "
+                        g_warning ("could not find item with ID '%s' to "
                                    "add timer", id);
                         return;
                 }
diff --git a/gui/simple-greeter/gdm-option-widget.c b/gui/simple-greeter/gdm-option-widget.c
index 8467eb5..f460c7c 100644
--- a/gui/simple-greeter/gdm-option-widget.c
+++ b/gui/simple-greeter/gdm-option-widget.c
@@ -536,7 +536,7 @@ gdm_option_widget_class_init (GdmOptionWidgetClass *klass)
                                          PROP_DEFAULT_ITEM,
                                          g_param_spec_string ("default-item",
                                                               _("Default Item"),
-                                                              _("The id of the default item"),
+                                                              _("The ID of the default item"),
                                                               NULL,
                                                               G_PARAM_READWRITE));
 
diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c
index 6c91b3b..56ef045 100644
--- a/gui/simple-greeter/gdm-user-manager.c
+++ b/gui/simple-greeter/gdm-user-manager.c
@@ -181,7 +181,7 @@ _get_primary_user_session_id (GdmUserManager *manager,
         char       *primary_ssid;
 
         if (manager->priv->seat_id == NULL || manager->priv->seat_id[0] == '\0') {
-                g_debug ("GdmUserManager: display seat id is not set; can't switch sessions");
+                g_debug ("GdmUserManager: display seat ID is not set; can't switch sessions");
                 return NULL;
         }
 
@@ -355,7 +355,7 @@ _get_login_window_session_id (GdmUserManager *manager)
         int         i;
 
         if (manager->priv->seat_id == NULL || manager->priv->seat_id[0] == '\0') {
-                g_debug ("GdmUserManager: display seat id is not set; can't switch sessions");
+                g_debug ("GdmUserManager: display seat ID is not set; can't switch sessions");
                 return NULL;
         }
 
@@ -901,7 +901,7 @@ seat_session_added (DBusGProxy     *seat_proxy,
         errno = 0;
         pwent = getpwuid (uid);
         if (pwent == NULL) {
-                g_warning ("Unable to lookup user id %d: %s", (int)uid, g_strerror (errno));
+                g_warning ("Unable to lookup user ID %d: %s", (int)uid, g_strerror (errno));
                 return;
         }