Index: gui/gdmchooser.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/gdmchooser.c,v
retrieving revision 1.62
diff -u -r1.62 gdmchooser.c
--- gui/gdmchooser.c	19 Sep 2003 22:35:05 -0000	1.62
+++ gui/gdmchooser.c	2 Oct 2003 17:48:14 -0000
@@ -851,11 +851,17 @@
 			 GTK_BUTTONS_OK,
 			 FALSE /* markup */,
 			 _("Did not receive response from server"),
-			 _("Did not receive any response from host \"%s\" "
-			   "in %d seconds.  Perhaps the host is not "
-			   "turned on, or is not willing to support a "
-			   "login session right now.  Please try again "
-			   "later."),
+			 ngettext ("Did not receive any response from host "
+				   "\"%s\" in %d second.  Perhaps the host is "
+				   "not turned on, or is not willing to "
+				   "support a login session right now. Please "
+				   "try again later.",
+				   "Did not receive any response from host "
+				   "\"%s\" in %d seconds.  Perhaps the host is "
+				   "not turned on, or is not willing to "
+				   "support a login session right now. Please "
+				   "try again later.",
+				   ADD_TIMEOUT / 1000),
 			 added_host,
 			 ADD_TIMEOUT / 1000);
 
Index: gui/gdmlogin.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/gdmlogin.c,v
retrieving revision 1.201
diff -u -r1.201 gdmlogin.c
--- gui/gdmlogin.c	22 Sep 2003 22:17:24 -0000	1.201
+++ gui/gdmlogin.c	2 Oct 2003 17:48:15 -0000
@@ -206,7 +206,11 @@
 		fflush (stdout);
 	} else if ((curdelay % 5) == 0) {
 		gchar *autologin_msg = 
-			g_strdup_printf (_("User %s will login in %d seconds"),
+			g_strdup_printf (ngettext ("User %s will login in %d "
+						   "second",
+						   "User %s will login in %d "
+						   "seconds",
+						   curdelay),
 					 GdmTimedLogin, curdelay);
 		gtk_label_set_text (GTK_LABEL (msg), autologin_msg);
 		gtk_widget_show (GTK_WIDGET (msg));
Index: gui/gdmphotosetup.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/gdmphotosetup.c,v
retrieving revision 1.30
diff -u -r1.30 gdmphotosetup.c
--- gui/gdmphotosetup.c	19 Sep 2003 22:35:05 -0000	1.30
+++ gui/gdmphotosetup.c	2 Oct 2003 17:48:16 -0000
@@ -212,10 +212,19 @@
 					       GTK_BUTTONS_OK,
 					       FALSE /* markup */,
 					       _("Picture is too large"),
-					       _("The system administrator "
-						 "disallowed pictures larger "
-						 "than %d bytes to "
-						 "show in the face browser"),
+					       ngettext ("The system "
+							 "administrator "
+							 "disallowed pictures "
+							 "larger than %d byte "
+							 "to show in the face "
+							 "browser",
+							 "The system "
+							 "administrator "
+							 "disallowed pictures "
+							 "larger than %d bytes "
+							 "to show in the face "
+							 "browser",
+							 max_size),
 					       max_size);
 			gtk_dialog_run (GTK_DIALOG (d));
 			gtk_widget_destroy (d);
Index: gui/greeter/greeter_parser.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/greeter/greeter_parser.c,v
retrieving revision 1.26
diff -u -r1.26 greeter_parser.c
--- gui/greeter/greeter_parser.c	24 Sep 2003 20:23:38 -0000	1.26
+++ gui/greeter/greeter_parser.c	2 Oct 2003 17:48:16 -0000
@@ -1044,7 +1044,11 @@
       else if (g_ascii_strcasecmp (prop, "timed-label") == 0)
         {
 	  g_free (*translated_text);
-	  *translated_text = g_strdup (_("User %s will login in %d seconds"));
+	  *translated_text = g_strdup (ngettext ("User %s will login in %d "
+				  		 "second",
+						 "User %s will login in %d "
+						 "seconds",
+						 1));
 	}
       else if (g_ascii_strcasecmp (prop, "welcome-label") == 0)
         {
Index: vicious-extensions/glade-helper.c
===================================================================
RCS file: /cvs/gnome/vicious-extensions/glade-helper.c,v
retrieving revision 1.14
diff -u -r1.14 glade-helper.c
--- vicious-extensions/glade-helper.c	19 Sep 2003 22:34:43 -0000	1.14
+++ vicious-extensions/glade-helper.c	2 Oct 2003 17:48:16 -0000
@@ -244,14 +244,25 @@
 				 GTK_BUTTONS_OK,
 				 FALSE /* markup */,
 				 _("Cannot load user interface"),
-				 _("An error occured while loading the user "
-				   "interface element %s%s from file %s.  "
-				   "CList type widget should have %d columns.  "
-				   "Possibly the glade interface description was "
-				   "corrupted.  "
-				   "%s cannot continue and will exit now.  "
-				   "You should check your "
-				   "installation of %s or reinstall %s."),
+				 ngettext ("An error occured while loading the "
+					   "user interface element %s%s from "
+					   "file %s. CList type widget should "
+					   "have %d column. Possibly the glade "
+					   "interface description was "
+					   "corrupted. %s cannot continue and "
+					   "will exit now. You should check "
+					   "your installation of %s or "
+					   "reinstall %s.",
+					   "An error occured while loading the "
+					   "user interface element %s%s from "
+					   "file %s. CList type widget should "
+					   "have %d columns. Possibly the "
+					   "glade interface description was "
+					   "corrupted. %s cannot continue and "
+					   "will exit now. You should check "
+					   "your installation of %s or "
+					   "reinstall %s.",
+					   columns),
 				 widget,
 				 typestring,
 				 tmp,
