diff --git a/ChangeLog b/ChangeLog
index e7b77f867c..d6e505283e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-30  Matthias Clasen <mclasen@redhat.com>
+
+	Merge from trunk:
+
+	* gtk/gtkprintoperation.c: Translate the default job
+	name, and don't utf8-validate the job name in the
+	setter.  (#421993, Morten Welinder)
+
 2007-04-30  Matthias Clasen <mclasen@redhat.com>
 
 	Merge from trunk:
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index 1684c801fd..6f901f06eb 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -164,7 +164,11 @@ gtk_print_operation_init (GtkPrintOperation *operation)
   priv->unit = GTK_UNIT_PIXEL;
 
   appname = g_get_application_name ();
-  priv->job_name = g_strdup_printf ("%s job #%d", appname, ++job_nr);
+  /* translators: this string is the default job title for print
+   * jobs. %s gets replaced by the application name, %d gets replaced
+   * by the job number.
+   */
+  priv->job_name = g_strdup_printf (_("%s job #%d"), appname, ++job_nr);
 }
 
 static void
@@ -1304,7 +1308,7 @@ gtk_print_operation_set_job_name (GtkPrintOperation *op,
   GtkPrintOperationPrivate *priv;
 
   g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
-  g_return_if_fail (g_utf8_validate (job_name, -1, NULL));
+  g_return_if_fail (job_name != NULL);
 
   priv = op->priv;