Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in	(revision 33150)
+++ po/POTFILES.in	(working copy)
@@ -338,6 +338,7 @@
 plugins/groupwise-features/proxy.c
 plugins/groupwise-features/send-options.c
 plugins/groupwise-features/share-folder-common.c
+plugins/groupwise-features/share-folder.c
 plugins/groupwise-features/status-track.c
 plugins/hula-account-setup/camel-hula-listener.c
 plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml
Index: plugins/groupwise-features/junk-settings.c
===================================================================
--- plugins/groupwise-features/junk-settings.c	(revision 33150)
+++ plugins/groupwise-features/junk-settings.c	(working copy)
@@ -421,7 +421,7 @@
 	gtk_widget_show (GTK_WIDGET (js->entry_list));
 
 	js->cell = gtk_cell_renderer_text_new ();
-	js->column = gtk_tree_view_column_new_with_attributes ("Email", js->cell, "text", 0, NULL);
+	js->column = gtk_tree_view_column_new_with_attributes (_("Email"), js->cell, "text", 0, NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (js->entry_list),
 			GTK_TREE_VIEW_COLUMN (js->column));
 
Index: plugins/groupwise-features/share-folder.c
===================================================================
--- plugins/groupwise-features/share-folder.c	(revision 33150)
+++ plugins/groupwise-features/share-folder.c	(working copy)
@@ -25,6 +25,7 @@
 #include <glade/glade.h>
 #include "share-folder.h"
 #include <glib/gmain.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtktreeselection.h>
@@ -756,24 +757,24 @@
 	gtk_widget_show (GTK_WIDGET (sf->user_list));
 
 	sf->cell = gtk_cell_renderer_text_new ();
-	sf->column = gtk_tree_view_column_new_with_attributes ("Users", sf->cell, "text", 0, NULL);
+	sf->column = gtk_tree_view_column_new_with_attributes (_("Users"), sf->cell, "text", 0, NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (sf->user_list),
 			GTK_TREE_VIEW_COLUMN (sf->column));
 
 	sf->cell = gtk_cell_renderer_toggle_new ();
-	sf->column = gtk_tree_view_column_new_with_attributes ("Add   ", sf->cell, "active" , 1, NULL);
+	sf->column = gtk_tree_view_column_new_with_attributes (_("Add   "), sf->cell, "active" , 1, NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (sf->user_list),
 			GTK_TREE_VIEW_COLUMN (sf->column));
 	g_signal_connect (sf->cell, "toggled", G_CALLBACK (add_right_clicked), sf);
 	
 	sf->cell = gtk_cell_renderer_toggle_new ();
-	sf->column = gtk_tree_view_column_new_with_attributes ("Modify", sf->cell, "active", 2, NULL);
+	sf->column = gtk_tree_view_column_new_with_attributes (_("Modify"), sf->cell, "active", 2, NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (sf->user_list),
 			GTK_TREE_VIEW_COLUMN (sf->column));
 	g_signal_connect (sf->cell, "toggled", G_CALLBACK (edit_right_clicked), sf);
 
 	sf->cell = gtk_cell_renderer_toggle_new ();
-	sf->column = gtk_tree_view_column_new_with_attributes ("Delete", sf->cell, "active", 3, NULL);
+	sf->column = gtk_tree_view_column_new_with_attributes (_("Delete"), sf->cell, "active", 3, NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (sf->user_list),
 			GTK_TREE_VIEW_COLUMN (sf->column));
 	g_signal_connect (sf->cell, "toggled", G_CALLBACK (delete_right_clicked), sf);
Index: plugins/groupwise-features/status-track.c
===================================================================
--- plugins/groupwise-features/status-track.c	(revision 33150)
+++ plugins/groupwise-features/status-track.c	(working copy)
@@ -115,7 +115,7 @@
 	/*Create the dialog*/
 	d = (GtkDialog *) gtk_dialog_new ();
 	gtk_dialog_add_button (d, GTK_STOCK_OK, GTK_RESPONSE_OK);
-	gtk_window_set_title (GTK_WINDOW (d), "Message Status");
+	gtk_window_set_title (GTK_WINDOW (d), _("Message Status"));
 
 	table = (GtkTable *) gtk_table_new (1, 2, FALSE);
 	win = (GtkScrolledWindow *) gtk_scrolled_window_new (NULL, NULL);
@@ -129,7 +129,7 @@
 	gtk_table_set_row_spacings (table, 6);
 
 	/*Subject*/
