diff options
author | Brian Cameron <brian.cameron@sun.com> | 2005-12-14 00:06:46 +0000 |
---|---|---|
committer | Brian Cameron <bcameron@src.gnome.org> | 2005-12-14 00:06:46 +0000 |
commit | c0796968995b6702453d36f666f783a488530ff0 (patch) | |
tree | 5c9fbc39b0d07ff58fa80b5d64697cc1c6189ccd | |
parent | 3bdbec9f539b3345ac93934aba554124c1784f0e (diff) | |
download | gdm-c0796968995b6702453d36f666f783a488530ff0.tar.gz |
Now consistantly use "GDM" in strings instead of "gdm". Fixes bug #323221.
2005-12-13 Brian Cameron <brian.cameron@sun.com>
* daemon/gdm.c, daemon/slave.c, daemon/verify-pam.c,
gui/gdmXnestchooser.c, gui/gdmchooser.c,
gui/gdmcomm.c, gui/gdmflexiserver.c,
gui/gdmlogin.c, gui/gdmsetup.glade,
gui/greeter/greeter.c: Now consistantly use
"GDM" in strings instead of "gdm". Fixes bug
#323221. Thanks to Adam Weinberger
<adamw@gnome.org> for pointing this out.
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | daemon/gdm.c | 4 | ||||
-rw-r--r-- | daemon/slave.c | 2 | ||||
-rw-r--r-- | daemon/verify-pam.c | 4 | ||||
-rw-r--r-- | gui/gdmXnestchooser.c | 2 | ||||
-rw-r--r-- | gui/gdmchooser.c | 4 | ||||
-rw-r--r-- | gui/gdmcomm.c | 8 | ||||
-rw-r--r-- | gui/gdmflexiserver.c | 2 | ||||
-rw-r--r-- | gui/gdmlogin.c | 16 | ||||
-rw-r--r-- | gui/gdmsetup.glade | 2 | ||||
-rw-r--r-- | gui/greeter/greeter.c | 14 |
11 files changed, 40 insertions, 29 deletions
@@ -1,3 +1,14 @@ +2005-12-13 Brian Cameron <brian.cameron@sun.com> + + * daemon/gdm.c, daemon/slave.c, daemon/verify-pam.c, + gui/gdmXnestchooser.c, gui/gdmchooser.c, + gui/gdmcomm.c, gui/gdmflexiserver.c, + gui/gdmlogin.c, gui/gdmsetup.glade, + gui/greeter/greeter.c: Now consistantly use + "GDM" in strings instead of "gdm". Fixes bug + #323221. Thanks to Adam Weinberger + <adamw@gnome.org> for pointing this out. + 2005-12-12 Brian Cameron <brian.cameron@sun.com> * gui/gdmsetup.glade: Correct two typos. diff --git a/daemon/gdm.c b/daemon/gdm.c index 7bb25850..44e9c96c 100644 --- a/daemon/gdm.c +++ b/daemon/gdm.c @@ -1427,7 +1427,7 @@ main (int argc, char *argv[]) /* XDM compliant error message */ if G_UNLIKELY (getuid () != 0) { /* make sure the pid file doesn't get wiped */ - gdm_fail (_("Only root wants to run gdm\n")); + gdm_fail (_("Only root wants to run GDM\n")); } main_loop = g_main_loop_new (NULL, FALSE); @@ -1474,7 +1474,7 @@ main (int argc, char *argv[]) gdm_set_value_string (GDM_KEY_PID_FILE, NULL); pidfile = NULL; VE_IGNORE_EINTR (fclose (pf)); - gdm_fail (_("gdm already running. Aborting!")); + gdm_fail (_("GDM already running. Aborting!")); } if (pf != NULL) diff --git a/daemon/slave.c b/daemon/slave.c index 1e040c52..361355ea 100644 --- a/daemon/slave.c +++ b/daemon/slave.c @@ -1294,7 +1294,7 @@ gdm_slave_run (GdmDisplay *display) "Please contact your system administrator\n" "or check your syslog to diagnose.\n" "In the meantime this display will be\n" - "disabled. Please restart gdm when\n" + "disabled. Please restart GDM when\n" "the problem is corrected."))); gdm_slave_quick_exit (DISPLAY_ABORT); } diff --git a/daemon/verify-pam.c b/daemon/verify-pam.c index a6439020..19bf59e9 100644 --- a/daemon/verify-pam.c +++ b/daemon/verify-pam.c @@ -1518,9 +1518,9 @@ gdm_verify_check (void) if (gdm_get_value_bool (GDM_KEY_CONSOLE_NOTIFY)) gdm_text_message_dialog - (C_(N_("Can't find PAM configuration for gdm."))); + (C_(N_("Can't find PAM configuration for GDM."))); gdm_fail ("gdm_verify_check: %s", - _("Can't find PAM configuration for gdm.")); + _("Can't find PAM configuration for GDM.")); } if (ph != NULL) diff --git a/gui/gdmXnestchooser.c b/gui/gdmXnestchooser.c index de5c5780..13bd0ae7 100644 --- a/gui/gdmXnestchooser.c +++ b/gui/gdmXnestchooser.c @@ -177,7 +177,7 @@ static const struct poptOption options[] = { { "direct", 'd', POPT_ARG_NONE, &do_direct, 0, N_("Do direct query instead of indirect (chooser)"), NULL }, { "broadcast", 'B', POPT_ARG_NONE, &do_broadcast, 0, N_("Run broadcast instead of indirect (chooser)"), NULL }, { "background", 'b', POPT_ARG_NONE, &background, 0, N_("Run in background"), NULL }, - { "no-gdm-check", '\0', POPT_ARG_NONE, &no_gdm_check, 0, N_("Don't check for running gdm"), NULL }, + { "no-gdm-check", '\0', POPT_ARG_NONE, &no_gdm_check, 0, N_("Don't check for running GDM"), NULL }, { NULL } }; diff --git a/gui/gdmchooser.c b/gui/gdmchooser.c index 997a3c17..6cd362bf 100644 --- a/gui/gdmchooser.c +++ b/gui/gdmchooser.c @@ -1994,8 +1994,8 @@ main (int argc, char *argv[]) msg = g_strdup_printf (_("The chooser version (%s) does not match the daemon " "version (%s). " - "You have probably just upgraded gdm. " - "Please restart the gdm daemon or the computer."), + "You have probably just upgraded GDM. " + "Please restart the GDM daemon or the computer."), VERSION, gdm_version); dialog = ve_hig_dialog_new (NULL /* parent */, diff --git a/gui/gdmcomm.c b/gui/gdmcomm.c index 2fc6891b..235241cb 100644 --- a/gui/gdmcomm.c +++ b/gui/gdmcomm.c @@ -458,10 +458,10 @@ gdmcomm_get_error_message (const char *ret, gboolean use_xnest) { /* These need a bit more refinement */ if (ret == NULL) { - return _("Cannot communicate with gdm. Perhaps " + return _("Cannot communicate with GDM. Perhaps " "you have an old version running."); } else if (strncmp (ret, "ERROR 0 ", strlen ("ERROR 0 ")) == 0) { - return _("Cannot communicate with gdm. Perhaps " + return _("Cannot communicate with GDM. Perhaps " "you have an old version running."); } else if (strncmp (ret, "ERROR 1 ", strlen ("ERROR 1 ")) == 0) { return _("The allowed limit of flexible X servers reached."); @@ -479,7 +479,7 @@ gdmcomm_get_error_message (const char *ret, gboolean use_xnest) } else if (strncmp (ret, "ERROR 6 ", strlen ("ERROR 6 ")) == 0) { if (use_xnest) return _("The nested X server (Xnest) is not " - "available, or gdm is badly configured.\n" + "available, or GDM is badly configured.\n" "Please install the Xnest package in " "order to use the nested login."); else @@ -499,7 +499,7 @@ gdmcomm_get_error_message (const char *ret, gboolean use_xnest) "for this operation. Perhaps your .Xauthority " "file is not set up correctly."); } else if (strncmp (ret, "ERROR 200 ", strlen ("ERROR 200 ")) == 0) { - return _("Too many messages were sent to gdm and it hung up" + return _("Too many messages were sent to GDM and it hung up " "on us."); } else { return _("Unknown error occurred."); diff --git a/gui/gdmflexiserver.c b/gui/gdmflexiserver.c index 5af20cb4..497efb79 100644 --- a/gui/gdmflexiserver.c +++ b/gui/gdmflexiserver.c @@ -685,7 +685,7 @@ calc_pi (void) } struct poptOption options [] = { - { "command", 'c', POPT_ARG_STRING, &send_command, 0, N_("Send the specified protocol command to gdm"), N_("COMMAND") }, + { "command", 'c', POPT_ARG_STRING, &send_command, 0, N_("Send the specified protocol command to GDM"), N_("COMMAND") }, { "xnest", 'n', POPT_ARG_NONE, &use_xnest, 0, N_("Xnest mode"), NULL }, { "no-lock", 'l', POPT_ARG_NONE, &no_lock, 0, N_("Do not lock current screen"), NULL }, { "debug", 'd', POPT_ARG_NONE, &debug, 0, N_("Debugging output"), NULL }, diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c index cfe8ecd0..2a214148 100644 --- a/gui/gdmlogin.c +++ b/gui/gdmlogin.c @@ -3348,8 +3348,8 @@ main (int argc, char *argv[]) msg = g_strdup_printf (_("The greeter version (%s) does not match the daemon " "version. " - "You have probably just upgraded gdm. " - "Please restart the gdm daemon or the computer."), + "You have probably just upgraded GDM. " + "Please restart the GDM daemon or the computer."), VERSION); dialog = ve_hig_dialog_new (NULL /* parent */, @@ -3382,8 +3382,8 @@ main (int argc, char *argv[]) msg = g_strdup_printf (_("The greeter version (%s) does not match the daemon " "version. " - "You have probably just upgraded gdm. " - "Please restart the gdm daemon or the computer."), + "You have probably just upgraded GDM. " + "Please restart the GDM daemon or the computer."), VERSION); dialog = ve_hig_dialog_new (NULL /* parent */, @@ -3430,8 +3430,8 @@ main (int argc, char *argv[]) msg = g_strdup_printf (_("The greeter version (%s) does not match the daemon " "version (%s). " - "You have probably just upgraded gdm. " - "Please restart the gdm daemon or the computer."), + "You have probably just upgraded GDM. " + "Please restart the GDM daemon or the computer."), VERSION, gdm_version); dialog = ve_hig_dialog_new (NULL /* parent */, @@ -3443,7 +3443,7 @@ main (int argc, char *argv[]) g_free (msg); gtk_dialog_add_buttons (GTK_DIALOG (dialog), - _("Restart gdm"), + _("Restart GDM"), RESPONSE_RESTART, _("Restart computer"), RESPONSE_REBOOT, @@ -3645,7 +3645,7 @@ main (int argc, char *argv[]) _("Session directory is missing"), _("Your session directory is missing or empty! " "There are two available sessions you can use, but " - "you should log in and correct the gdm configuration.")); + "you should log in and correct the GDM configuration.")); gtk_widget_show_all (dialog); gdm_wm_center_window (GTK_WINDOW (dialog)); diff --git a/gui/gdmsetup.glade b/gui/gdmsetup.glade index c516a01c..6a635627 100644 --- a/gui/gdmsetup.glade +++ b/gui/gdmsetup.glade @@ -5457,7 +5457,7 @@ Random from selected <child> <widget class="GtkLabel" id="xserver_informationlabel"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Warning:</b> Incorrect settings could prevent the X server from restarting. Changes to these settings will not take effect until gdm is restarted.</property> + <property name="label" translatable="yes"><b>Warning:</b> Incorrect settings could prevent the X server from restarting. Changes to these settings will not take effect until GDM is restarted.</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> diff --git a/gui/greeter/greeter.c b/gui/greeter/greeter.c index c3127101..4d4fcde3 100644 --- a/gui/greeter/greeter.c +++ b/gui/greeter/greeter.c @@ -568,8 +568,8 @@ verify_gdm_version (void) msg = g_strdup_printf (_("The greeter version (%s) does not match the daemon " "version. " - "You have probably just upgraded gdm. " - "Please restart the gdm daemon or the computer."), + "You have probably just upgraded GDM. " + "Please restart the GDM daemon or the computer."), VERSION); dialog = ve_hig_dialog_new (NULL /* parent */, @@ -603,8 +603,8 @@ verify_gdm_version (void) msg = g_strdup_printf (_("The greeter version (%s) does not match the daemon " "version. " - "You have probably just upgraded gdm. " - "Please restart the gdm daemon or the computer."), + "You have probably just upgraded GDM. " + "Please restart the GDM daemon or the computer."), VERSION); dialog = ve_hig_dialog_new (NULL /* parent */, @@ -652,8 +652,8 @@ verify_gdm_version (void) msg = g_strdup_printf (_("The greeter version (%s) does not match the daemon " "version (%s). " - "You have probably just upgraded gdm. " - "Please restart the gdm daemon or the computer."), + "You have probably just upgraded GDM. " + "Please restart the GDM daemon or the computer."), VERSION, gdm_version); dialog = ve_hig_dialog_new (NULL /* parent */, @@ -1187,7 +1187,7 @@ main (int argc, char *argv[]) _("The GTK+ greeter could not be started. " "This display will abort and you may " "have to login another way and fix the " - "installation of gdm"), + "installation of GDM"), ""); gtk_widget_show_all (dialog); |