Fix loads of typos and inconsistencies in strings.

7 files changed, 31 insertions, 32 deletions

diff --git a/daemon/gdm.c b/daemon/gdm.c
index 9d54d33c..245831a1 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -485,7 +485,7 @@ gdm_config_parse (void)
     }
 
     if (pwent == NULL) {
-	    char *s = g_strdup_printf (_("The gdm user does not exist.  "
+	    char *s = g_strdup_printf (_("The gdm user does not exist. "
 					 "Please correct gdm configuration %s "
 					 "and restart gdm."),
 				       GDM_CONFIG_FILE);
@@ -515,7 +515,7 @@ gdm_config_parse (void)
     }
 
     if (grent == NULL) {
-	    char *s = g_strdup_printf (_("The gdm group does not exist.  "
+	    char *s = g_strdup_printf (_("The gdm group does not exist. "
 					 "Please correct gdm configuration %s "
 					 "and restart gdm."),
 				       GDM_CONFIG_FILE);
@@ -528,7 +528,7 @@ gdm_config_parse (void)
     if (GdmGroupId == 0) {
 	    char *s = g_strdup_printf (_("The gdm group is set to be root, but "
 					 "this is not allowed since it can "
-					 "pose a security risk.  Please "
+					 "pose a security risk. Please "
 					 "correct gdm configuration %s and "
 					 "restart gdm."), GDM_CONFIG_FILE);
 	    gdm_text_message_dialog (s);
@@ -565,7 +565,7 @@ gdm_config_parse (void)
     if (stat (GdmServAuthDir, &statbuf) == -1)  {
 	    char *s = g_strdup_printf (_("Server Authorization directory "
 					 "(daemon/ServAuthDir) is set to %s "
-					 "but this does not exist.  Please "
+					 "but this does not exist. Please "
 					 "correct gdm configuration %s and "
 					 "restart gdm."), GdmServAuthDir,
 				       GDM_CONFIG_FILE);
@@ -576,7 +576,7 @@ gdm_config_parse (void)
     if (! S_ISDIR (statbuf.st_mode)) {
 	    char *s = g_strdup_printf (_("Server Authorization directory "
 					 "(daemon/ServAuthDir) is set to %s "
-					 "but this is not a directory.  Please "
+					 "but this is not a directory. Please "
 					 "correct gdm configuration %s and "
 					 "restart gdm."), GdmServAuthDir,
 				       GDM_CONFIG_FILE);
@@ -588,7 +588,7 @@ gdm_config_parse (void)
 	    char *s = g_strdup_printf (_("Server Authorization directory "
 					 "(daemon/ServAuthDir) is set to %s "
 					 "but is not owned by user %s and group "
-					 "%s.  Please correct the ownership or "
+					 "%s. Please correct the ownership or "
 					 "gdm configuration %s and restart "
 					 "gdm."),
 				       GdmServAuthDir, GdmUser, GdmGroup,
@@ -602,7 +602,7 @@ gdm_config_parse (void)
 	    char *s = g_strdup_printf (_("Server Authorization directory "
 					 "(daemon/ServAuthDir) is set to %s "
 					 "but has the wrong permissions, it "
-					 "should have permissions of 0750."
+					 "should have permissions of 0750. "
 					 "Please correct the permissions or "
 					 "the gdm configuration %s and "
 					 "restart gdm."),
@@ -864,7 +864,7 @@ deal_with_x_crashes (GdmDisplay *d)
 	     * it for them */
 	    char *error = _("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 "
+			    "up correctly. You will need to log in on a "
 			    "console and rerun the X configuration "
 			    "program.  Then restart GDM.");
 	    gdm_text_message_dialog (error);
@@ -1521,10 +1521,10 @@ gdm_handle_message (GdmConnection *conn, const char *msg, gpointer data)
 			char *s = g_strndup
 				(msg, strlen (GDM_SOP_COOKIE " XXXX XX"));
 			/* cut off most of the cookie for "security" */
-			gdm_debug ("Handeling message: '%s...'", s);
+			gdm_debug ("Handling message: '%s...'", s);
 			g_free (s);
 		} else {
-			gdm_debug ("Handeling message: '%s'", msg);
+			gdm_debug ("Handling message: '%s'", msg);
 		}
 	}
 
@@ -2090,7 +2090,7 @@ handle_flexi_server (GdmConnection *conn, int type, const char *server,
 static void
 gdm_handle_user_message (GdmConnection *conn, const char *msg, gpointer data)
 {
-	gdm_debug ("Handeling user message: '%s'", msg);
+	gdm_debug ("Handling user message: '%s'", msg);
 
 	if (strncmp (msg, GDM_SUP_AUTH_LOCAL " ",
 		     strlen (GDM_SUP_AUTH_LOCAL " ")) == 0) {
diff --git a/daemon/misc.h b/daemon/misc.h
index 98bd797c..678d5591 100644
--- a/daemon/misc.h
+++ b/daemon/misc.h
@@ -21,7 +21,6 @@
 
 #include <sys/types.h>
 
-#include "config.h"
 #include "gdm.h"
 
 void gdm_fail   (const gchar *format, ...) G_GNUC_PRINTF (1, 2);
diff --git a/daemon/server.c b/daemon/server.c
index e94d905d..f85ac0a2 100644
--- a/daemon/server.c
+++ b/daemon/server.c
@@ -241,8 +241,8 @@ display_busy (GdmDisplay *disp)
 		 * of course additions are welcome to make this more robust */
 		if (strstr (buf, "Server is already active for display")
 		    == buf) {
-			gdm_error (_("Display %s is busy, there is another "
-				     "X server already running"),
+			gdm_error (_("Display %s is busy. There is another "
+				     "X server running already."),
 				   disp->name);
 			fclose (fp);
 			return TRUE;
@@ -338,7 +338,7 @@ gdm_server_start (GdmDisplay *disp, gboolean treat_as_flexi,
     gnome_setenv ("DISPLAY", d->name, TRUE);
 
     if (pipe (server_signal_pipe) != 0) {
-	    gdm_error (_("%s: Error openning a pipe: %s"),
+	    gdm_error (_("%s: Error opening a pipe: %s"),
 		       "gdm_server_start", g_strerror (errno));
 	    return FALSE; 
     }
diff --git a/daemon/verify-crypt.c b/daemon/verify-crypt.c
index f549249b..fdae5fd4 100644
--- a/daemon/verify-crypt.c
+++ b/daemon/verify-crypt.c
@@ -169,8 +169,8 @@ gdm_verify_user (GdmDisplay *d,
 	 strcmp (pwent->pw_shell, "/bin/false") == 0)) {
 	    gdm_error (_("User %s not allowed to log in"), login);
 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
-					  _("\nThe system administrator"
-					    " has disabled your "
+					  _("\nThe system administrator "
+					    "has disabled your "
 					    "account."));
 	    /*gdm_slave_greeter_ctl_no_ret (GDM_ERRDLG,
 	      _("Login disabled"));*/
diff --git a/daemon/verify-pam.c b/daemon/verify-pam.c
index ff8eb2ea..c15d5be3 100644
--- a/daemon/verify-pam.c
+++ b/daemon/verify-pam.c
@@ -345,8 +345,8 @@ gdm_verify_user (GdmDisplay *d,
 	    gdm_error (_("Root login disallowed on display '%s'"),
 		       display);
 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
-					  _("\nThe system administrator"
-					    " is not allowed to login "
+					  _("\nThe system administrator "
+					    "is not allowed to login "
 					    "from this screen"));
 	    /*gdm_slave_greeter_ctl_no_ret (GDM_ERRDLG,
 	      _("Root login disallowed"));*/
@@ -364,7 +364,7 @@ gdm_verify_user (GdmDisplay *d,
 	    gdm_error (_("Authentication token change failed for user %s"), login);
 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX, 
 		    _("\nThe change of the authentication token failed. "
-		      "Please try again later or cantact the system administrator."));
+		      "Please try again later or contact the system administrator."));
 	    error_msg_given = TRUE;
 	    goto pamerr;
 	}
@@ -437,9 +437,9 @@ gdm_verify_user (GdmDisplay *d,
 		     * neccessairly true, this message needs to be changed
 		     * to allow for such cases */
 		    auth_errmsg = g_strdup_printf
-			    (_("\nIncorrect username or password.  "
-			       "Letters must be typed in the correct case.  "  
-			       "Please be sure the Caps Lock key is not enabled"));
+			    (_("\nIncorrect username or password. "
+			       "Letters must be typed in the correct case. "  
+			       "Please make sure the Caps Lock key is not enabled."));
 		    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX, auth_errmsg);
 		    g_free (auth_errmsg);
 	    } else {
diff --git a/daemon/verify-shadow.c b/daemon/verify-shadow.c
index cde55ca7..01e46aef 100644
--- a/daemon/verify-shadow.c
+++ b/daemon/verify-shadow.c
@@ -124,9 +124,9 @@ gdm_verify_user (GdmDisplay *d, const char *username, const gchar *display, gboo
 	     * neccessairly true, this message needs to be changed
 	     * to allow for such cases */
 	    auth_errmsg = g_strdup_printf
-		    (_("\nIncorrect username or password.  "
-		       "Letters must be typed in the correct case.  "  
-		       "Please be sure the Caps Lock key is not enabled"));
+		    (_("\nIncorrect username or password. "
+		       "Letters must be typed in the correct case. "  
+		       "Please make sure the Caps Lock key is not enabled"));
 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX, auth_errmsg);
 	    g_free (auth_errmsg);
 	    g_free (login);
@@ -144,9 +144,9 @@ gdm_verify_user (GdmDisplay *d, const char *username, const gchar *display, gboo
 	     * neccessairly true, this message needs to be changed
 	     * to allow for such cases */
 	    auth_errmsg = g_strdup_printf
-		    (_("\nIncorrect username or password.  "
-		       "Letters must be typed in the correct case.  "  
-		       "Please be sure the Caps Lock key is not enabled"));
+		    (_("\nIncorrect username or password. "
+		       "Letters must be typed in the correct case. "  
+		       "Please make sure the Caps Lock key is not enabled"));
 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX, auth_errmsg);
 	    g_free (auth_errmsg);
 	    g_free (login);
@@ -178,8 +178,8 @@ gdm_verify_user (GdmDisplay *d, const char *username, const gchar *display, gboo
 	 strcmp (pwent->pw_shell, "/bin/false") == 0)) {
 	    gdm_error (_("User %s not allowed to log in"), login);
 	    gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX,
-					  _("\nThe system administrator"
-					    " has disabled your "
+					  _("\nThe system administrator "
+					    "has disabled your "
 					    "account."));
 	    /*gdm_slave_greeter_ctl_no_ret (GDM_ERRDLG,
 	      _("Login disabled"));*/
diff --git a/gui/gdmconfig.c b/gui/gdmconfig.c
index dd142cce..1df2ce62 100644
--- a/gui/gdmconfig.c
+++ b/gui/gdmconfig.c
@@ -140,7 +140,7 @@ GtkWidget *get_widget(const gchar *widget_name)
 						GTK_BUTTONS_OK,
 						_("The glade ui description file "
 						  "doesn't seem to contain the\n"
-						  "widget \"%s\".  "
+						  "widget \"%s\". "
 						  "Unfortunately I cannot continue.\n"
 						  "Please check your installation."),
 						widget_name);