? gui/bak
Index: gui/gdmXnestchooser.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/gdmXnestchooser.c,v
retrieving revision 1.26
diff -u -r1.26 gdmXnestchooser.c
--- gui/gdmXnestchooser.c	15 Jun 2005 12:42:22 -0000	1.26
+++ gui/gdmXnestchooser.c	15 Jul 2005 07:44:50 -0000
@@ -552,8 +552,8 @@
 				 "%s",
 				 _("Please ask your "
 				   "system administrator to enable "
-				   "it in the GDM configurator "
-				   "program."));
+				   "it in the GDM configuration "
+				   "application."));
 			gtk_widget_show_all (d);
 			gtk_dialog_run (GTK_DIALOG (d));
 			gtk_widget_destroy (d);
@@ -573,8 +573,8 @@
 				 "%s",
 				 _("Please ask your "
 				   "system administrator to enable "
-				   "it in the GDM configurator "
-				   "program."));
+				   "it in the GDM configuration "
+				   "application."));
 			gtk_widget_show_all (d);
 			gtk_dialog_run (GTK_DIALOG (d));
 			gtk_widget_destroy (d);
Index: gui/gdmchooser.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/gdmchooser.c,v
retrieving revision 1.75
diff -u -r1.75 gdmchooser.c
--- gui/gdmchooser.c	2 Jun 2005 16:34:11 -0000	1.75
+++ gui/gdmchooser.c	15 Jul 2005 07:44:50 -0000
@@ -1677,11 +1677,11 @@
 		 GTK_BUTTONS_OK,
 		 _("The main area of this application shows the hosts on "
 		   "the local network that have \"XDMCP\" enabled. This "
-		   "allows users to login remotely to other machines as "
+		   "allows users to login remotely to other computers as "
 		   "if they were logged on using the console.\n\n"
 		   "You can rescan the network for new hosts by clicking "
 		   "\"Refresh\".  When you have selected a host click "
-		   "\"Connect\" to open a session to that machine."));
+		   "\"Connect\" to open a session to that computer."));
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 
 	if (RUNNING_UNDER_GDM)
Index: gui/gdmcomm.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/gdmcomm.c,v
retrieving revision 1.19
diff -u -r1.19 gdmcomm.c
--- gui/gdmcomm.c	15 Jun 2005 12:42:22 -0000	1.19
+++ gui/gdmcomm.c	15 Jul 2005 07:44:50 -0000
@@ -477,7 +477,7 @@
 				 "order to use the nested login.");
 		else
 			return _("The X server is not available. "
-				 "Gdm may be misconfigured.");
+				 "GDM may be misconfigured.");
 	} else if (strncmp (ret, "ERROR 7 ", strlen ("ERROR 7 ")) == 0) {
 		return _("Trying to set an unknown logout action, or trying "
 			 "to set a logout action which is not available.");
Index: gui/gdmlogin.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/gdmlogin.c,v
retrieving revision 1.240
diff -u -r1.240 gdmlogin.c
--- gui/gdmlogin.c	30 Jun 2005 20:52:33 -0000	1.240
+++ gui/gdmlogin.c	15 Jul 2005 07:44:51 -0000
@@ -412,8 +412,8 @@
 					    GTK_MESSAGE_ERROR,
 					    GTK_BUTTONS_OK,
 					    FALSE,
-					    _("Cannot start background program"),
-					    _("Cannot start program '%s': %s."),
+					    _("Cannot start background application"),
+					    _("Cannot run command '%s': %s."),
 					    command,
 					    error->message);
 		gtk_widget_show_all (dialog);
