Removing unnecessary markup in translateable string.

svn path=/trunk/; revision=31494

6 files changed, 36 insertions, 5 deletions

diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index c48a442515..5b4551ffb9 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-12  Karsten Bräckelmann  <guenther@rudersport.de>
+
+	* e-error.c (e_error_newv): 
+	Removing unnecessary markup in translateable string.
+	Fixes part of bug #272789.
+
 2006-02-09  Harish Krishnaswamy  <kharish@novell.com>
 
 	* e-bconf-map.c: Upstreaming Olaf Hering's patch
diff --git a/e-util/e-error.c b/e-util/e-error.c
index aff11eef6a..e8cf041310 100644
--- a/e-util/e-error.c
+++ b/e-util/e-error.c
@@ -411,6 +411,7 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap)
 	GString *out;
 	GPtrArray *args;
 	GtkDialog *dialog;
+	gchar *str;
 
 	if (error_table == NULL)
 		ee_load_tables();
@@ -439,7 +440,9 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap)
 	     || (table = g_hash_table_lookup(error_table, domain)) == NULL
 	     || (e = g_hash_table_lookup(table->errors, id)) == NULL) {
 		/* setup a dummy error */
-		tmp = g_strdup_printf(_("<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"), tag);
+		str = g_strdup_printf(_("Internal error, unknown error '%s' requested"), tag);
+		tmp = g_strdup_printf("<span weight=\"bold\">%s</span>", str);
+		g_free(str);
 		w = gtk_label_new(NULL);
 		gtk_label_set_selectable((GtkLabel *)w, TRUE);
 		gtk_label_set_line_wrap((GtkLabel *)w, TRUE);
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 69452e06dd..123fb6c25b 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-12  Karsten Bräckelmann  <guenther@rudersport.de>
+
+	* bbdb.c (bbdb_page_factory): 
+	Removing unnecessary markup in translateable string.
+	Fixes part of bug #272789.
+
 2006-01-23  Devashish Sharma <sdevashish@novell.com>
 
 	* bbdb.c :
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 4eea3fb3fb..3c9cca5e2a 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -418,6 +418,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	GtkWidget *label;
 	GtkWidget *gaim_label;
 	GtkWidget *button;
+	gchar *str;
 
 	/* A structure to pass some stuff around */
 	stuff = g_new0 (struct bbdb_stuff, 1);
@@ -435,7 +436,9 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 
 	/* "Automatic Contacts" */
 	frame_label = gtk_label_new ("");
-	gtk_label_set_markup (GTK_LABEL (frame_label), _("<span weight=\"bold\">Automatic Contacts</span>"));
+	str = g_strdup_printf ("<span weight=\"bold\">%s</span>", _("Automatic Contacts"));
+	gtk_label_set_markup (GTK_LABEL (frame_label), str);
+	gfree (str);
 	GTK_MISC (frame_label)->xalign = 0.0;
 	gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0);
 	
@@ -469,7 +472,9 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_box_pack_start (GTK_BOX (page), frame, TRUE, TRUE, 24);
 
 	frame_label = gtk_label_new ("");
-	gtk_label_set_markup (GTK_LABEL (frame_label), _("<span weight=\"bold\">Instant Messaging Contacts</span>"));
+	str = g_strdup_printf ("<span weight=\"bold\">%s</span>", _("Instant Messaging Contacts"));
+	gtk_label_set_markup (GTK_LABEL (frame_label), str);
+	gfree (str);
 	GTK_MISC (frame_label)->xalign = 0.0;
 	gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0);
 
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index fc8d5903f7..317c40bd3d 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-12  Karsten Bräckelmann  <guenther@rudersport.de>
+
+	* itip-formatter.c (itip_formatter_page_factory):
+	Removing unnecessary markup in translateable string.
+	Fixes part of bug #272789.
+
 2006-02-11  Karsten Bräckelmann  <guenther@rudersport.de>
 
 	* itip-formatter.c (itip_formatter_page_factory): 
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 54ac321436..6b80b69e24 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -1961,6 +1961,7 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	GtkWidget *ess;
 	GtkWidget *scrolledwin;
 	ESourceList *source_list;
+	gchar *str;
 	
 	/* Create a new notebook page */
 	page = gtk_vbox_new (FALSE, 0);
@@ -1974,7 +1975,9 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 
 	/* "General" */
 	frame_label = gtk_label_new ("");
-	gtk_label_set_markup (GTK_LABEL (frame_label), _("<span weight=\"bold\">General</span>"));
+	str = g_strdup_printf ("<span weight=\"bold\">%s</span>", _("General"));
+	gtk_label_set_markup (GTK_LABEL (frame_label), str);
+	g_free (str);
 	GTK_MISC (frame_label)->xalign = 0.0;
 	gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0);
 
@@ -1998,7 +2001,9 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_box_pack_start (GTK_BOX (page), frame, TRUE, TRUE, 24);
 
 	frame_label = gtk_label_new ("");
-	gtk_label_set_markup (GTK_LABEL (frame_label), _("<span weight=\"bold\">Conflict Search</span>"));
+	str = g_strdup_printf ("<span weight=\"bold\">%s</span>", _("Conflict Search"));
+	gtk_label_set_markup (GTK_LABEL (frame_label), str);
+	gfree (str);
 	GTK_MISC (frame_label)->xalign = 0.0;
 	gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0);