2007-07-30 Part of fix for bug #360461 - Avoid markup in translatable messages

svn path=/trunk/; revision=33894

1 files changed, 20 insertions, 15 deletions

diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c
index 96ed6ba7d6..3b0a3d2de0 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.c
+++ b/plugins/ipod-sync/evolution-ipod-sync.c
@@ -29,16 +29,18 @@ ipod_check_status (gboolean silent)
 	if (check_hal () == FALSE)
 	{
 		if (!silent) {
-			GtkWidget *message = gtk_message_dialog_new_with_markup (
-											NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-											"<span weight=\"bold\" size=\"larger\">"
-											"Hardware Abstraction Layer not loaded"
-											"</span>\n\n"
-											"The \"hald\" service is required but not currently "
-											"running. Please enable the service and rerun this "
-											"program, or contact your system administrator.");
+			gchar *msg1, *msg2;
+			msg1 = g_strdup_printf("<span weight=\"bold\" size=\"larger\">%s</span>\n\n", _("Hardware Abstraction Layer not loaded"));
+			msg2 = g_strdup_printf("%s%s", msg1, _("The \"hald\" service is required but not currently "
+								"running. Please enable the service and rerun this "
+								"program, or contact your system administrator.") );
+
+			GtkWidget *message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg2);
 
 			gtk_dialog_run (GTK_DIALOG (message));
+
+			g_free(msg1);
+			g_free(msg2);
 			gtk_widget_destroy (message);
 		}
 		return FALSE;
@@ -60,15 +62,18 @@ ipod_check_status (gboolean silent)
 		 * it wasn't plugged in. Either way, we want to umount
 		 * the iPod when we finish syncing. */
 		if (!silent) {
-			GtkWidget *message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-										_("<span weight=\"bold\" size=\"larger\">"
-										  "Search for an iPod failed"
-										  "</span>\n\n"
-										  "Evolution could not find an iPod to synchronize with. "
-										  "Either the iPod is not connected to the system or it "
-										  "is not powered on."));
+			gchar *msg1, *msg2;
+			msg1 = g_strdup_printf("<span weight=\"bold\" size=\"larger\">%s</span>\n\n", _("Search for an iPod failed"));
+			msg2 = g_strdup_printf("%s%s", msg1, _("Evolution could not find an iPod to synchronize with. "
+								"Either the iPod is not connected to the system or it "
+								"is not powered on."));
+
+			GtkWidget *message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg2);
 
 			gtk_dialog_run (GTK_DIALOG (message));
+
+			g_free(msg1);
+			g_free(msg2);
 			gtk_widget_destroy (message);
 		}