Index: config/XKeepsCrashing
===================================================================
RCS file: /cvs/gnome/gdm2/config/XKeepsCrashing,v
retrieving revision 1.20
diff -u -r1.20 XKeepsCrashing
--- config/XKeepsCrashing	3 Feb 2005 22:57:45 -0000	1.20
+++ config/XKeepsCrashing	15 Jul 2005 07:43:53 -0000
@@ -38,12 +38,12 @@
   echo "$OUTPUT"
 }
 
-MSG3=`gettextfunc "I cannot start the X server (your graphical interface).  It is likely that it is not set up correctly.  You will need to log in on a console and rerun the X configuration program.  Then restart GDM."`
-MSG4=`gettextfunc "Would you like me to try to run the X configuration program?  Note that you will need the root password for this."`
+MSG3=`gettextfunc "Failed to start the X server (your graphical interface).  It is likely that it is not set up correctly.  You will need to log in on a console and reconfigure the X server.  Then restart GDM."`
+MSG4=`gettextfunc "Would you like to try to configure the X server?  Note that you will need the root password for this."`
 MSG5=`gettextfunc "Please type in the root (privileged user) password."`
-MSG6=`gettextfunc "I will now try to restart the X server again."`
-MSG7=`gettextfunc "I will disable this X server for now.  Restart GDM when it is configured correctly."`
-MSG8=`gettextfunc "I cannot start the X server (your graphical interface).  It is likely that it is not set up correctly.  Would you like to view the X server output to diagnose the problem?"`
+MSG6=`gettextfunc "Trying to restart the X server again."`
+MSG7=`gettextfunc "This X server is disabled for now.  Restart GDM when it is configured correctly."`
+MSG8=`gettextfunc "Failed start the X server (your graphical interface).  It is likely that it is not set up correctly.  Would you like to view the X server output to diagnose the problem?"`
 MSG9=`gettextfunc "Would you like to view the detailed X server output as well?"`
 
 # there are some env vars defined:
@@ -99,18 +99,18 @@
 #
 if grep '^\(Cannot open mouse\|No core pointer\)' "$XLOG" 2> /dev/null ; then
 
-  MSG8=`gettextfunc "I cannot start the X server (your graphical interface).  It seems that the pointer device (your mouse) is not set up correctly.  Would you like to view the X server output to diagnose the problem?"`
+  MSG8=`gettextfunc "Failed to start the X server (your graphical interface).  It seems that the pointer device (your mouse) is not set up correctly.  Would you like to view the X server output to diagnose the problem?"`
 
   if test -x /usr/sbin/mouseconfig ; then
     XCONFIGURATOR=/usr/sbin/mouseconfig
     # Note: we know this is a mouse problem and yay we have mouseconfig
-    MSG4=`gettextfunc "Would you like me to try to run the mouse configuration program?  Note that you will need the root password for this."`
+    MSG4=`gettextfunc "Would you like to try to configure the mouse?  Note that you will need the root password for this."`
   fi
 
   if test -x /usr/bin/system-config-mouse ; then
     XCONFIGURATOR=/usr/bin/system-config-mouse
     # Note: we know this is a mouse problem and yay we have system-config-mouse
-    MSG4=`gettextfunc "Would you like me to try to run the mouse configuration program?  Note that you will need the root password for this."`
+    MSG4=`gettextfunc "Would you like to try to configure the mouse?  Note that you will need the root password for this."`
   fi
 
 fi
Index: config/Xsession.in
===================================================================
RCS file: /cvs/gnome/gdm2/config/Xsession.in,v
retrieving revision 1.15
diff -u -r1.15 Xsession.in
--- config/Xsession.in	25 May 2005 19:59:34 -0000	1.15
+++ config/Xsession.in	15 Jul 2005 07:43:53 -0000
@@ -239,7 +239,7 @@
 echo "$0: Executing $command failed, will run xterm"
 
 if [ -n "$zenity" ] ; then
-	"$zenity" --info --text `gettextfunc "I could not start your session and so I have started the failsafe xterm session.  Windows now have focus only if you have your cursor above them.  To get out of this mode type 'exit' in the window in the upper left corner"`
+	"$zenity" --info --text `gettextfunc "Failed to start your session so this is the failsafe xterm session.  Windows now have focus only if you have your cursor above them.  To get out of this mode type 'exit' in the window in the upper left corner"`
 fi
 
 exec xterm -geometry 80x24+0+0
