Cleanup terminology, and fix many strings. See bug #310453. Also fixes bug

2005-07-19  Tommi Vainikainen  <thv@iki.fi>

	* config/XKeepsCrashing, config/Xsession.in, daemon/display.c,
	daemon/gdm.c, daemon/slave.c, docs/C/gdm.xml,
	gui/gdmXnestchooser.c, gui/gdmchooser.c, gui/gdmcomm.c,
	gui/gdmlogin.c, gui/gdmphotosetup.c, gui/gdmsetup.c,
	gui/gdmsetup.glade, gui/greeter/greeter.c,
	gui/greeter/greeter_session.c, gui/greeter/greeter_system.c:
	Cleanup terminology, and fix many strings. See bug #310453.
	Also fixes bug #308287. List of the most important string changes:
	machine -> computer
	program -> application or command
	superuser -> root
	gdm, Gdm -> GDM
	See the Language chapter in GNOME HIG for more information.

2 files changed, 9 insertions, 9 deletions

diff --git a/config/XKeepsCrashing b/config/XKeepsCrashing
index aa011010..5b7c4a88 100755
--- a/config/XKeepsCrashing
+++ b/config/XKeepsCrashing
@@ -38,12 +38,12 @@ gdmwhich () {
   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."`
+MSG7=`gettextfunc "The X server is now disabled.  Restart GDM when it is configured correctly."`
+MSG8=`gettextfunc "Failed to 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 @@ fi
 #
 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
diff --git a/config/Xsession.in b/config/Xsession.in
index ae7c4eb1..db0e6310 100755
--- a/config/Xsession.in
+++ b/config/Xsession.in
@@ -239,7 +239,7 @@ eval exec $command
 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 the session, so starting a failsafe xterm session.  Windows will have focus only if the mouse pointer is 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