-	widget = gtk_label_new ("<b>Subject</b> :");
+	widget = gtk_label_new (_("<b>Subject</b> :"));
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
 	gtk_table_attach (table, widget , 0, 1, row,  row + 1, GTK_FILL, 0, 0, 0);
@@ -141,7 +141,7 @@
 	/*From*/
 	from = camel_mime_message_get_from (msg) ;
 	camel_internet_address_get (from, 0, &namep, &addp) ;
-	widget = gtk_label_new ("<b>From</b> :");
+	widget = gtk_label_new (_("<b>From</b> :"));
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
 	gtk_table_attach (table, widget , 0, 1,  row,  row + 1, GTK_FILL, 0, 0, 0);
@@ -154,7 +154,7 @@
 	time = camel_mime_message_get_date (msg, NULL) ;
 	time_str = ctime (&time) ;
 	time_str[strlen(time_str)-1] = '\0' ;
-	widget = gtk_label_new ("<b>Creation date</b> :");
+	widget = gtk_label_new (_("<b>Creation date</b> :"));
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
 	gtk_table_attach (table, widget , 0, 1, row,  row + 1, GTK_FILL, 0, 0, 0);
@@ -174,15 +174,15 @@
 	gtk_table_set_col_spacings (table ,12);
 	gtk_table_set_row_spacings (table, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (table), FALSE, TRUE, 0);
-	widget = gtk_label_new ("<b>Recipients </b>");
+	widget = gtk_label_new (_("<b>Recipients </b>"));
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
 	gtk_table_attach (table, widget , 0, 1, row,  row + 1, GTK_FILL, 0, 0, 0);
-	widget = gtk_label_new ("<b>Action</b>");
+	widget = gtk_label_new (_("<b>Action</b>"));
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
 	gtk_table_attach (table, widget , 1, 2, row,  row + 1, GTK_FILL, 0, 0, 0);
-	widget = gtk_label_new ("<b>Date and Time</b>");
+	widget = gtk_label_new (_("<b>Date and Time</b>"));
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
 	gtk_table_attach (table, widget , 2, 3,  row,  row + 1, GTK_FILL, 0, 0, 0);