@@ -806,7 +806,7 @@
 static void
 gdm_login_restart_handler (void)
 {
-	if (gdm_common_query (_("Are you sure you want to restart the machine?"),
+	if (gdm_common_query (_("Are you sure you want to restart the computer?"),
 			     FALSE /* markup */,
 			     _("_Restart"), NULL, TRUE) == GTK_RESPONSE_YES) {
 		closelog();
@@ -820,7 +820,7 @@
 static void
 gdm_login_halt_handler (void)
 {
-	if (gdm_common_query (_("Are you sure you want to shut down the machine?"),
+	if (gdm_common_query (_("Are you sure you want to shut down the computer?"),
 			     FALSE /* markup */,
 			     _("Shut _Down"), NULL, TRUE) == GTK_RESPONSE_YES) {
 		closelog();
@@ -842,7 +842,7 @@
 static void
 gdm_login_suspend_handler (void)
 {
-	if (gdm_common_query (_("Are you sure you want to suspend the machine?"),
+	if (gdm_common_query (_("Are you sure you want to suspend the computer?"),
 			     FALSE /* markup */,
 			     _("_Suspend"), NULL, TRUE) == GTK_RESPONSE_YES) {
 		/* suspend interruption */
@@ -1073,7 +1073,7 @@
 	    g_free (session);
 	    session = g_strdup (default_session);
             msg = g_strdup_printf (_("Your preferred session type %s is not "
-				     "installed on this machine.\n"
+				     "installed on this computer.\n"
                                      "Do you wish to make %s the default for "
 				     "future sessions?"),
                                    gdm_session_name (savedsess),
@@ -2815,7 +2815,7 @@
 		gtk_tooltips_set_tip (tooltips, GTK_WIDGET (item),
 				      _("Run an XDMCP chooser which will allow "
 					"you to log into available remote "
-					"machines, if there are any."),
+					"computers, if there are any."),
 				      NULL);
 		got_anything = TRUE;
 	}
@@ -3949,7 +3949,7 @@
 					_("The configuration was not found.  GDM is using "
 					  "defaults to run this session.  You should log in "
 					  "and create a configuration file with the GDM "
-					  "configuration program."));
+					  "configuration application."));
 	    gtk_widget_show_all (dialog);
 	    gdm_wm_center_window (GTK_WINDOW (dialog));
 
Index: gui/gdmphotosetup.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/gdmphotosetup.c,v
retrieving revision 1.39
diff -u -r1.39 gdmphotosetup.c
--- gui/gdmphotosetup.c	14 Jul 2005 20:24:03 -0000	1.39
+++ gui/gdmphotosetup.c	15 Jul 2005 07:44:51 -0000
@@ -272,8 +272,8 @@
 				       _("The face browser is not configured in the "
 					 "GDM configuration.  Please ask your "
 					 "system administrator to enable "
-					 "it in the GDM configurator "
-					 "program."));
+					 "it in the GDM configuration "
+					 "application."));
 
 		gtk_dialog_run (GTK_DIALOG (d));
 		gtk_widget_destroy (d);
Index: gui/gdmsetup.glade
===================================================================
RCS file: /cvs/gnome/gdm2/gui/gdmsetup.glade,v
retrieving revision 1.34
diff -u -r1.34 gdmsetup.glade
--- gui/gdmsetup.glade	10 Jun 2005 17:45:13 -0000	1.34
+++ gui/gdmsetup.glade	15 Jul 2005 07:44:51 -0000
@@ -2298,7 +2298,7 @@
 		    <widget class="GtkLabel" id="label111">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">&lt;b&gt;WARNING:&lt;/b&gt; Placing values in this section that your Xserver does not support will stop your Xserver
-from restarting (effectively not allowing this configuration program to run), BE CAREFUL!</property>
+from restarting (effectively not allowing this configuration application to run), BE CAREFUL!</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2906,7 +2906,7 @@
 				      <child>
 					<widget class="GtkCheckButton" id="xserver_handled_checkbutton">
 					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Is a login attempt handled by this machine?</property>
+					  <property name="tooltip" translatable="yes">Is a login attempt handled by this computer?</property>
 					  <property name="can_focus">True</property>
 					  <property name="label" translatable="yes">Handled</property>
 					  <property name="use_underline">True</property>
Index: gui/greeter/greeter.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/greeter/greeter.c,v
retrieving revision 1.91
diff -u -r1.91 greeter.c
--- gui/greeter/greeter.c	2 Jun 2005 16:34:19 -0000	1.91
+++ gui/greeter/greeter.c	15 Jul 2005 07:44:51 -0000
@@ -1570,7 +1570,7 @@
 				  _("The configuration was not found.  GDM is using "
 				    "defaults to run this session.  You should log in "
 				    "and create a configuration file with the GDM "
-				    "configuration program."));
+				    "configuration application."));
 
       gtk_widget_show_all (dialog);
       gdm_wm_center_window (GTK_WINDOW (dialog));
Index: gui/greeter/greeter_session.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/greeter/greeter_session.c,v
retrieving revision 1.32
diff -u -r1.32 greeter_session.c
--- gui/greeter/greeter_session.c	4 May 2005 23:04:48 -0000	1.32
+++ gui/greeter/greeter_session.c	15 Jul 2005 07:44:51 -0000
@@ -117,7 +117,7 @@
 	  
 	  session = g_strdup (default_session);
 	  msg = g_strdup_printf (_("Your preferred session type %s is not "
-				   "installed on this machine.\n"
+				   "installed on this computer.\n"
 				   "Do you wish to make %s the default for "
 				   "future sessions?"),
 				 gdm_session_name (saved_session),
Index: gui/greeter/greeter_system.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/greeter/greeter_system.c,v
retrieving revision 1.29
diff -u -r1.29 greeter_system.c
--- gui/greeter/greeter_system.c	2 Jun 2005 16:34:21 -0000	1.29
+++ gui/greeter/greeter_system.c	15 Jul 2005 07:44:51 -0000
@@ -60,7 +60,7 @@
 static void
 query_greeter_restart_handler (void)
 {
-	if (gdm_common_query (_("Are you sure you want to restart the machine?"),
+	if (gdm_common_query (_("Are you sure you want to restart the computer?"),
 			   FALSE /* markup */, _("_Reboot"), NULL,
 			   TRUE) == GTK_RESPONSE_YES) {
 		closelog();
@@ -73,7 +73,7 @@
 static void
 query_greeter_halt_handler (void)
 {
-	if (gdm_common_query (_("Are you sure you want to shut down the machine?"),
+	if (gdm_common_query (_("Are you sure you want to shut down the computer?"),
 			   FALSE /* markup */, _("Shut _Down"), NULL,
 			   TRUE) == GTK_RESPONSE_YES) {
 		closelog();
@@ -85,7 +85,7 @@
 static void
 query_greeter_suspend_handler (void)
 {
-	if (gdm_common_query (_("Are you sure you want to suspend the machine?"),
+	if (gdm_common_query (_("Are you sure you want to suspend the computer?"),
 			   FALSE /* markup */, _("_Suspend"), NULL,
 			   TRUE) == GTK_RESPONSE_YES) {
 		/* suspend interruption */
@@ -158,7 +158,7 @@
 		gtk_tooltips_set_tip (tooltips, GTK_WIDGET (w),
 				      _("Run an XDMCP chooser which will allow "
 					"you to log into available remote "
-					"machines, if there are any."),
+					"computers, if there are any."),
 				      NULL);
 	}
 
@@ -348,7 +348,7 @@
 	  gtk_tooltips_set_tip (tooltips, GTK_WIDGET (chooser_radio),
 				_("Run an XDMCP chooser which will allow "
 				  "you to log into available remote "
-				  "machines, if there are any."),
+				  "computers, if there are any."),
 				NULL);
 	  g_signal_connect(G_OBJECT(chooser_radio), "button_press_event",
 			   G_CALLBACK(radio_button_press_event), NULL);
