diff options
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/factory-slave-main.c | 2 | ||||
| -rw-r--r-- | daemon/gdm-slave.c | 8 | ||||
| -rw-r--r-- | daemon/gdm-xdmcp-display-factory.c | 4 | ||||
| -rw-r--r-- | daemon/main.c | 2 | ||||
| -rw-r--r-- | daemon/product-slave-main.c | 2 | ||||
| -rw-r--r-- | daemon/simple-slave-main.c | 2 | ||||
| -rw-r--r-- | daemon/xdmcp-chooser-slave-main.c | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/daemon/factory-slave-main.c b/daemon/factory-slave-main.c index 7f1ed7ee..d8a13381 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 33079515..e11e16c5 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 838854a7..3b94bf83 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 8577ba74..5bb407af 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 f23a28b9..3072648d 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 9e714505..b8926d8b 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 3959f99f..b875bfcd 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 } }; |