Merge branch 'master' into debian

pchilds · Nov 8, 2012 · 38ffea1 · 38ffea1
2 parents 1037708 + 5d5e7e4
commit 38ffea1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/gtk2plot/testplotlinear.c b/gtk2plot/testplotlinear.c
@@ -266,7 +266,7 @@ void prt(GtkWidget *widget, gpointer data)
 	res=gtk_print_operation_run(prto, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW(data), &Err);
 	if (res==GTK_PRINT_OPERATION_RESULT_ERROR)
 	{
-		str=g_strdup_printf(_("An error occured while printing: %s."), (Err->message));
+		str=g_strdup_printf("An error occured while printing: %s.", (Err->message));
 		gtk_statusbar_push(GTK_STATUSBAR(statusbar), gtk_statusbar_get_context_id(GTK_STATUSBAR(statusbar), str), str);
 		g_free(str);
 		g_error_free(Err);

diff --git a/gtk2plot/testplotpolar.c b/gtk2plot/testplotpolar.c
@@ -264,7 +264,7 @@ void prt(GtkWidget *widget, gpointer data)
 	res=gtk_print_operation_run(prto, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW(data), &Err);
 	if (res==GTK_PRINT_OPERATION_RESULT_ERROR)
 	{
-		str=g_strdup_printf(_("An error occured while printing: %s."), (Err->message));
+		str=g_strdup_printf("An error occured while printing: %s.", (Err->message));
 		gtk_statusbar_push(GTK_STATUSBAR(statusbar), gtk_statusbar_get_context_id(GTK_STATUSBAR(statusbar), str), str);
 		g_free(str);
 		g_error_free(Err);

diff --git a/gtk3plot/testplotlinear.c b/gtk3plot/testplotlinear.c
@@ -214,7 +214,7 @@ void prt(GtkWidget *widget, gpointer data)
 	res=gtk_print_operation_run(prto, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW(data), &Err);
 	if (res==GTK_PRINT_OPERATION_RESULT_ERROR)
 	{
-		str=g_strdup_printf(_("An error occured while printing: %s."), (Err->message));
+		str=g_strdup_printf("An error occured while printing: %s.", (Err->message));
 		gtk_statusbar_push(GTK_STATUSBAR(statusbar), gtk_statusbar_get_context_id(GTK_STATUSBAR(statusbar), str), str);
 		g_free(str);
 		g_error_free(Err);

diff --git a/gtk3plot/testplotpolar.c b/gtk3plot/testplotpolar.c
@@ -213,7 +213,7 @@ void prt(GtkWidget *widget, gpointer data)
 	res=gtk_print_operation_run(prto, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW(data), &Err);
 	if (res==GTK_PRINT_OPERATION_RESULT_ERROR)
 	{
-		str=g_strdup_printf(_("An error occured while printing: %s."), (Err->message));
+		str=g_strdup_printf("An error occured while printing: %s.", (Err->message));
 		gtk_statusbar_push(GTK_STATUSBAR(statusbar), gtk_statusbar_get_context_id(GTK_STATUSBAR(statusbar), str), str);
 		g_free(str);
 		g_error_free(Err);