From 7e13e7270655c7e9edf80a97a6fc7accd8392a2a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 30 Apr 2007 05:10:20 +0000 Subject: [PATCH] Translate the default job name, and don't utf8-validate the job name in 2007-04-30 Matthias Clasen * gtk/gtkprintoperation.c: Translate the default job name, and don't utf8-validate the job name in the setter. (#421993, Morten Welinder) svn path=/branches/gtk-2-10/; revision=17727 --- ChangeLog | 8 ++++++++ gtk/gtkprintoperation.c | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7b77f867c..d6e505283e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-04-30 Matthias Clasen + + 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 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;