--- gdm-2.17.8/gui/greeter/greeter_action_language.c.orig	2007-03-21 18:52:16.401471000 +0900
+++ gdm-2.17.8/gui/greeter/greeter_action_language.c	2007-03-21 19:46:16.037054000 +0900
@@ -311,21 +311,19 @@ greeter_language_ask_restart (gchar *lan
 	gchar *firstmsg;
 	gchar *secondmsg;
 	gchar *login;
-	gint response = GTK_RESPONSE_NO;
+	gint response = GTK_RESPONSE_CANCEL;
 
 	if (always_restart)
 		return GTK_RESPONSE_YES;
 
-	login = info ? _("greeter") : _("login");
-	firstmsg = g_strdup_printf (_("Do you accept to restart %s to change the "
-	                              "locale of %s next time?"),
-	                            login,
+	login = _("the login screen");
+	firstmsg = g_strdup_printf (_("Do you restart %s with the new language?"),
 	                            login);
 	secondmsg = g_strdup_printf (_("Now you are restarting %s for %s locale."),
 	                             login,
 	                             language);
 
-	response = gdm_wm_query_dialog (firstmsg, secondmsg, _("Make _Default"), _("Just For _This Time"), TRUE);
+	response = gdm_wm_query_dialog (firstmsg, secondmsg, _("_OK"), NULL, TRUE);
 
 	g_free (firstmsg);
 	g_free (secondmsg);
--- gdm-2.17.8/gui/greeter/greeter_canvas_item.c.orig	2007-03-21 18:31:50.065719000 +0900
+++ gdm-2.17.8/gui/greeter/greeter_canvas_item.c	2007-03-21 20:00:37.106552000 +0900
@@ -35,7 +35,6 @@
 #include "greeter_configuration.h"
 #include "greeter_canvas_text.h"
 #include "greeter_parser.h"
-#include "greeter_action_language.h"
 
 /* Keep track of buttons so they can be set sensitive/insensitive */
 GtkButton *gtk_ok_button = NULL;