Index: plugins/groupwise-features/install-shared.c
===================================================================
--- plugins/groupwise-features/install-shared.c	(revision 33150)
+++ plugins/groupwise-features/install-shared.c	(working copy)
@@ -212,12 +212,11 @@
 
 		from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message);
 		if (from_addr && camel_internet_address_get(from_addr, 0, &name, &email)) {
-			/* FIXME: this needs translating ... */
-			start_message = g_strconcat (" The User ", "'", name, "'" ," has shared a folder with you\n\n",
-						     " Message from ", "'" , name, "'\n\n\n", content->buffer->data, "\n\n\n", "Click 'Forward' to install the shared folder\n\n",NULL);
-			title_page = GNOME_DRUID_PAGE_EDGE (gnome_druid_page_edge_new_with_vals(GNOME_EDGE_START, TRUE, "Install the shared folder", start_message, NULL, NULL, NULL));
+			start_message = g_strconcat (_(" The User "), "'", name, "' " , _("has shared a folder with you\n\n"), " ",
+						     _(" Message from "), "'" , name, "'\n\n\n", content->buffer->data, "\n\n\n", _("Click 'Forward' to install the shared folder\n\n"), NULL);
+			title_page = GNOME_DRUID_PAGE_EDGE (gnome_druid_page_edge_new_with_vals(GNOME_EDGE_START, TRUE, _("Install the shared folder"), start_message, NULL, NULL, NULL));
 			g_free(start_message);
-			wizard = GNOME_DRUID (gnome_druid_new_with_window ("Shared Folder Installation", NULL, TRUE, (GtkWidget**)(&window)));
+			wizard = GNOME_DRUID (gnome_druid_new_with_window (_("Shared Folder Installation"), NULL, TRUE, (GtkWidget**)(&window)));
 			gtk_window_set_position (GTK_WINDOW (window) , GTK_WIN_POS_CENTER_ALWAYS);
 			gnome_druid_append_page(wizard, GNOME_DRUID_PAGE(title_page));	
 			gtk_widget_show_all (GTK_WIDGET (title_page));
Index: plugins/exchange-operations/exchange-contacts.c
===================================================================
--- plugins/exchange-operations/exchange-contacts.c	(revision 33150)
+++ plugins/exchange-operations/exchange-contacts.c	(working copy)
@@ -210,9 +210,9 @@
 		abook_name = (char*)e_source_peek_name (source);
 		model = exchange_account_folder_size_get_model (account);
 		if (model)
-			folder_size = g_strdup_printf ("%s KB", exchange_folder_size_get_val (model, abook_name));
+			folder_size = g_strdup_printf (_("%s KB"), exchange_folder_size_get_val (model, abook_name));
 		else
-			folder_size = g_strdup_printf ("0 KB");
+			folder_size = g_strdup_printf (_("0 KB"));
 
 		/* FIXME: Take care of i18n */
 		lbl_size = gtk_label_new_with_mnemonic (_("Size:"));
Index: plugins/exchange-operations/exchange-account-setup.c
===================================================================
--- plugins/exchange-operations/exchange-account-setup.c	(revision 33150)
+++ plugins/exchange-operations/exchange-account-setup.c	(working copy)
@@ -946,9 +946,9 @@
 	account = exchange_operations_get_exchange_account ();
 	model = exchange_account_folder_size_get_model (account);
 	if (model)
-		folder_size = g_strdup_printf ("%s KB", exchange_folder_size_get_val (model, folder_name));
+		folder_size = g_strdup_printf (_("%s KB"), exchange_folder_size_get_val (model, folder_name));
 	else
-		folder_size = g_strdup ("0 KB");
+		folder_size = g_strdup (_("0 KB"));
 
 	hbx_size = (GtkHBox*) gtk_hbox_new (FALSE, 0);
 	vbx = (GtkVBox *)gtk_notebook_get_nth_page (GTK_NOTEBOOK (data->parent), 0);
Index: plugins/startup-wizard/startup-wizard.c
===================================================================
--- plugins/startup-wizard/startup-wizard.c	(revision 33150)
+++ plugins/startup-wizard/startup-wizard.c	(working copy)
@@ -107,7 +107,7 @@
 	etd = e_timezone_dialog_new ();
 	g_object_set_data (G_OBJECT (hook_data->config), IMPORT_TIMEZONE_DIALOG, etd);
 	
-	page = gnome_druid_page_standard_new_with_vals ("Timezone", NULL, NULL);
+	page = gnome_druid_page_standard_new_with_vals (_("Timezone"), NULL, NULL);
 	e_timezone_dialog_reparent (etd, GNOME_DRUID_PAGE_STANDARD (page)->vbox);
 
 	e_timezone_dialog_set_timezone (etd, NULL);
@@ -133,7 +133,7 @@
 	if (import_importers == NULL)
 		return NULL;
 
-	page = gnome_druid_page_standard_new_with_vals ("Importing files", NULL, NULL);
+	page = gnome_druid_page_standard_new_with_vals (_("Importing files"), NULL, NULL);
 
 	label = gtk_label_new (_("Please select the information that you would like to import:"));
 	gtk_box_pack_start (GTK_BOX (GNOME_DRUID_PAGE_STANDARD (page)->vbox), label, FALSE, FALSE, 3);
Index: plugins/ipod-sync/evolution-ipod-sync.c
===================================================================
--- plugins/ipod-sync/evolution-ipod-sync.c	(revision 33150)
+++ plugins/ipod-sync/evolution-ipod-sync.c	(working copy)
@@ -11,6 +11,7 @@
 #include "evolution-ipod-sync.h"
 
 #include <gnome.h>
+#include <glib/gi18n-lib.h>
 #include <glade/glade.h>
 #include <libhal.h>
 
@@ -57,14 +58,13 @@
 		 * 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 a iPod failed"
-											"</span>\n\n"
-											"Evolution could not find a iPod to synchronize with."
-											"Either it 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,
+										_("<span weight=\"bold\" size=\"larger\">"
+										  "Search for a iPod failed"
+										  "</span>\n\n"
+										  "Evolution could not find a iPod to synchronize with."
+										  "Either it is not connected to the system or it is "
+										  "not powered on."));
 
 			gtk_dialog_run (GTK_DIALOG (message));
 			gtk_widget_destroy (message);
Index: plugins/save-attachments/save-attachments.c
===================================================================
--- plugins/save-attachments/save-attachments.c	(revision 33150)
+++ plugins/save-attachments/save-attachments.c	(working copy)
@@ -331,7 +331,7 @@
 	data->msg = msg;
 	camel_object_ref(msg);
 
-	dialog = (GtkDialog *)gtk_dialog_new_with_buttons("Save attachments",
+	dialog = (GtkDialog *)gtk_dialog_new_with_buttons(_("Save attachments"),
 							  NULL, /* target->parent? */
 							  0,
 							  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
