Manual conflict resolution

27 files changed, 1759 insertions, 536 deletions

diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 70e2146a2d..32957fdf33 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -211,12 +211,6 @@ stop_state_changed (EAddressbookModel *model, EMinicardView *view)
 }
 
 static void
-stop_state_changed (EABModel *model, EMinicardView *view)
-{
-	set_empty_message (view);
-}
-
-static void
 adapter_changed (EMinicardView *view)
 {
 	set_empty_message (view);
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 9405663a9b..e1a7a26f4d 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -102,11 +102,6 @@ struct _CompEditorPrivate {
 
 	gchar *summary;
 
-	/* Manages menus and toolbars */
-	GtkUIManager *manager;
-
-	gchar *summary;
-
 	guint32 attachment_bar_visible : 1;
 
 	/* TODO use this flags for setting all the boolean variables
@@ -167,7 +162,6 @@ static const gchar *ui =
 "</ui>";
 
 static void comp_editor_show_help (CompEditor *editor);
-static void setup_widgets (CompEditor *editor);
 
 static void real_edit_comp (CompEditor *editor, ECalComponent *comp);
 static gboolean real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean strip_alarms);
@@ -506,7 +500,7 @@ save_comp (CompEditor *editor)
 
 		if (result && priv->mod == CALOBJ_MOD_THIS) {
 			/* FIXME do we really need to do this ? */
-			if ((flags & COMP_EDITOR_DELEGATE) || !e_cal_component_has_organizer (clone) || itip_organizer_is_user (clone, priv->client) || itip_sentby_is_user (clone))
+			if ((flags & COMP_EDITOR_DELEGATE) || !e_cal_component_has_organizer (clone) || itip_organizer_is_user (clone, priv->client) || itip_sentby_is_user (clone, priv->client))
 				e_cal_component_commit_sequence (clone);
 			else
 				e_cal_component_abort_sequence (clone);
@@ -1959,11 +1953,10 @@ comp_editor_set_flags (CompEditor *editor,
 	g_object_notify (G_OBJECT (editor), "flags");
 }
 
-GtkActionGroup *
-comp_editor_get_action_group (CompEditor *editor,
-                              const gchar *group_name)
+CompEditorFlags
+comp_editor_get_flags (CompEditor *editor)
 {
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE);
+	g_return_val_if_fail (IS_COMP_EDITOR (editor), 0);
 
 	return editor->priv->flags;
 }
@@ -2311,7 +2304,6 @@ fill_widgets (CompEditor *editor)
 	EAttachmentView *view;
 	CompEditorPrivate *priv;
 	GList *l;
-	GtkAction *action;
 
 	view = E_ATTACHMENT_VIEW (editor->priv->attachment_view);
 	store = e_attachment_view_get_store (view);
@@ -2333,9 +2325,6 @@ fill_widgets (CompEditor *editor)
 		g_slist_free (attachment_list);
 	}
 
-	action = comp_editor_get_action (editor, "classify-public");
-	g_signal_handlers_block_by_func (action, G_CALLBACK (classification_changed_cb), editor);
-
 	for (l = priv->pages; l != NULL; l = l->next)
 		comp_editor_page_fill_widgets (l->data, priv->comp);
 }
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 486b86ea34..4c5a5536ea 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1573,8 +1573,8 @@ categories_clicked_cb (GtkWidget *button,
 {
 	GtkEntry *entry;
 
-	entry = priv->categories;
-	e_categories_config_open_dialog_for_entry (GTK_ENTRY (entry));
+	entry = GTK_ENTRY (tpage->priv->categories);
+	e_categories_config_open_dialog_for_entry (entry);
 }
 
 static gboolean
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index ea583a6edb..cfb77f8066 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -358,9 +358,9 @@ e_cal_list_view_destroy (GtkObject *object)
 static void
 e_cal_list_view_show_popup_menu (ECalListView *cal_list_view, gint row, GdkEvent *gdk_event)
 {
+#if 0 /* KILL-BONOBO */
 	GtkMenu *menu;
 
-#if 0 /* KILL-BONOBO */
 	menu = e_calendar_view_create_popup_menu (E_CALENDAR_VIEW (cal_list_view));
 	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, gdk_event?gdk_event->button.button:0, gdk_event?gdk_event->button.time:gtk_get_current_event_time());
 #endif
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 74d22efe29..6eecb856b0 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -299,7 +299,7 @@ calendar_table_query_tooltip_cb (ECalendarTable *cal_table,
 		return FALSE;
 
 	etable = e_calendar_table_get_table (cal_table);
-	e_table_get_mouse_over_cell (etable, x, y, &row, &col);
+	e_table_get_mouse_over_cell (etable, &row, &col);
 	if (row == -1 || !etable)
 		return FALSE;
 
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index ddd08556fa..848a54ffa3 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -906,35 +906,6 @@ clipboard_paste_received_cb (GtkClipboard *clipboard,
 	g_object_unref (data);
 }
 
-static void
-e_calendar_view_paste_text (ECalendarView *cal_view)
-{
-	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
-
-	if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->paste_text)
-		E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->paste_text (cal_view);
-}
-
-static void
-clipboard_paste_received_cb (GtkClipboard *clipboard,
-			     GtkSelectionData *selection_data,
-			     gpointer data)
-{
-	if (gtk_clipboard_wait_is_text_available (clipboard)) {
-		e_calendar_view_paste_text (E_CALENDAR_VIEW (data));
-	} else {
-		GdkAtom type = selection_data->type;
-		if (type == gdk_atom_intern (target_types[TARGET_TYPE_VCALENDAR].target, TRUE)) {
-			gchar *result = NULL;
-			result = g_strndup ((const gchar *) selection_data->data,
-					    selection_data->length);
-			clipboard_get_calendar_data (E_CALENDAR_VIEW (data), result);
-			g_free (result);
-		}
-	}
-	g_object_unref (data);
-}
-
 void
 e_calendar_view_paste_clipboard (ECalendarView *cal_view)
 {
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index 5ea596ad5d..e5d8478b8e 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -27,7 +27,6 @@
 #include <gtk/gtk.h>
 #include "e-cal-model.h"
 #include "gnome-cal.h"
-#include "e-activity-handler.h"
 
 G_BEGIN_DECLS
 
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index abaad08695..891bec6d32 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -186,18 +186,6 @@ memo_table_double_click_cb (EMemoTable *memo_table,
 	memo_table_emit_open_component (memo_table, comp_data);
 }
 
-static gboolean
-query_tooltip_cb (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data)
-{
-	EMemoTable *memo_table;
-
-	g_return_val_if_fail (E_IS_MEMO_TABLE (user_data), FALSE);
-
-	memo_table = E_MEMO_TABLE (user_data);
-
-	return ec_query_tooltip (widget, x, y, keyboard_mode, tooltip, GTK_WIDGET (e_memo_table_get_table (memo_table)), memo_table->model);
-}
-
 static void
 memo_table_model_cal_view_progress_cb (EMemoTable *memo_table,
                                        const gchar *message,
@@ -249,7 +237,7 @@ memo_table_query_tooltip_cb (EMemoTable *memo_table,
 		return FALSE;
 
 	etable = e_memo_table_get_table (memo_table);
-	e_table_get_mouse_over_cell (etable, x, y, &row, &col);
+	e_table_get_mouse_over_cell (etable, &row, &col);
 	if (row == -1 || !etable)
 		return FALSE;
 
diff --git a/calendar/modules/e-cal-shell-view-private.c b/calendar/modules/e-cal-shell-view-private.c
index def3ba07e4..6022b712c2 100644
--- a/calendar/modules/e-cal-shell-view-private.c
+++ b/calendar/modules/e-cal-shell-view-private.c
@@ -439,7 +439,7 @@ e_cal_shell_view_open_event (ECalShellView *cal_shell_view,
 	if (itip_organizer_is_user (comp, comp_data->client))
 		flags |= COMP_EDITOR_USER_ORG;
 
-	if (itip_sentby_is_user (comp))
+	if (itip_sentby_is_user (comp, comp_data->client))
 		flags |= COMP_EDITOR_USER_ORG;
 
 	if (!e_cal_component_has_attendees (comp))
diff --git a/calendar/modules/e-task-shell-module.c b/calendar/modules/e-task-shell-module.c
index 345150222a..c92e07ebea 100644
--- a/calendar/modules/e-task-shell-module.c
+++ b/calendar/modules/e-task-shell-module.c
@@ -165,7 +165,6 @@ task_module_ensure_sources (EShellModule *shell_module)
 	if (personal == NULL) {
 		ESource *source;
 		GSList *selected;
-		const gchar *name;
 		gchar *primary;
 
 		source = e_source_new (name, PERSONAL_RELATIVE_URI);
diff --git a/doc/reference/shell/tmpl/e-shell-window.sgml b/doc/reference/shell/tmpl/e-shell-window.sgml
index f1bbeac5e7..7c5442ad96 100644
--- a/doc/reference/shell/tmpl/e-shell-window.sgml
+++ b/doc/reference/shell/tmpl/e-shell-window.sgml
@@ -49,7 +49,7 @@ EShellWindow
 </para>
 
 @shell: 
-@safe_mode: 
+@component_id: 
 @Returns: 
 
 
diff --git a/doc/reference/shell/tmpl/e-shell.sgml b/doc/reference/shell/tmpl/e-shell.sgml
index 04935e1de6..5907a493a3 100644
--- a/doc/reference/shell/tmpl/e-shell.sgml
+++ b/doc/reference/shell/tmpl/e-shell.sgml
@@ -203,7 +203,6 @@ EShell
 </para>
 
 @shell: 
-@parent: 
 
 
 <!-- ##### FUNCTION e_shell_get_network_available ##### -->
diff --git a/e-util/e-logger.c b/e-util/e-logger.c
index c304e362e6..88f3a24327 100644
--- a/e-util/e-logger.c
+++ b/e-util/e-logger.c
@@ -139,7 +139,7 @@ logger_finalize (GObject *object)
 
 	if (logger->priv->timer)
 		g_source_remove (logger->priv->timer);
-	flush_logfile (logger);
+	logger_flush (logger);
 	if (logger->priv->fp)
 		fclose (logger->priv->fp);
 
diff --git a/filter/filter-option.c b/filter/filter-option.c
index 2e76eca1c3..3b93084d67 100644
--- a/filter/filter-option.c
+++ b/filter/filter-option.c
@@ -372,29 +372,6 @@ get_dynamic_options (FilterOption *fo)
 	return res;
 }
 
-static GSList *
-get_dynamic_options (FilterOption *fo)
-{
-	GModule *module;
-	GSList *(*get_func)(void);
-	GSList *res = NULL;
-
-	if (!fo || !fo->dynamic_func)
-		return res;
-
-	module = g_module_open (NULL, G_MODULE_BIND_LAZY);
-
-	if (g_module_symbol (module, fo->dynamic_func, (gpointer) &get_func)) {
-		res = get_func ();
-	} else {
-		g_warning ("optionlist dynamic fill function '%s' not found", fo->dynamic_func);
-	}
-
-	g_module_close (module);
-
-	return res;
-}
-
 static GtkWidget *
 get_widget (FilterElement *fe)
 {
diff --git a/mail/e-mail-shell-module.c b/mail/e-mail-shell-module.c
index 35bde6fed5..4a0fcf0b38 100644
--- a/mail/e-mail-shell-module.c
+++ b/mail/e-mail-shell-module.c
@@ -425,7 +425,8 @@ action_mail_folder_new_cb (GtkAction *action,
 	folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar);
 
 exit:
-	em_folder_utils_create_folder (NULL, folder_tree);
+	em_folder_utils_create_folder (
+		NULL, folder_tree, GTK_WINDOW (shell_window));
 }
 
 static void
diff --git a/mail/e-mail-shell-view-actions.c b/mail/e-mail-shell-view-actions.c
index f9235a6104..0355a966f2 100644
--- a/mail/e-mail-shell-view-actions.c
+++ b/mail/e-mail-shell-view-actions.c
@@ -246,16 +246,22 @@ static void
 action_mail_folder_new_cb (GtkAction *action,
                            EMailShellView *mail_shell_view)
 {
+	EShellView *shell_view;
+	EShellWindow *shell_window;
 	EMailShellSidebar *mail_shell_sidebar;
 	CamelFolderInfo *folder_info;
 	EMFolderTree *folder_tree;
 
+	shell_view = E_SHELL_VIEW (mail_shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
 	mail_shell_sidebar = mail_shell_view->priv->mail_shell_sidebar;
 	folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar);
 	folder_info = em_folder_tree_get_selected_folder_info (folder_tree);
 	g_return_if_fail (folder_info != NULL);
 
-	em_folder_utils_create_folder (folder_info, folder_tree);
+	em_folder_utils_create_folder (
+		folder_info, folder_tree, GTK_WINDOW (shell_window));
 	camel_folder_info_free (folder_info);
 }
 
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 32eac59d39..1f5140701a 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -123,7 +123,9 @@ emfs_response (GtkWidget *dialog, int response, EMFolderSelector *emfs)
 		return;
 
 	g_object_set_data ((GObject *)emfs->emft, "select", GUINT_TO_POINTER (1));
-	em_folder_utils_create_folder (NULL, emfs->emft, GTK_WINDOW (dialog));
+
+	/* FIXME Pass a parent window. */
+	em_folder_utils_create_folder (NULL, emfs->emft, NULL);
 
 	g_signal_stop_emission_by_name (emfs, "response");
 }
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 64e9dcf117..ff93c9b5a9 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -403,7 +403,6 @@ em_folder_utils_delete_folder (CamelFolder *folder)
 {
 	CamelStore *local_store;
 	GtkWidget *dialog;
-	char *uri;
 	int flags = 0;
 
 	local_store = e_mail_shell_module_get_local_store (mail_shell_module);
diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h
index e3161bdcc0..deed1407e9 100644
--- a/mail/em-folder-utils.h
+++ b/mail/em-folder-utils.h
@@ -24,7 +24,7 @@
 #ifndef EM_FOLDER_UTILS_H
 #define EM_FOLDER_UTILS_H
 
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <camel/camel-folder.h>
 #include <camel/camel-store.h>
 #include <mail/em-folder-tree.h>
@@ -47,7 +47,8 @@ void		em_folder_utils_delete_folder	(CamelFolder *folder);
 void		em_folder_utils_rename_folder	(CamelFolder *folder);
 
 void		em_folder_utils_create_folder	(CamelFolderInfo *folderinfo,
-						 EMFolderTree * emft);
+						 EMFolderTree * emft,
+						 GtkWindow *parent);
 
 const gchar *	em_folder_utils_get_icon_name	(guint32 flags);
 
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 7e110877fa..2da8efaad2 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2086,7 +2086,6 @@ is_local (ESourceGroup *group)
 	return group &&
 		e_source_group_peek_base_uri (group) &&
 		g_str_has_prefix (e_source_group_peek_base_uri (group), "file://");
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:mail/em-utils.c
 }
 
 gboolean
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 1e0bfd2a70..be5b0164ee 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -210,22 +210,6 @@ gconf_outlook_filenames_changed (GConfClient *client, guint cnxn_id,
 }
 
 static void
-gconf_outlook_filenames_changed (GConfClient *client, guint cnxn_id,
-				 GConfEntry *entry, gpointer user_data)
-{
-	extern int camel_header_param_encode_filenames_in_rfc_2047;
-
-	g_return_if_fail (client != NULL);
-
-	/* pass option to the camel */
-	if (gconf_client_get_bool (client, "/apps/evolution/mail/composer/outlook_filenames", NULL)) {
-		camel_header_param_encode_filenames_in_rfc_2047 = 1;
-	} else {
-		camel_header_param_encode_filenames_in_rfc_2047 = 0;
-	}
-}
-
-static void
 gconf_jh_check_changed (GConfClient *client, guint cnxn_id,
 		     GConfEntry *entry, gpointer user_data)
 {
@@ -673,28 +657,10 @@ mail_config_get_allowable_mime_types (void)
 	return (const char **) config->mime_types->pdata;
 }
 
-static gboolean
-mail_config_account_url_equal (const CamelURL *u1,
-                               const CamelURL *u2)
-{
-	/* For the purpose of matching a URL to an EAccount, only compare
-	 * the protocol, user, host and port and disregard the rest. */
-
-	if (g_strcmp0 (u1->protocol, u2->protocol) != 0)
-		return FALSE;
-
-	if (g_strcmp0 (u1->user, u2->user) != 0)
-		return FALSE;
-
-	if (g_strcmp0 (u1->host, u2->host) != 0)
-		return FALSE;
-
-	return (u1->port == u2->port);
-}
-
 static EAccount *
 mc_get_account_by (const char *given_url, const char * (get_url_string)(EAccount *account))
 {
+	EAccountList *account_list;
 	EAccount *account = NULL;
 	EIterator *iter;
 	CamelURL *url;
@@ -709,7 +675,8 @@ mc_get_account_by (const char *given_url, const char * (get_url_string)(EAccount
 	provider = camel_provider_get (given_url, NULL);
 	g_return_val_if_fail (provider != NULL && provider->url_equal != NULL, NULL);
 
-	iter = e_list_get_iterator ((EList *) config->accounts);
+	account_list = e_get_account_list ();
+	iter = e_list_get_iterator ((EList *) account_list);
 	while (account == NULL && e_iterator_is_valid (iter)) {
 		CamelURL *account_url;
 		const char *account_url_string;
@@ -771,65 +738,6 @@ mail_config_get_account_by_transport_url (const char *transport_url)
 	return mc_get_account_by (transport_url, get_transport_url_string);
 }
 
-int
-mail_config_has_proxies (EAccount *account)
-{
-	return e_account_list_account_has_proxies (config->accounts, account);
-}
-
-void
-mail_config_remove_account_proxies (EAccount *account)
-{
-	e_account_list_remove_account_proxies (config->accounts, account);
-}
-
-void
-mail_config_prune_proxies (void)
-{
-	e_account_list_prune_proxies (config->accounts);
-}
-
-EAccountList *
-mail_config_get_accounts (void)
-{
-	if (config == NULL)
-		mail_config_init ();
-
-	return config->accounts;
-}
-
-void
-mail_config_add_account (EAccount *account)
-{
-	e_account_list_add(config->accounts, account);
-	mail_config_save_accounts ();
-}
-
-void
-mail_config_remove_account (EAccount *account)
-{
-	e_account_list_remove(config->accounts, account);
-	mail_config_save_accounts ();
-}
-
-void
-mail_config_set_default_account (EAccount *account)
-{
-	e_account_list_set_default(config->accounts, account);
-}
-
-EAccountIdentity *
-mail_config_get_default_identity (void)
-{
-	EAccount *account;
-
-	account = mail_config_get_default_account ();
-	if (account)
-		return account->id;
-	else
-		return NULL;
-}
-
 EAccountService *
 mail_config_get_default_transport (void)
 {
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 5742be8e5d..46a62e4fc2 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -55,6 +55,7 @@
 #include "mail-folder-cache.h"
 #include "mail-ops.h"
 #include "mail-session.h"
+#include "mail-tools.h"
 #include "e-mail-shell-module.h"
 
 /* For notifications of changes */
@@ -1091,26 +1092,26 @@ int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp)
 	return fi.fi != NULL;
 }
 
-gboolean 
+gboolean
 mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags)
 {
 	char *uri;
 
 	uri = mail_tools_folder_to_url (folder);
-	
+
 	struct _find_info fi = { uri, NULL, NULL };
 
 	if (stores == NULL)
 		return FALSE;
 
-	fi.url = camel_url_new(uri, NULL);
+	fi.url = camel_url_new (uri, NULL);
 
 	LOCK(info_lock);
 	g_hash_table_foreach(stores, (GHFunc)storeinfo_find_folder_info, &fi);
 	if (flags) {
 		if (fi.fi) {
 			*flags = fi.fi->flags;
-		} 
+		}
 	}
 	UNLOCK(info_lock);
 
diff --git a/mail/mail-session.c b/mail/mail-session.c
index b1776664fb..58b675828a 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -750,12 +750,6 @@ mail_session_shutdown (void)
 	camel_shutdown ();
 }
 
-void
-mail_session_shutdown (void)
-{
-	camel_shutdown ();
-}
-
 gboolean
 mail_session_get_interactive (void)
 {
diff --git a/mail/message-list.c b/mail/message-list.c
index 5ae5ba2232..3386ff4d3b 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -4242,9 +4242,8 @@ regen_list_exec (struct _regen_list_msg *m)
 
 					if (!was_deleted || (was_deleted && !m->hidedel))
 						g_ptr_array_add (uids, (gpointer) camel_pstring_strdup (looking_for));
+				}
 
-				if (!was_deleted || (was_deleted && !m->hidedel))
-					g_ptr_array_add (uids, (gpointer) camel_pstring_strdup (looking_for));
 			}
 		}
 	}
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index c13d6bca92..eb7d42fc73 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -24,7 +24,7 @@ liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $
 liborg_gnome_evolution_attachment_reminder_la_LIBADD =	\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
-	$(top_builddir)/mail/libevolution-mail.la	\
+	$(top_builddir)/mail/libevolution-module-mail.la	\
 	$(EVOLUTION_MAIL_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index afc13be3e8..00ca5acac5 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.c
@@ -304,7 +304,7 @@ oge_caldav  (EPlugin                    *epl,
 	char         *username;
 	const char   *ssl_prop;
 	gboolean      ssl_enabled;
-	int           row, i;
+	int           row;
 
 	source = t->source;
 	group = e_source_peek_group (source);
diff --git a/po/ChangeLog b/po/ChangeLog
index 0a5f0951fc..fe3f6aa629 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,1401 @@
+2009-04-24  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #340783
+
+	* POTFILES.in: Added plugins/publish-calendar/publish-format-fb.c
+	and plugins/publish-calendar/publish-format-ical.c there.
+
+2009-04-15  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Fixed bug #574842.
+
+2009-04-14  Khaled Hosny <khaledhosny@eglug.org>
+
+	* ar.po: Don't translate gconf key values, fixes #569507.
+
+2009-04-13  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2009-04-12  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2009-04-10 Baris Cicek <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish translation
+	
+2009-04-10  Goran Rakic  <grakic@devbase.net>
+
+	* sr.po, sr@latin.po: Updated Serbian translation (by Miloš Popović).
+
+2009-04-09  Shankar Prasad  <svenkate@redhat.com>
+
+        * kn.po: Updated Kannada translation
+
+2009-04-07  Philip Withnall  <philip@tecnocode.co.uk>
+
+	* en_GB.po: Fix for British English date formats by Bruce Cowan
+	<bcowan@fastmail.co.uk>.
+
+2009-04-04  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-03-30  Manioj Kumar Giri  <mgiri@redhat.com>
+
+	* or.po: Updated Oriya Translation
+
+2009-03-27  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Mattias Põldaru
+
+2009-03-25  Shankar Prasad  <svenkate@redhat.com>
+
+        * kn.po: Updated few correction to Kannada translations.
+
+2009-03-22  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-03-21  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Typo fixed in French translation.
+
+2009-03-21  Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* ja.po: Fixed wrong translation.
+
+2009-03-19  Manoj Kumar Giri  <mgiri@redhat.com>
+
+	* or.po: Updated Oriya Translation.
+
+2009-03-18  Djihed Afifi <djihed@gmail.com>
+
+	* ar.po: Updated Arabic translation by Osama Khalid.
+
+2009-03-17  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2009-03-16  Baris Cicek <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish translation.
+
+2009-03-16  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
+2009-03-16  Amitakhya Phukan <amitakhya@svn.gnome.org>
+
+	* as.po: Updated Assamese translations.
+
+2009-03-16  Ankitkumar Patel  <ankit@redhat.com>
+
+	* gu.po: Updated Gujarati Translations.
+
+2009-03-16  Manoj Kumar Giri  <mgiri@redhat.com>
+
+	* or.po: Updated Oriya Translation.
+
+<<<<<<< .mine
+2009-03-16  Manoj Kumar Giri  <mgiri@redhat.com>
+
+	* or.po: Updated Oriya Translation.
+
+=======
+2009-03-16  Dwayne Bailey  <dwayne@translate.org.za>
+
+	* af.po: Fix msgfmt errors
+
+2009-03-15  Andre Klapper  <a9016009@gmx.de>
+
+	* af.po: Added Afrikaans translation by Friedel Wolff.
+	Fixes bug #575466.
+	* LINGUAS: Added af.
+
+>>>>>>> .r37444
+2009-03-15  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2009-03-15  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation, fix #574975.
+
+2009-03-15  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* ru.po: Updated Russian translation by Yuriy Penkin.
+
+2009-03-15  Ani Peter  <apeter@redhat.com>
+
+	* ml.po: Updated Malayalam Translations
+
+2009-03-15  Rajesh Ranjan  <rajeshkajha@yahoo.com>
+
+	* mai.po: added Maithili translation.
+	* LINGUAS: Added Maithili (mai) to the list of Languages.
+
+2009-03-15  Sandeep Shedmake  <sshedmak@redhat.com>
+
+	* mr.po: Updated Marathi Translations.
+
+2009-03-15  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po: Updated Greek Translation by Jennie Petoumenou.
+
+2009-03-14  Žygimantas Beručka  <zygis@gnome.org>
+
+	* lt.po: Updated Lithuanian translation.
+
+2009-03-14  Manoj Kumar Giri  <mgiri@redhat.com>
+
+	* or.po: Updated Oriya Translation.
+
+2009-03-14  Andre Klapper  <a9016009@gmx.de>
+
+	* cs.po: Updated Czech translation by Jiri Eischmann.
+
+2009-03-14  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Priit Laes
+
+2009-03-14  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
+2009-03-14  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+	
+2009-03-14  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Fixed bug #567745.
+
+2009-03-13  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 * gl.po: Updated Galician translation
+
+2009-03-13  Manoj Kumar Giri  <mgiri@redhat.com>
+
+	* or.po: Updated Oriya Translation.
+
+2009-03-13  I. Felix <ifelix@redhat.com>
+
+	* ta.po:  Tamil Translation updated
+
+2009-03-13  Rajesh Ranjan <rranjan@redhat.com>
+
+	* hi.po: Updated Hindi Translation.
+
+2009-03-13  Ani Peter  <apeter@redhat.com>
+
+	* ml.po: Updated Malayalam Translations
+
+2009-03-12  Wadim Dziedzic  <wdziedzic@aviary.pl>
+
+	* pl.po: Updated Polish translation and fixed bug #569514
+
+2009-03-13  Rajesh Ranjan <rranjan@redhat.com>
+
+	* hi.po: Updated Hindi Translation.
+
+2009-03-13  Runa Bhattacharjee  <runab@redhat.com>
+
+	* bn_IN.po: Updated partial Bengali India translation
+
+2009-03-12  Manoj Kumar Giri  <mgiri@redhat.com>
+
+	* or.po: Updated Oriya Translation
+
+2009-03-11  Goran Rakic  <grakic@devbase.net>
+
+	* sr.po, sr@latin.po: Updated Serbian translation wrt #574841.
+
+2009-03-11  Gintautas Miliauskas  <gintas@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2009-03-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-03-10  Ankitkumar Patel  <ankit@redhat.com>
+
+	* gu.po: Updated Gujarati Translations.
+
+2009-03-10  Rajesh Ranjan <rranjan@redhat.com>
+
+	* hi.po: Updated Hindi Translation.
+	
+2009-03-09  Manoj Kumar Giri  <mgiri@redhat.com>
+
+	* or.po: Updated Oriya Translation
+
+2009-03-09  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* nl.po: Updated Dutch translation by Tino Meinen.
+
+2009-03-08  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po: Updated Greek Translation by Jennie Petoumenou.
+
+2009-03-08  Philip Withnall  <philip@tecnocode.co.uk>
+
+	* en_GB.po: Updated British English translation.
+
+2009-03-08  Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* ja.po: Fixed wrong translations.
+
+2009-03-08  Gintautas Miliauskas  <gintas@akl.lt>
+
+	* lt.po: Updated Lithuanian translation.
+
+2009-03-07  Mișu Moldovan <dumol@gnome.ro>
+
+	* ro.po: Updated Romanian translation by Adi Roiban
+
+2009-03-05  Krishnababu K <kkrothap@redhat.com>
+
+	* te.po: Updated Telugu Translation.
+
+2009-03-05  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2009-03-04  Manoj Kumar Giri  <mgiri@redhat.com>
+
+	* or.po: Updated Oriya Translation.
+
+2009-03-03  Milo Casagrande  <milo@ubuntu.com>
+
+	* it.po: Updated Italian translation
+
+2009-03-03  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Minor fix to Catalan translation.
+
+2009-03-03  Shankar Prasad  <svenkate@redhat.com>
+
+	* kn.po: Updated Kannada translations.
+
+2009-03-03  Žygimantas Beručka  <zygis@gnome.org>
+
+	* lt.po: Updated Lithuanian translation.
+
+2009-03-02  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2009-03-02  Manoj Kumar Giri  <mgiri@redhat.com>
+
+	* or.po: Updated Oriya Translation.
+
+2009-03-02  Sweta Kothari  <swkothar@redhat.com>
+
+	* gu.po: Committed Gujarati Translation.
+
+2009-03-01  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* nl.po: Updated Dutch translation by Wouter Bolsterlee.
+
+2009-03-01  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2009-03-01  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Mattias Põldaru
+
+2009-03-01  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2009-03-01  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2009-02-23  Philip Withnall  <philip@tecnocode.co.uk>
+
+	* en_GB.po: Updated British English translation.
+
+2009-02-23  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Updated Catalan translation by David Planella.
+
+2009-02-20  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Updated French translation by Bruno Brouard and Claude Paroz.
+
+2009-02-20  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2009-02-19  Ihar Hrachyshka <booxter@lacinka.org>
+
+	* be@latin.po: Updated Belarusian Latin translation by Ihar
+	Hrachyshka.
+
+2009-02-18  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2009-02-18  Ihar Hrachyshka <booxter@lacinka.org>
+
+	* be@latin.po: Updated Belarusian Latin translation by Ihar
+	Hrachyshka.
+
+2009-02-18  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2009-02-17  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
+2009-02-17  Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* ja.po: Updated Japanese translation.
+
+2009-02-16  Simos Xenitellis  <simos@gnome.org>
+
+	* el.po: Updated Greek translation (Marios Zindilis),
+	closes bug 571886, bug 569519.
+
+2009-02-16  Sweta Kothari  <swkothar@redhat.com>
+
+	* gu.po: Committed Gujarati Translation.
+
+2009-02-15 Kenneth Nielsen <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation by Kenneth Nielsen
+
+2009-02-15  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Updated Czech translation by Jiri Eischmann.
+
+2009-02-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-02-14  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2009-02-12  Sweta Kothari  <swkothar@redhat.com>
+
+	* gu.po: Committed Gujarati Translation.
+
+2009-02-12  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2009-02-11  Jonh Wendell  <jwendell@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by Andre Gondim.
+
+2009-02-10  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2009-02-09  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Updated Catalan translation by David Planella.
+
+2009-02-07  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2009-02-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-02-06    Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po    Updated Vietnamese translation
+
+2009-02-05  Sweta Kothari  <swkothar@redhat.com>
+
+	* gu.po: Committed Gujarati Translation.
+
+2009-02-04  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
+2009-02-03  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-01-31  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2009-01-31  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2009-01-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-01-30  Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
+
+	* vi.po: Don't translate the gconf keys, #569508
+
+2009-01-30  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2009-01-29  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Don't translate the gconf keys. Closes
+	bug #569528
+
+2009-01-29  Jonh Wendell  <jwendell@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation.
+
+2009-01-29  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2009-01-29  Bharath Acharya  <abharath@novell.com>
+
+	* POTFILES.in: Added plugins/pst-import/pst-importer.c
+
+2009-01-29  Raivis Dejus  <orvils@gmail.com>
+
+	* lv.po: Updated latvian translation Bug 569534
+
+2009-01-29  I. Felix <ifelix@redhat.com>
+
+	* ta.po:  Bug fix for #569517.
+
+2009-01-29  Jovan Naumovski  <jovan@lugola.net>
+
+	* mk.po: Bug fix for #569526.
+
+2009-01-28  Goran Rakić  <grakic@devbase.net>
+
+	* sr.po, sr@latin.po: Updated Serbian Translations (by Miloš Popović).
+
+2009-01-29  Funda Wang  <fundawang@gmail.com>
+
+	* zh_CN.po: Updated zh_CN translation.
+
+2009-01-28  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2009-01-24  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
+2009-01-24  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2009-01-23  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation.
+
+2009-01-22  Wadim Dziedzic  <wdziedzic@aviary.pl>
+
+	* pl.po: Fixed bug 567778 in Polish translation
+
+2009-01-19  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-01-19  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translaion.
+
+2009-01-18 Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* ru.po: Updated Russian translation.
+
+2009-01-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-01-16  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation, fix #566570.
+
+2009-01-16  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Updated Catalan translation by David Planella.
+
+2009-01-15  Bharath Acharya  <abharath@novell.com>
+
+	* POTFILES.in: Added plugins/pst-import/org-gnome-pst-import.eplug.xml
+
+2009-01-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-01-14  Wadim Dziedzic  <wdziedzic@aviary.pl>
+
+	* pl.po: Updated Polish translation
+
+2009-01-12  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
+2009-01-11  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-01-11  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
+2009-01-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-01-07  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-01-05  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2009-01-04  Raivis Dejus  <orvils@gmail.com>
+
+	* lv.po: Updated latvian translation
+
+2009-01-02  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2009-01-01  Yannig Marchegay  <yannig@marchegay.org>
+
+	* oc.po: Updated Occitan translation
+
+2009-01-01  Andre Klapper  <a9016009@gmx.de>
+
+	* POTFILES.in: Fix my last commit so l10n.gnome.org is happy.
+
+2008-12-30  Andre Klapper  <a9016009@gmx.de>
+
+	* POTFILES.in: add missing file (cf. bug #359010)
+
+2008-12-28  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2008-12-21  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Fixed terminology in the Brazilian Portuguese translation.
+
+2008-12-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2008-12-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2008-12-15  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* POTFILES.in: Remove deleted file.
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-12-15  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* POTFILES.in: Add e-utils/*intrusive*.[ch]
+
+2008-12-13  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Merged from branch gnome-2-24 minor fixes to the Brazilian
+	Portuguese translation.
+
+2008-12-09  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-11-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2008-11-16  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* ru.po: Updated Russian translation.
+
+2008-11-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2008-11-09  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Fixed Czech translation by Jiri Eischmann,
+	thanks to Kamil Paral.
+
+2008-11-08  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-11-03  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* POTFILES.in: Added addressbook/gui/component/autocompletion-config.c
+
+2008-11-03 Maxim Dziumanenko <dziumanenko@gmail.com>
+
+	* uk.po: Update Ukrainian translation.
+
+2008-11-03  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Merged Brazilian Portuguese translation from branch
+	gnome-2-24. Fixes capitalization, verb tense in descriptions, some
+	terminology errors, double spaces and random errors. Improves
+	access keys.
+
+2008-11-02  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2008-10-30 Kenneth Nielsen <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation by Kenneth Nielsen
+
+2008-10-25  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-10-24  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-10-24  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-10-23  Gil Forcada  <gforcada@gnome.org>
+
+	* LINGUAS: Added ast.
+	* ast.po: Added Asturian translation on behalf of Mikel González.
+
+2008-10-23  Philipp Kerling  <k.philipp@gmail.com>
+
+	** Fixes bug #557563
+
+	* de.po: Updated German translation (patch by Ronny Standke).
+
+2008-10-19  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-10-17  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+<<<<<<< HEAD:po/ChangeLog
+2008-10-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>   
+=======
+2008-10-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
+
+	* es.po: Updated Spanish translation
+
+2008-10-13  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #556191
+
+	* POTFILES.in: Remove org-gnome-mark-calendar-offline.eplug.xml
+
+2008-10-11  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Fixed typo in the Brazilian Portuguese translation.
+
+2008-10-11  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Merged from branch gnome-2-24.
+
+2008-10-11  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Fixed terminology in the Brazilian Portuguese translation.
+
+2008-10-11  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2008-10-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation, fixes bug #554832
+
+2008-10-04  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation.
+
+2008-10-04  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-10-03  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2008-10-01 Og Maciel <ogmaciel@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by Og Maciel.
+
+2008-10-01  Robert-André Mauchin  <zebob.m@pengzone.org>
+
+<<<<<<< HEAD:po/ChangeLog
+	* fr.po: French translation update. Fixed #554548 
+=======
+	* fr.po: French translation update. Fixed #554548
+>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
+	thanks to Hanka Zalska from Sun.
+
+2008-10-01  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-09-30  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-09-30  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
+2008-09-30  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
+2008-09-29  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* nl.po: Updated Dutch translation by Wouter Bolsterlee.
+
+2008-09-28  Goran Rakić  <grakic@devbase.net>
+
+	* sr.po, sr@latin.po: Updated Serbian Translations.
+
+2008-09-22  Praveen Arimbrathodiyil <pravi.a@gmail.com>
+
+	* ml.po: Malayalam translation updated by Hari Vishnu.
+
+2008-09-22  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-09-22  Runa Bhattacharjee  <runab@redhat.com>
+
+	* bn_IN.po: Updated Bengali India Translation
+
+2008-09-21  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* ru.po: Updated Russian translation.
+
+2008-09-21  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-09-21  Wadim Dziedzic  <wdziedzic@aviary.pl>
+
+	* pl.po: Updated Polish translation
+
+<<<<<<< HEAD:po/ChangeLog
+2008-09-21  Djihed Afifi <djihed@gmail.com> 
+=======
+2008-09-21  Djihed Afifi <djihed@gmail.com>
+>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
+
+	* ar.po: Updated Arabic Translation by OsamaKhalid.
+
+2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
+
+<<<<<<< HEAD:po/ChangeLog
+        * hi.po: Updated Hindi Translation.
+        
+2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
+
+        * hi.po: Updated Hindi Translation.
+        
+2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
+
+        * hi.po: Updated Hindi Translation.
+=======
+	* hi.po: Updated Hindi Translation.
+
+2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
+
+	* hi.po: Updated Hindi Translation.
+
+2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
+
+	* hi.po: Updated Hindi Translation.
+>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
+
+2008-09-21  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2008-09-20 Kenneth Nielsen <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation by Kenneth Nielsen
+
+2008-09-20  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation.
+
+2008-09-20  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by Fabrício Godoy,
+	Vladimir Melo and Leonardo Ferreira Fontenelle.
+
+2008-09-20  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian Translation.
+
+2008-09-20  Goran Rakić  <grakic@devbase.net>
+
+	* sr.po, sr@latin.po: Updated Serbian translation (by Igor Nestorović).
+
+2008-09-19  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation.
+
+2008-09-19  Simos Xenitellis  <simos@gnome.org>
+
+	* el.po: Updated Greek translation by Pierros Papadeas.
+
+2008-09-19  Žygimantas Beručka  <zygis@gnome.org>
+
+	* lt.po: Updated missing translations of msgctx strings.
+
+2008-09-19  Žygimantas Beručka  <zygis@gnome.org>
+
+	* lt.po: Updated Lithuanian translation.
+
+2008-09-18  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation.
+
+2008-09-18  I. Felix <ifelix@redhat.com>
+
+	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
+
+2008-09-18 Inaki Larrañaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2008-09-18  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-09-18  Shankar Prasad  <svenkate@redhat.com>
+
+<<<<<<< HEAD:po/ChangeLog
+        * kn.po: Updated Kannada translation
+=======
+	* kn.po: Updated Kannada translation
+>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
+
+2008-09-18  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
+<<<<<<< HEAD:po/ChangeLog
+2008-09-18  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Usama Akkad.
+
+2008-09-17  Djihed Afifi <djihed@gmail.com> 
+=======
+2008-09-18  Djihed Afifi <djihed@gmail.com>
+
+	* ar.po: Updated Arabic Translation by Usama Akkad.
+
+2008-09-17  Djihed Afifi <djihed@gmail.com>
+>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
+
+	* ar.po: Updated Arabic Translation by Usama Akkad.
+
+2008-09-17  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Updated Czech translation by Jiri Eischmann.
+
+2008-09-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-09-17  Shankar Prasad  <svenkate@redhat.com>
+
+<<<<<<< HEAD:po/ChangeLog
+        * kn.po: Updated Kannada translation
+=======
+	* kn.po: Updated Kannada translation
+>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog
+
+2008-09-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-09-16  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation.
+
+2008-09-16  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-09-15  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Updated Catalan translation by David Planella.
+
+2008-09-15  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Updated Czech translation by Jiri Eischmann.
+
+2008-09-15  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* nl.po: Updated Dutch translation by Tino Meinen.
+
+2008-09-15  Djihed Afifi <djihed@gmail.com>
+
+	* ar.po: Updated Arabic Translation by Abou Manal.
+
+2008-09-15  Shankar Prasad  <svenkate@redhat.com>
+
+	* kn.po: Updated Kannada translation
+
+2008-09-14  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-09-14  Sandeep Shedmake  <sshedmak@redhat.com>
+
+	* mr.po: Updated Marathi translations.
+
+2008-09-13  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-09-12  Baris Cicek  <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish translation.
+
+2008-09-12  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation.
+
+2008-09-12  Philip Withnall  <philip@tecnocode.co.uk>
+
+	* en_GB.po: Updated British English translation.
+
+2008-09-12  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Fixed Portuguese terminology.
+
+2008-09-12  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-09-11  Runa Bhattacharjee  <runab@redhat.com>
+
+	* bn_IN.po: Updated Bengali India Translation
+
+2008-09-11  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation.
+
+2008-09-11  Rajesh Ranjan <rajeshkajha@yahoo.com>
+
+	* hi.po: Updated Hindi Translation.
+
+2008-09-11  Robert Sedak  <robert.sedak@sk.t-com.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2008-09-11  Gil Forcada  <gforcada@gnme.org>
+
+	* ca.po: Updated Catalan translation by David Planella.
+
+2008-09-10  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Yavor Doganov <yavor@gnu.org>
+
+2008-09-10  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-09-09  Krishnababu K  <kkrothap@redhat.com>
+
+	* te.po: Updated Telugu Translation.
+
+2008-09-09  Pema Geyleg  <pema.geyleg@gmail.com>
+
+	* dz.po: Updated Dzongkha Translation
+
+2008-09-09  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2008-09-08  Robert Sedak  <robert.sedak@sk.t-com.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2008-09-08  I. Felix <ifelix@redhat.com>
+
+	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
+
+2008-09-07  Robert Sedak  <robert.sedak@sk.t-com.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2008-09-07  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Tino Meinen.
+
+2008-09-07  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2008-09-07  Funda Wang  <fundawang@gmail.com>
+
+	* zh_CN.po: Updated zh_CN translation.
+
+2008-09-07  Philip Withnall  <philip@tecnocode.co.uk>
+
+	* en_GB.po: Updated British English translation.
+
+2008-09-06  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
+2008-09-06  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Updated French translation.
+
+2008-09-05  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
+2008-09-05  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-09-05  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2008-09-03  Philip Withnall  <philip@tecnocode.co.uk>
+
+	* en_GB.po: Updated British English translation.
+
+2008-08-31  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-08-31  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-31  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation
+
+2008-08-31  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translaion by Mark Krapivner.
+
+2008-08-30  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Updated French translation by Yannick Tailliez and Bruno Brouard.
+
+2008-08-30  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
+2008-08-30  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation
+
+2008-08-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-30  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2008-08-29  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-29  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-08-28  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation, fix #545473.
+
+2008-08-27  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-08-27  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-08-25  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-08-25  Goran Rakic  <grakic@devbase.net>
+
+	* LINGUAS, sr@latin.po, sr@Latn.po: Conversion from sr@Latn to sr@latin.
+
+2008-08-25  Goran Rakić  <grakic@devbase.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation
+
+2008-08-22  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-22  Shankar Prasad  <svenkate@redhat.com>
+
+	* kn.po: Updated Kannada translation
+
+2008-08-22  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
+2008-08-22  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2008-08-22  Åsmund Skjæveland  <aasmunds@ulrik.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2008-08-21  Jovan Naumovski  <jovan@lugola.net>
+
+	* mk.po: Updated Macedonian translation.
+
+2008-08-21  Åsmund Skjæveland  <aasmunds@ulrik.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2008-08-21  Shankar Prasad  <svenkate@redhat.com>
+
+	* kn.po: Updated Kannada translation
+
+2008-08-18  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-08-18  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translaion.
+
+2008-08-18  Shankar Prasad  <svenkate@redhat.com>
+
+	* kn.po: Updated Kannada translation
+
+2008-08-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-17  Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* ja.po: Updated Japanese translation.
+
+2008-08-16  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-08-15  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation
+
+2008-08-15  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-08-15  Milan Crha  <mcrha@redhat.com>
+
+	* POTFILES.in: Added e-util/e-util.c there.
+
+2008-08-14  Shankar Prasad  <svenkate@redhat.com>
+
+	* kn.po: Updated Kannada Translation.
+
+2008-08-13  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-08-13  Shankar Prasad  <svenkate@redhat.com>
+
+	* kn.po: Updated Kannada Translation.
+
+2008-08-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-12  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation
+
+2008-08-12  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation
+
+2008-08-12  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-08-11  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2008-08-11  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation
+
+2008-08-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
+2008-08-08  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-08-07  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-07  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation
+
+2008-08-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-08-06  Djihed Afifi <djihed@gmail.com>
+
+	* ar.po: Updated Arabic Translation by Abou Manal.
+
+2008-08-05: Sweta Kothari  <swkothar@redhat.com>
+
+	* gu.po: Committed Gujarati Translation.
+
+2008-08-04  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation
+
+2008-08-03  Leonid Kanter <leon@asplinux.ru>
+
+	* ru.po: Updated Russian translation
+
+2008-08-02  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation
+
+2008-08-01  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation
+
+2008-08-01  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation
+
+2008-07-31  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation by Frco. Javier Rial Rodríguez.
+
+2008-07-29  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-07-29  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2008-07-29  Djihed Afifi <djihed@gmail.com>
+
+	* ar.po: Updated Arabic Translation by Abou Manal.
+
+2008-07-27  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Fixed Czech translation.
+
+2008-07-24  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Terminology fixes by Fabrício Godoy.
+
+2008-06-24  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-07-24  Claude Paroz  <claude@2xlibre.net>
+
+	* fr.po: Updated French translation by Bruno Brouard and Claude Paroz.
+
+2008-07-23  Gil Forcada  <gforcada@gnome.org>
+
+	* ps.po: Added Pashto translation by Zabeeh Khan.
+	* LINGUAS: Added ps.
+
+2008-07-23  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Fixed Czech translation, thanks for noticing
+	to Pavel Sefranek.
+
+2008-07-21  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-07-21  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.
+
+2008-07-21  Johnny Jacob  <jjohnny@novell.com>
+
+	* POTFILES.in: Fixed a typo.
+
+2008-07-21  J0hnny Jacob <jjohnny@novell.com>
+
+	* POTFILES.in: Updated file lsit.
+
+2008-07-20  Andre Klapper  <a9016009@gmx.de>
+
+	* POTFILES.in: Updated file list.
+
+2008-07-20  Bharath Acharya  <abharath@novell.com>
+
+	* POTFILES.in:
+	Updated file-list for templates plugin.
+
+	** See bug #200147
+
+2008-07-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-07-19  Andre Klapper  <a9016009@gmx.de>
+
+	* de.po: Updated German translation.
+
 2008-07-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
@@ -8,7 +1406,7 @@
 
 2008-07-05  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2008-07-04  Priit Laes  <plaes at svn dot gnome dot org>
 
@@ -65,11 +1463,11 @@
 
 	* ru.po: Updated Russian translation by Anatol Kamynin.
 
-2008-06-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+2008-06-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
 
-2008-06-11  Djihed Afifi <djihed@gmail.com> 
+2008-06-11  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Abou Manal.
 
@@ -89,11 +1487,11 @@
 
 	* he.po: Updated Hebrew translaion.
 
-2008-06-02   Clytie Siddall <clytie@riverland.net.au>
+2008-06-02  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
-2008-06-01   Clytie Siddall <clytie@riverland.net.au>
+2008-06-01  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
@@ -103,7 +1501,7 @@
 
 2008-05-23  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation, fixes bug #535014
+	* es.po: Updated Spanish translation, fixes bug #535014
 
 2008-05-25  Philip Withnall  <pwithnall@svn.gnome.org>
 
@@ -113,7 +1511,7 @@
 
 	* en_GB.po: Updated British English translation.
 
-2008-05-25   Clytie Siddall <clytie@riverland.net.au>
+2008-05-25  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
@@ -133,7 +1531,7 @@
 
 	* el.po: Fixed a typo.
 
-2008-05-23  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+2008-05-23  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
 
@@ -146,7 +1544,7 @@
 
 	* nl.po: Translation updated by Tino Meinen.
 
-2008-05-19  Djihed Afifi <djihed@gmail.com> 
+2008-05-19  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Abou Manal.
 
@@ -197,7 +1595,7 @@
 
 2008-04-27  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2008-04-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
@@ -212,7 +1610,7 @@
 
 	* en_GB.po: _Trash -> Wastebaske_t
 
-2008-04-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>     
+2008-04-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
 
@@ -251,9 +1649,9 @@
 
 	* he.po: Updated Hebrew translaion by Mark Krapivner.
 
-2008-04-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+2008-04-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2008-04-09  Yair Hershkovitz  <yairhr@gmail.com>
 
@@ -265,7 +1663,7 @@
 
 2008-04-07  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation, fixed bug #525068
+	* es.po: Updated Spanish translation, fixed bug #525068
 
 2008-04-07  Priit Laes  <plaes at svn dot gnome dot org>
 
@@ -373,12 +1771,12 @@
 
 2008-03-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
-        * zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-        * zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
 
 2008-03-09 Maxim Dziumanenko <dziumanenko@gmail.com>
 
-        * uk.po: Update Ukrainian translation.
+	* uk.po: Update Ukrainian translation.
 
 2008-03-08  Kenneth Nielsen  <k.nielsen81@gmail.com>
 
@@ -389,7 +1787,7 @@
 	* el.po: Updated Greek translation
 
 2008-03-08  Guntupalli Karunakar  <karunakar@indlinux.org>
-	
+
 	* hi.po: Fix plurals.
 
 2008-03-08  Runa Bhattacharjee <runab@fedoraproject.org>
@@ -477,9 +1875,9 @@
 
 	* lt.po: Updated Lithuanian translation.
 
-2008-02-29  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+2008-02-29  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation                   
+	* es.po: Updated Spanish translation
 
 2008-02-29  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
 
@@ -518,7 +1916,7 @@
 
 	* et.po: Translation updated by Ivar Smolin
 
-2008-02-23  Djihed Afifi <djihed@gmail.com> 
+2008-02-23  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Abou Manal.
 
@@ -528,7 +1926,7 @@
 
 2008-02-21 Arangel Angov <arangel@linux.net.mk>
 
-        * mk.po: Updated Macedonian translation.
+	* mk.po: Updated Macedonian translation.
 
 2008-02-21  Changwoo Ryu  <cwryu@debian.org>
 
@@ -545,15 +1943,15 @@
 2008-02-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translaiton, fixed typo thanks to Ignacio
-	  Casal Quinteiro.
+	Casal Quinteiro.
 
 2008-02-19  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
 	* gl.po: Updated Galician Translation.
 
-2008-02-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+2008-02-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2008-02-18  Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
 
@@ -567,14 +1965,14 @@
 
 	* nb.po: Updated Norwegian bokmål translation.
 
-2008-02-17  Djihed Afifi <djihed@gmail.com> 
+2008-02-17  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Djihed Afifi.
 
 2008-02-17  David Lodge <dave@cirt.net>
 
 	* en_GB.po: Updated British English translation
-	
+
 2008-02-16  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
 
 	* eu.po: Updated Basque translation.
@@ -635,7 +2033,7 @@
 
 	* eu.po: Updated Basque translation.
 
-2008-02-11  Jorge Gonzalez  <jorgegonz@svn.gnome.org> 
+2008-02-11  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
 
@@ -674,9 +2072,9 @@
 	* de.po: Updated German translation.
 
 2008-02-02  Yannig Marchegay <yannig@marchegay.org>
-	
+
 	* oc.po: Updated Occitan translation.
-	
+
 2008-02-02  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* nb.po: Updated Norwegian bokmål translation.
@@ -685,7 +2083,7 @@
 
 	* kn.po: Updated Kannada Translations by Shankar Prasad.
 
-2008-01-31  Djihed Afifi <djihed@gmail.com> 
+2008-01-31  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Djihed Afifi.
 
@@ -693,7 +2091,7 @@
 
 	* sv.po: Updated Swedish translation.
 
-2008-01-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>       
+2008-01-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
 
@@ -711,7 +2109,7 @@
 
 2008-01-28  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2008-01-28  Daniel Nylander <po@danielnylander.se>
 
@@ -723,7 +2121,7 @@
 
 2008-01-26  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-        * gl.po: Updated Galician Translation.
+	* gl.po: Updated Galician Translation.
 
 2008-01-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
@@ -840,19 +2238,19 @@
 
 	* POTFILES.in: Remove new-mail-notify's files.
 
-2008-01-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>          
+2008-01-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation.  
+	* es.po: Updated Spanish translation.
 
 2008-01-05  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
 
-        * eu.po: Updated Basque translation.
+	* eu.po: Updated Basque translation.
 
 2008-01-04  Erdal Ronahi  <erdal.ronahi@gmail.com>
 
 	* ku.po: Updated Kurdish translation
 
-2008-01-05   Clytie Siddall <clytie@riverland.net.au>
+2008-01-05  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
@@ -880,7 +2278,7 @@
 
 	* ga.po: Updated Irish translation.
 
-2007-12-28  Djihed Afifi <djihed@gmail.com> 
+2007-12-28  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Djihed Afifi.
 
@@ -902,7 +2300,7 @@
 
 2007-12-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-12-17  Kjartan Maraas  <kmaraas@gnome.org>
 
@@ -918,7 +2316,7 @@
 
 2007-12-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-12-16  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
 
@@ -934,9 +2332,9 @@
 
 	* ga.po: Updated Irish translation.
 
-2007-12-15  Jorge Gonzalez  <jorgegonz@svn.gnome.org> 
+2007-12-15  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-12-15  Kjartan Maraas  <kmaraas@gnome.org>
 
@@ -948,15 +2346,15 @@
 
 2007-12-11  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation.
+	* es.po: Updated Spanish translation.
 
 2007-12-10  Matej Urbančič  <mateju@svn.gnome.org>
 
 	* sl.po: Updated Slovenian Translation.
 
-2007-12-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org> 
+2007-12-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-12-08  Andre Klapper  <a9016009@gmx.de>
 
@@ -977,7 +2375,7 @@
 
 2007-12-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-12-04  Changwoo Ryu  <cwryu@debian.org>
 
@@ -987,9 +2385,9 @@
 
 	* POTFILES.in: Add new files, remove dead ones.
 
-2007-11-28  Jorge Gonzalez <jorgegonz@svn.gnome.org>  
+2007-11-28  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation.
+	* es.po: Updated Spanish translation.
 
 2007-11-28  Priit Laes  <plaes@svn.gnome.org>
 
@@ -999,13 +2397,13 @@
 
 	* sl.po: Updated Slovenian translation.
 
-2007-11-21  Yannig Marchegay <yannig@marchegay.org> 
+2007-11-21  Yannig Marchegay <yannig@marchegay.org>
 
 	* oc.po: Updated Occitan translation
 
 2007-11-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-11-20  Daniel Nylander <po@danielnylander.se>
 
@@ -1013,11 +2411,11 @@
 
 2007-11-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation   
+	* es.po: Updated Spanish translation
 
 2007-11-15  Marcel Telka  <marcel@telka.sk>
 
-	* sk.po: Fixed bug 422993. Thanks to Hanka Zalska. 
+	* sk.po: Fixed bug 422993. Thanks to Hanka Zalska.
 
 2007-11-14  Daniel Nylander <po@danielnylander.se>
 
@@ -1025,7 +2423,7 @@
 
 2007-11-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-11-14  Andre Klapper  <a9016009@gmx.de>
 
@@ -1037,7 +2435,7 @@
 
 2007-11-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-11-12  Matej Urbančič  <mateju@svn.gnome.org>
 
@@ -1072,7 +2470,7 @@
 
 2007-11-01  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-11-01  Gil Forcada  <gforcada@svn.gnome.org>
 
@@ -1093,17 +2491,17 @@
 
 2007-10-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation.
+	* es.po: Updated Spanish translation.
 
 2007-10-25  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation.                     
+	* es.po: Updated Spanish translation.
 
 2007-10-24  Matej Urbančič  <mateju@svn.gnome.org>
 
 	* sl.po: Updated Slovenian translation.
 
-2007-10-23  Djihed Afifi <djihed@gmail.com> 
+2007-10-23  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Anas Husseini.
 
@@ -1115,7 +2513,7 @@
 
 	* ca.po: Updated Catalan translation by David Planella.
 
-2007-10-21  Djihed Afifi <djihed@gmail.com> 
+2007-10-21  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Anas Husseini.
 
@@ -1123,9 +2521,9 @@
 
 	* sl.po: Updated Slovenian translation.
 
-2007-10-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org> 
+2007-10-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-10-15  Alexander Shopov  <ash@contact.bg>
 
@@ -1190,7 +2588,7 @@
 
 2007-09-16  Yannig Marchegay <yannig@marchegay.org>
 
-        * oc/oc.po: Updated Occitan translation
+	* oc/oc.po: Updated Occitan translation
 
 2007-09-15  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
@@ -1204,7 +2602,7 @@
 
 	* cy.po: Fix typo in date format string
 
-2007-09-13  Djihed Afifi <djihed@gmail.com> 
+2007-09-13  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Ahmad Farghal.
 
@@ -1248,12 +2646,12 @@
 2007-09-10  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation: fixes for
-		 	 lots of typos (bug #475578)
+	lots of typos (bug #475578)
 
 2007-09-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
-        
+	* es.po: Updated Spanish translation
+
 2007-09-10  Kenneth Nielsen  <k.nielsen81@gmail.com>
 
 	* da.po: Updated Danish translation
@@ -1263,8 +2661,8 @@
 	* sv.po: Updated Swedish translation.
 
 2007-09-10  Jovan Naumovski  <jovan@lugola.net>
- 
- 	* mk.po: Updated Macedonian translation.
+
+	* mk.po: Updated Macedonian translation.
 
 2007-09-10  Ankit Patel  <ankit644@yahoo.com>
 
@@ -1276,9 +2674,9 @@
 
 2007-09-08  Inaki Larranaga Murgoitio  <dooteo@zundan.com>
 
-        * eu.po: Fixed some typos in Basque translation.
+	* eu.po: Fixed some typos in Basque translation.
 
-2007-09-07   Clytie Siddall <clytie@riverland.net.au>
+2007-09-07  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
@@ -1295,12 +2693,12 @@
 	* de.po: Updated German translation, fix #474050.
 
 2007-09-05  Jovan Naumovski  <jovan@lugola.net>
- 
- 	 * mk.po: Updated Macedonian translation.
+
+	* mk.po: Updated Macedonian translation.
 
 2007-09-04  Jovan Naumovski  <jovan@lugola.net>
- 
- 	 * mk.po: Updated Macedonian translation.
+
+	* mk.po: Updated Macedonian translation.
 
 2007-09-04  Stéphane Raimbault  <stephane.raimbault@gmail.com>
 
@@ -1332,7 +2730,7 @@
 	* th.po: Updated Thai translation.
 	* ChangeLog: Fix newlines in Clytie's recent entry.
 
-2007-09-02   Clytie Siddall <clytie@riverland.net.au>
+2007-09-02  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
@@ -1354,8 +2752,8 @@
 
 2007-08-30  Ilkka Tuohela  <hile@iki.fi>
 
-	* fi.po: Updated Finnish translation 
-	         (fix for bug #471749)
+	* fi.po: Updated Finnish translation
+	(fix for bug #471749)
 
 2007-08-30  Takeshi AIHANA <takeshi.aihana@gmail.com>
 
@@ -1367,7 +2765,7 @@
 	by Washington Lins <washington-lins@uol.com.br>.
 
 2007-08-29  Jovan Naumovski  <jovan@lugola.net>
- 
+
 	* mk.po: Updated Macedonian translation.
 
 2007-08-29  Ankit Patel  <ankit644@yahoo.com>
@@ -1418,7 +2816,7 @@
 
 	* sv.po: Updated Swedish translation.
 
-2007-08-24  Jorge Gonzalez <jorgegonz@svn.gnome.org> 
+2007-08-24  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation.
 
@@ -1496,7 +2894,7 @@
 2007-08-17  Hendrik Richter  <hendrikr@gnome.org>
 
 	* de.po: Updated German translation, by
-	         Andre Klapper <ak-47@gmx.net>
+	Andre Klapper <ak-47@gmx.net>
 
 2007-08-17  Ankit Patel  <ankit644@yahoo.com>
 
@@ -1557,20 +2955,20 @@
 
 2007-08-12  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2007-08-12  Hendrik Richter  <hendrikr@gnome.org>
 
 	* de.po: Updated German translation, by
-	         Andre Klapper <ak-47@gmx.net>
+	Andre Klapper <ak-47@gmx.net>
 
 2007-08-12  Johnny Jacob  <jjohnny@novell.com>
- 
-       * POTFILES.in : Added new file for translation.
- 
+
+	* POTFILES.in : Added new file for translation.
+
 2007-08-11  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2007-08-11  Daniel Nylander <po@danielnylander.se>
 
@@ -1627,7 +3025,7 @@
 2007-08-03  Danishka Navin <snavin@svn.gnome.org>
 
 	* si.po:  Sinhala Translation updated by Danishka Navin
-	
+
 
 2007-08-01  Daniel Nylander <po@danielnylander.se>
 
@@ -1647,7 +3045,7 @@
 
 2007-07-30  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2007-07-30  Daniel Nylander <po@danielnylander.se>
 
@@ -1663,7 +3061,7 @@
 
 2007-07-29  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-07-29  Daniel Nylander <po@danielnylander.se>
 
@@ -1675,14 +3073,14 @@
 
 2007-07-27  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-07-24  Johnny Jacob  <jjohnny@novell.com>
 
 	** Fixes 459251
-	
+
 	* POTFILES.in : Added new files with translatable strings.
-	
+
 2007-07-23  Matic Žgur  <mr.zgur@gmail.com>
 
 	* sl.po: Updated Slovenian translation.
@@ -1703,7 +3101,7 @@
 
 2007-07-21  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-07-21  Danilo Šegan  <danilo@gnome.org>
 
@@ -1719,11 +3117,11 @@
 
 2007-06-17  Raivis Dejus  <orvils@gmail.com>
 
-        * lv.po: Updated Latvian Translation.
+	* lv.po: Updated Latvian Translation.
 
 2007-06-18  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation. Fixes bug #457959.
+	* es.po: Updated Spanish translation. Fixes bug #457959.
 
 2007-07-17  Daniel Nylander <po@danielnylander.se>
 
@@ -1731,7 +3129,7 @@
 
 2007-06-17  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation.
+	* es.po: Updated Spanish translation.
 
 2007-07-16  Ilkka Tuohela  <hile@iki.fi>
 
@@ -1755,11 +3153,11 @@
 
 2007-07-10  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-07-09  Jovan Naumovski  <jovan@lugola.net>
- 
- 	 * mk.po: Updated Macedonian translation.
+
+	* mk.po: Updated Macedonian translation.
 
 2007-07-09  Chenthill Palanisamy  <pchenthill@novell.com>
 
@@ -1773,7 +3171,7 @@
 
 2007-07-07  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-07-02  Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
 
@@ -1822,7 +3220,7 @@
 
 2007-06-19  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-06-19  Daniel Nylander <po@danielnylander.se>
 
@@ -1834,7 +3232,7 @@
 
 2007-06-17  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-06-15  Matthew Barnes  <mbarnes@redhat.com>
 
@@ -1842,7 +3240,7 @@
 
 2007-06-15  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-06-13  Daniel Nylander <po@danielnylander.se>
 
@@ -1866,17 +3264,17 @@
 
 2007-06-05  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
 
-        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
+	** Fix for version removal from Installed files from Gilles Dartiguelongue
 
 	* POTFILES.in:
 
-2007-06-02  Jorge Gonzalez <jorgegonz@svn.gnome.org> 
+2007-06-02  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-06-02  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
@@ -1899,7 +3297,7 @@
 
 2007-05-28  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2007-05-27  Daniel Nylander <po@danielnylander.se>
 
@@ -1928,7 +3326,7 @@
 
 2007-05-22  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-05-22  Jakub Friedl  <jfriedl@suse.cz>
 
@@ -1957,7 +3355,7 @@
 
 	* en_GB.po: Updated British English translation
 
-2007-05-15  Jorge Gonzalez <jorgegonz@svn.gnome.org> 
+2007-05-15  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
 
@@ -2031,7 +3429,7 @@
 2007-04-22  Yair Hershkovitz <yairh@gmail.com>
 
 	* he.po: Updated Hebrew translation
-	
+
 2007-04-21  Daniel Nylander <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
@@ -2042,7 +3440,7 @@
 	* sv.po: Updated Swedish translation.
 	* POTFILES.in: Added missing files.
 
-2007-04-14  Djihed Afifi <djihed@gmail.com> 
+2007-04-14  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Djihed Afifi.
 
@@ -2093,7 +3491,7 @@
 2007-03-12  Goran Rakić  <grakic@devbase.net>
 
 	* sr.po, sr@Latn.po: Updated Serbian translation, by
-	         Igor Nestorović <jung@one.ekof.bg.ac.yu>
+	Igor Nestorović <jung@one.ekof.bg.ac.yu>
 
 2007-03-12  Jakub Friedl  <jfriedl@suse.cz>
 
@@ -2102,7 +3500,7 @@
 2007-03-12  Hendrik Richter  <hendrikr@gnome.org>
 
 	* de.po: Updated German translation, by
-	         Christian Kintner <mail@christian-kintner.de>
+	Christian Kintner <mail@christian-kintner.de>
 
 2007-03-12  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
@@ -2184,7 +3582,7 @@
 
 2007-03-03  Jovan Naumovski  <jovan@lugola.net>
 
-	 * mk.po: Updated Macedonian translation.
+	* mk.po: Updated Macedonian translation.
 
 2007-03-02  David Lodge <dave@cirt.net>
 
@@ -2198,7 +3596,7 @@
 
 	* fr.po: Updated French translation by Jonathan Ernst.
 
-2007-02-28  Djihed Afifi <djihed@gmail.com> 
+2007-02-28  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Djihed Afifi.
 
@@ -2323,7 +3721,7 @@
 
 	* en_GB.po: Updated English (British) translation
 
-2007-02-16  Djihed Afifi <djihed@gmail.com> 
+2007-02-16  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Djihed Afifi.
 
@@ -2351,7 +3749,7 @@
 
 	* fi.po: Updated Finnish translation.
 
-2007-02-11  Djihed Afifi <djihed@gmail.com> 
+2007-02-11  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Khaled Hosny.
 
@@ -2372,7 +3770,7 @@
 
 	* de.po: Updated German translation.
 
-2007-02-9  Djihed Afifi <djihed@gmail.com> 
+2007-02-9  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Ahmad Farghal.
 
@@ -2380,7 +3778,7 @@
 
 	* en_GB.po: Updated English (British) translation
 
-2007-02-8  Djihed Afifi <djihed@gmail.com> 
+2007-02-8  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Ahmad Farghal.
 
@@ -2473,7 +3871,7 @@
 
 	* sv.po: Updated Swedish translation.
 	* POTFILES.in: Added missing files.
-	
+
 2007-01-10  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
@@ -2481,7 +3879,7 @@
 2007-01-09  Daniel Nylander <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
-	
+
 2007-01-06  Priit Laes  <plaes@svn.gnome.org>
 
 	* et.po: Updated Estonian translation by Ivar Smolin.
@@ -2490,12 +3888,12 @@
 
 	* vi.po: Updated Vietnamese translation.
 
-2006-01-03  Jordi Mas <jmas@softcatala.org>, Bernat Tallaferro 
+2006-01-03  Jordi Mas <jmas@softcatala.org>, Bernat Tallaferro
 	<bernat.tallaferro@gmail.com>
 
 	* ca.po: Catalan translation fixes
 
-2007-01-3  Djihed Afifi <djihed@gmail.com> 
+2007-01-3  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Ahmad Farghal.
 
@@ -2511,19 +3909,19 @@
 
 	* en_GB.po: Updated English (British) translation
 
-2006-12-28  Djihed Afifi <djihed@gmail.com> 
+2006-12-28  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
-2006-12-28  Djihed Afifi <djihed@gmail.com> 
+2006-12-28  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
-2006-12-27  Djihed Afifi <djihed@gmail.com> 
+2006-12-27  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
-2006-12-26  Djihed Afifi <djihed@gmail.com> 
+2006-12-26  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
@@ -2531,11 +3929,11 @@
 
 	* sr.po, sr@Latn.po: Fix bug #355974, updated.
 
-2006-12-24  Djihed Afifi <djihed@gmail.com> 
+2006-12-24  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
-2006-12-22  Djihed Afifi <djihed@gmail.com> 
+2006-12-22  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
@@ -2543,7 +3941,7 @@
 
 	* nb.po: Updated Norwegian bokmål translation.
 
-2006-12-18  Djihed Afifi <djihed@gmail.com> 
+2006-12-18  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
@@ -2706,7 +4104,7 @@
 	* et.po: Translation updated by Ivar Smolin.
 
 2006-10-15  Jovan Naumovski  <jovan@lugola.net>
-	
+
 	* mk.po: Updated Macedonian translation.
 
 2006-10-15  Ilkka Tuohela  <hile@iki.fi>
@@ -2732,7 +4130,7 @@
 2006-10-14  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.
- 
+
 2006-10-13  Alexander Shopov  <ash@contact.bg>
 
 	* bg.po: Updated Bulgarian translation by
@@ -3217,7 +4615,7 @@
 2006-08-20  Hendrik Richter  <hendrikr@gnome.org>
 
 	* de.po: Updated German translation, by
-	 Christian Kintner <mail@christian-kintner.de>
+	Christian Kintner <mail@christian-kintner.de>
 
 2006-08-20  Wouter Bolsterlee  <uws+gnome@xs4all.nl>
 
@@ -3230,7 +4628,7 @@
 2006-08-20  Hendrik Richter  <hendrikr@gnome.org>
 
 	* de.po: Updated German translation, by
-	 Christian Kintner <mail@christian-kintner.de>
+	Christian Kintner <mail@christian-kintner.de>
 
 2006-08-19  Priit Laes  <plaes@cvs.gnome.org>
 
@@ -3257,7 +4655,7 @@
 	* mk.po: Updated Macedonian translation.
 
 2006-08-18  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-	
+
 	* or.po: Updated Oriya Translation.
 
 2006-08-18  Subhransu Behera  <arya_subhransu@yahoo.co.in>
@@ -3292,7 +4690,7 @@
 2006-08-16  Daniel Nylander <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
-	
+
 2006-08-16  Gabor Kelemen  <kelemeng@gnome.hu>
 
 	* hu.po: Translation updated.
@@ -3308,7 +4706,7 @@
 2006-08-13  Rahul Bhalerao  <b.rahul.pm@gmail.com>
 
 	* mr.po: Updated Marathi Translations
-	
+
 2006-08-12  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
@@ -3329,7 +4727,7 @@
 2006-08-11  Rahul Bhalerao  <b.rahul.pm@gmail.com>
 
 	* mr.po: Updated Marathi translation
-	
+
 2006-08-11  Vincent van Adrighem  <adrighem@gnome.org>
 
 	* nl.po: Translation updated by Tino Meinen.
@@ -3375,7 +4773,7 @@
 2006-08-09  Rahul Bhalerao  <b.rahul.pm@gmail.com>
 
 	* mr.po: Updated Marathi translation.
-	
+
 2006-08-09  Funda Wang  <fundawang@linux.net.cn>
 
 	* zh_CN.po: Updated Simplified Chinese translation.
@@ -3387,15 +4785,15 @@
 2006-08-09  Rahul Bhalerao  <b.rahul.pm@gmail.com>
 
 	* mr.po: Updated Marathi translation
-	
+
 2006-08-09  Rahul Bhalerao  <b.rahul.pm@gmail.com>
 
 	* mr.po: Updated Marathi translation
-	
+
 2006-08-09  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
-			 Includes fix for translation bug 350386
+	Includes fix for translation bug 350386
 
 2006-08-08  Kjartan Maraas  <kmaraas@gnome.org>
 
@@ -3404,7 +4802,7 @@
 2006-08-08  Rahul Bhalerao  <b.rahul.pm@gmail.com>
 
 	* mr.po: Updated Marathi translation.
-	
+
 2006-08-08  Ankit Patel  <ankit644@yahoo.com>
 
 	* gu.po: Updated Gujarati Translation.
@@ -3421,13 +4819,13 @@
 
 	* mr.po: Added a new file for Marathi
 	* LINGUAS: Added a corrosponding entry for Marathi(mr) in LINGUAS file
-	
+
 2006-08-07  Francisco Javier F. Serrador  <serrador@openshine.com>
 
 	* es.po: Updated Spanish translation.
 
 2006-08-07  Jovan Naumovski  <jovan@lugola.net>
-	
+
 	* mk.po: Updated Macedonian translation.
 
 2006-08-07  Inaki Larranaga  <dooteo@euskalgnu.org>
@@ -3444,7 +4842,7 @@
 
 2006-08-06  Funda Wang  <fundawang@linux.net.cn>
 
-	* zh_CN.po: Updated Simplified Chinese translation. 
+	* zh_CN.po: Updated Simplified Chinese translation.
 
 2006-08-05  Jovan Naumovski  <jovan@lugola.net>
 
@@ -3465,7 +4863,7 @@
 2006-08-04  Daniel Nylander <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
-	
+
 2006-08-04  Jordi Mas <jmas@softcatala.org>
 
 	* ca.po: Catalan translation update
@@ -3660,7 +5058,7 @@
 2006-07-16  Daniel Nylander  <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
-	
+
 2006-07-14  Priit Laes  <amd@store20.com>
 
 	* et.po: Translation updated by Ivar Smolin.
@@ -3683,8 +5081,8 @@
 
 2006-07-11  Ilkka Tuohela  <hile@iki.fi>
 
-	* fi.po: Revert some localized time fields to %H:%M 
-	  (it's not possible to enter %H.%M, see bug #347241)
+	* fi.po: Revert some localized time fields to %H:%M
+	(it's not possible to enter %H.%M, see bug #347241)
 
 2006-07-11  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
@@ -3731,7 +5129,7 @@
 2006-07-07  Ahmad Riza H Nst  <rizahnst@eriagempita.co.id>
 
 	* id.po: Updated.
-	
+
 2006-07-06  Inaki Larranaga  <dooteo@euskalgnu.org>
 
 	* eu.po: Updated Basque translation.
@@ -4019,7 +5417,7 @@
 
 2006-04-30  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
- 	* cs.po: Updated Czech translation.
+	* cs.po: Updated Czech translation.
 
 2006-04-30  Kjartan Maraas <kmaraas@gnome.org>
 
@@ -4043,7 +5441,7 @@
 
 2006-04-23  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
- 	* cs.po: Updated Czech translation.
+	* cs.po: Updated Czech translation.
 
 2006-04-23  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
@@ -4103,11 +5501,11 @@
 2006-04-10  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
 	* fa.po: Remove "%OC" from translations, as it only works with
-	  Sharif Linux's modified glibc (patch by Elnaz Sarbar).
+	Sharif Linux's modified glibc (patch by Elnaz Sarbar).
 
 2006-04-09  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
- 	* cs.po: Updated Czech translation.
+	* cs.po: Updated Czech translation.
 
 2006-04-08  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
@@ -4124,7 +5522,7 @@
 2006-04-04  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
 	* fa.po: Updated Persian translation by Elnaz Sarbar and Meelad
-	  Zakaria.
+	Zakaria.
 
 2006-03-30  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -4206,8 +5604,8 @@
 
 2006-03-10  Vladimer Sichinava  <vlsichinava@gmail.com>
 
-	* ka.po: Updated Georgian translation by 
-	  Alexander Didebulidze <didebuli@in.tum.de>.
+	* ka.po: Updated Georgian translation by
+	Alexander Didebulidze <didebuli@in.tum.de>.
 
 2006-03-10  Mugurel Tudor  <mugurelu@gnome.ro>
 
@@ -4264,7 +5662,7 @@
 
 2006-03-03  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
- 	* cs.po: Updated Czech translation.
+	* cs.po: Updated Czech translation.
 
 2006-03-03  Žygimantas Beručka  <zygis@gnome.org>
 
@@ -4600,7 +5998,7 @@
 
 2006-02-04  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
- 	* cs.po: Updated Czech translation.
+	* cs.po: Updated Czech translation.
 
 2006-02-02  Laurent Dhima  <laurenti@alblinux.net>
 
@@ -4633,7 +6031,7 @@
 2006-01-31  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
-	
+
 2006-01-31  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.
@@ -4749,7 +6147,7 @@
 
 2006-01-25  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-25  Clytie Siddall <clytie@riverland.net.au>
 
@@ -4773,7 +6171,7 @@
 
 2006-01-24  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-23  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -4830,7 +6228,7 @@
 
 	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
 	* zh_HK.po: Added Traditional Chinese translation(Hong Kong).
-	
+
 2006-01-20  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
 	* gl.po: Updated Galician Translation.
@@ -4871,10 +6269,10 @@
 2006-01-18  Slobodan D. Sredojevic  <slobo@akrep.be>
 
 	* sr.po, sr@Latn.po: Updated Serbian translation
-	
+
 2006-01-17  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-17  Clytie Siddall <clytie@riverland.net.au>
 
@@ -4939,7 +6337,7 @@
 
 2006-01-11  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-11  Clytie Siddall <clytie@riverland.net.au>
 
@@ -4965,7 +6363,7 @@
 
 2005-01-09  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-09  Takeshi AIHANA <aihana@gnome.gr.jp>
 
@@ -4991,7 +6389,7 @@
 2005-01-06  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
-	
+
 2005-01-06  Ankit Patel  <ankit644@yahoo.com>
 
 	* gu.po: Updated Gujarati Translation.
@@ -5024,7 +6422,7 @@
 
 2005-01-04  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-03  Takeshi AIHANA <aihana@gnome.gr.jp>
 
@@ -5032,7 +6430,7 @@
 
 2005-01-03  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-02  Adam Weinberger  <adamw@gnome.org>
 
@@ -5048,7 +6446,7 @@
 
 2006-01-01  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-02  Kjartan Maraas  <kmaraas@gnome.org>
 
@@ -5110,7 +6508,7 @@
 
 2005-12-26  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2005-12-25  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -5147,19 +6545,19 @@
 
 2005-12-21  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2005-12-21  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
 
 2005-12-20  Žygimantas Beručka  <zygis@gnome.org>
-	
+
 	* lt.po: Updated Lithuanian translation.
 
 2005-12-20  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2005-12-10  Ales Nyakhaychyk  <nab@mail.by>
 
@@ -5183,7 +6581,7 @@
 
 2005-12-16  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2005-12-15  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
@@ -5455,7 +6853,7 @@
 2005-09-13  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
 	* fa.po: Updated Persian translation by Elnaz Sarbar
-	  <elnaz@farsiweb.info> and Meelad Zakaria <meelad@farsiweb.info>.
+	<elnaz@farsiweb.info> and Meelad Zakaria <meelad@farsiweb.info>.
 
 2005-09-12  Mugurel Tudor  <mugurelu@gnome.ro>
 
@@ -5568,7 +6966,7 @@
 
 2005-08-27  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-08-26  Mohammad DAMT  <mdamt@gnome.org>
 
@@ -5631,12 +7029,12 @@
 	* uk.po: Updated Ukrainian translation.
 
 2005-08-22  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-    
+
 	* ru.po: Updated Russian translation.
 
 2005-08-22  Mohammad DAMT  <mdamt@gnome.org>
 
-	* id.po: Updated Indonesian translation 
+	* id.po: Updated Indonesian translation
 
 2005-08-22  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -5660,7 +7058,7 @@
 
 2005-08-22  Danilo Šegan  <danilo@gnome.org>
 
-	* POTFILES.in: Removed 	shell/e-shell-offline-handler.c,
+	* POTFILES.in: Removed shell/e-shell-offline-handler.c,
 	calendar/gui/calendar-offline-handler.c.
 
 2005-08-22  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
@@ -5670,7 +7068,7 @@
 2005-08-22  Mohammad DAMT  <mdamt@gnome.org>
 
 	* POTFILES.in: reverted (accidentally updated by my previous check in)
-	
+
 2005-08-22  Mohammad DAMT  <mdamt@gnome.org>
 
 	* id.po: Updated Indonesian translation.
@@ -5731,7 +7129,7 @@
 
 2005-08-17  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-08-16  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -5891,7 +7289,7 @@
 
 2005-08-09  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-08-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
@@ -5939,7 +7337,7 @@
 	* pt_BR.po: Updated Brazilian Portuguese translation.
 
 2005-08-07  Ilkka Tuohela  <hile@iki.fi>
-	
+
 	* fi.po: Updated Finnish translation.
 
 2005-08-06  Rhys Jones  <rhys@sucs.org>
@@ -5956,7 +7354,7 @@
 
 2005-08-06  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-08-06  Ankit Patel <ankit644@yahoo.com>
 
@@ -6002,7 +7400,7 @@
 2005-08-04  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
-	
+
 2005-08-04  Vincent van Adrighem  <adrighem@gnome.org>
 
 	* nl.po: Translation updated by Tino Meinen.
@@ -6022,7 +7420,7 @@
 
 2005-08-04  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-08-04  Sunil Mohan Adapa <sunil@atc.tcs.co.in>
 
@@ -6059,7 +7457,7 @@
 2005-07-31  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Bulk updates to Finnish translation
-             for new gnome.fi website.
+	for new gnome.fi website.
 
 2005-07-29  Takeshi AIHANA <aihana@gnome.gr.jp>
 
@@ -6079,7 +7477,7 @@
 
 2005-07-28  Ilkka Tuohela  <hile@iki.fi>
 
-	* fi.po: Bulk change to some Finnish translations.       
+	* fi.po: Bulk change to some Finnish translations.
 
 2005-07-28  Ankit Patel <ankit644@yahoo.com>
 
@@ -6128,7 +7526,7 @@
 
 2005-07-25  Ilkka Tuohela  <hile@iki.fi>
 
-	* fi.po: Updated Finnish translation 
+	* fi.po: Updated Finnish translation
 
 2005-07-24  Ilkka Tuohela  <hile@iki.fi>
 
@@ -6145,7 +7543,7 @@
 
 2005-07-24  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-23  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -6170,7 +7568,7 @@
 
 2005-07-23  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-23  Priit Laes  <plaes@cvs.gnome.org>
 
@@ -6188,7 +7586,7 @@
 
 2005-07-22  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-22  Alexander Shopov  <ash@contact.bg>
 
@@ -6221,7 +7619,7 @@
 
 2005-07-20  Sankar P <psankar@novell.com>
 
-	* POTFILES.in : Changed the path of the files that 
+	* POTFILES.in : Changed the path of the files that
 	are moved due to the consolidation of proxy features' plugins
 	into the groupwise-features plugin.
 
@@ -6242,7 +7640,7 @@
 	* et.po: Translation updated by Ivar Smolin.
 
 2005-07-19  Vivek Jain <jvivek@novell.com>
-	
+
 	* POTFILES.in : added plugins/groupwise-features/junk-mail
 	files
 
@@ -6272,7 +7670,7 @@
 
 2005-07-17  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-17  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -6284,7 +7682,7 @@
 
 2005-07-16  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-16  Sarfraaz Ahmed <asarfraaz@novell.com>
 
@@ -6294,7 +7692,7 @@
 
 	*plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
 	: Add file for translation.
-	
+
 2005-07-14  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.
@@ -6309,14 +7707,14 @@
 
 2005-07-13  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-13  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
 
 2005-07-12  Vivek Jain <jvivek@novell.com>
-	
+
 	(put the changelog entry here
 	2005-07-10  Shreyas Srinivasan <sshreyas@novell.com>)
 
@@ -6337,16 +7735,16 @@
 	Nestorović.
 
 2005-07-11  Vivek Jain <jvivek@novell.com>
-	
+
 	* POTFILES.in : relocated camel-gw-listener.c
 
 2005-07-11  Sankar P <psankar@novell.com>
 
 	* POTFILES.in : Added the proxy.c file to the list.
-	
+
 2005-07-10  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-09  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -6354,8 +7752,8 @@
 
 2005-07-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
-        * zh_TW.po: Updated Traditional Chinese translation.
-	
+	* zh_TW.po: Updated Traditional Chinese translation.
+
 2005-07-08  Adam Weinberger  <adamw@gnome.org>
 
 	* en_CA.po: Updated Canadian English translation.
@@ -6374,13 +7772,13 @@
 
 2005-07-07  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-07 Vivek Jain <jvivek@novell.com>
-	
-	* POTFILES.in : updated with the changed location of 
+
+	* POTFILES.in : updated with the changed location of
 	em-junk-filter.c
-	
+
 2005-07-07  Alexander Shopov  <ash@contact.bg>
 
 	* bg.po: Updated Bulgarian translation by
@@ -6435,7 +7833,7 @@
 2005-06-28  Kaushal Kumar  <kakumar@novell.com>
 
 	* POTFILES.in: Added the remaining relevant gal files.
-	
+
 	* POTFILES.skip: Added the gal files which need to be skipped.
 
 2005-07-06  Not Zed  <NotZed@Ximian.com>
@@ -6620,7 +8018,7 @@
 	Ivelina Karcheva <anima@mail.bg>
 
 2005-05-23  Vivek Jain  <jvivek@novell.com>
-	
+
 	* POTFILES.in: replaced shared-folder/
 	send-options/ groupwise-send-options/
 	groupwise-account-setup/ with groupwise-features/
@@ -6674,12 +8072,12 @@
 2005-05-03  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
 	* fa.po: Updated Persian translation by Meelad Zakaria
-	  <meelad@farsiweb.info> and myself.
+	<meelad@farsiweb.info> and myself.
 
 2005-05-02  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
 	* fa.po: Updated Persian translation by Meelad Zakaria
-	  <meelad@farsiweb.info> and myself.
+	<meelad@farsiweb.info> and myself.
 
 2005-04-30  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -6912,7 +8310,7 @@
 
 	* POTFILES.in: e-passwords moved to e-d-s
 
-2005-02-23  Jordi Mallach   <jordi@sindominio.net>
+2005-02-23  Jordi Mallach  <jordi@sindominio.net>
 
 	* ca.po: Updated Catalan translation by
 	Josep Puigdemont <josep@imatge-sintetica.com>.
@@ -7026,7 +8424,7 @@
 
 2005-02-18  Marco Ciampa <ciampix@libero.it>
 
-	* it.po: Updated italian translation by Luca 
+	* it.po: Updated italian translation by Luca
 	Ferretti <elle.uca@infinito.it>
 
 2005-02-16  Martin Willemoes Hansen  <mwh@sysrq.dk>
@@ -7233,7 +8631,7 @@
 2005-01-28  JP Rosevear  <jpr@novell.com>
 
 	Fixes #71930
-	
+
 	* POTFILES.in: add missing e-error files
 
 2005-01-28  Christian Rose  <menthos@menthos.com>
@@ -7367,7 +8765,7 @@
 2005-01-14 Marco Ciampa <ciampix@libero.it>
 
 	* it.po: updated italian translation
-	
+
 2005-01-13 Marco Ciampa <ciampix@libero.it>
 
 	* it.po: updated italian translation
@@ -7445,7 +8843,7 @@
 
 2004-12-30  Alexander Shopov  <ash@contact.bg>
 
-	 * bg.po: Updated Bulgarian translation by
+	* bg.po: Updated Bulgarian translation by
 	myself
 
 2004-12-29  Alexander Shopov  <ash@contact.bg>
@@ -7460,7 +8858,7 @@
 2004-12-18  JP Rosevear  <jpr@novell.com>
 
 	Fixes #68841
-	
+
 	* pt_BR.po: fix markup in translated message
 
 2004-12-18  Christian Rose  <menthos@menthos.com>
@@ -7510,10 +8908,10 @@
 
 2004-12-03  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
-	* POTFILES.in: 
-	  Removed mail/mail-account-editor.c
-	  Removed mail/mail-config-druid.c
-	  They are no longer available.
+	* POTFILES.in:
+	Removed mail/mail-account-editor.c
+	Removed mail/mail-config-druid.c
+	They are no longer available.
 	* da.po: Updated Danish translation.
 
 2004-12-01  Dafydd Harries  <daf@muse.19inch.net>
@@ -7587,7 +8985,7 @@
 2004-11-04  Miloslav Trmac  <mitr@volny.cz>
 
 	* cs.po: Fixed Czech translation (thanks to
-	 Juraj Kubelka <Juraj.Kubelka@email.cz>).
+	Juraj Kubelka <Juraj.Kubelka@email.cz>).
 
 2004-10-26  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
@@ -7708,7 +9106,7 @@
 
 2004-09-29  Marco Ciampa  <ciampix@libero.it>
 
-        * it.po: italian translation, locale and hotkey trim
+	* it.po: italian translation, locale and hotkey trim
 
 2004-09-28  Vincent van Adrighem  <adrighem@gnome.org>
 
@@ -7733,11 +9131,11 @@
 
 2004-09-24  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-09-23  Marco Ciampa  <ciampix@libero.it>
 
-        * it.po: updated italian translation.
+	* it.po: updated italian translation.
 
 2004-09-23  Adam Weinberger  <adamw@gnome.org>
 
@@ -7745,13 +9143,12 @@
 
 2004-09-22  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation from
+	* fr.po: Updated French translation from
 	Craig Jeffares <cjeffares@novell.com>.
 
 2004-09-22  Craig Jeffares  <cjeffares@novell.com>
 
-        * it.po & zh_TW.po: Updated Italian & Chinese Trad translation.
-
+	* it.po & zh_TW.po: Updated Italian & Chinese Trad translation.
 
 2004-09-21  Adam Weinberger  <adamw@gnome.org>
 
@@ -7788,7 +9185,7 @@
 
 2004-09-12  Hasbullah Bin Pit <sebol@my-penguin.org>
 
-        * ms.po: Updated Malay Translation.
+	* ms.po: Updated Malay Translation.
 
 2004-09-11  Mugurel Tudor  <mugurelu@go.ro>
 
@@ -7839,18 +9236,18 @@
 	* nl.po: Translation updated by Daniel van Eeden.
 
 2004-09-05  Åsmund Skjæveland <aasmunds@fys.uio.no>
-	
+
 	* nn.po: Updated Norwegian Nynorsk translation:
-       	         Merged translations from gnome-2-8 branch.
+	Merged translations from gnome-2-8 branch.
 
 2004-09-04  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-09-03  JP Rosevear  <jpr@novell.com>
 
 	Fixes #65030
-	
+
 	* en_GB.po: Correct typo
 
 2004-09-03  Baris Cicek <baris@teamforce.name.tr>
@@ -7873,14 +9270,14 @@
 
 	* hi.po: Updated Hindi translation by
 	Rajesh Ranjan <rranjan@redhat.com>
-		
+
 2004-08-30  Åsmund Skjæveland <aasmunds@fys.uio.no>
 
-	* nn.po: Updated Norwegian Nynorsk translation: 
-       	         Merged translations from gnome-2-8 branch.
+	* nn.po: Updated Norwegian Nynorsk translation:
+	Merged translations from gnome-2-8 branch.
 
 2004-08-28  Ales Nyakhaychyk  <nab@mail.by>
-	
+
 	* be.po: Updated Belarusian translation.
 
 2004-08-29  Funda Wang  <fundawang@linux.net.cn>
@@ -7914,12 +9311,12 @@
 
 2004-08-26  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation from
-	Sebastien Bacher <seb128@debian.org>.
+	* fr.po: Updated French translation from Sebastien
+	Bacher <seb128@debian.org>.
 
 2004-08-25  Hasbullah Bin Pit <sebol@imy-penguin.org>
-                                                                                
-        * ms.po: Updated Malay Translation.
+
+	* ms.po: Updated Malay Translation.
 
 2004-08-25  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -8088,7 +9485,7 @@
 
 2004-08-12  Leonid Kanter <leon@asplinux.ru>
 
-        * ru.po: Updated Russian translation
+	* ru.po: Updated Russian translation
 
 2004-08-12  Åsmund Skjæveland <aasmunds@fys.uio.no>
 
@@ -8100,7 +9497,7 @@
 
 2004-08-11  Leonid Kanter <leon@asplinux.ru>
 
-        * ru.po: Updated Russian translation from Dan Korostelev <dan@ats.energo.ru>
+	* ru.po: Updated Russian translation from Dan Korostelev <dan@ats.energo.ru>
 
 2004-08-11  Changwoo Ryu  <cwryu@debian.org>
 
@@ -8134,7 +9531,7 @@
 
 	* gu.po: Updated Gujarati translation.
 
-2004-08-09  Amanpreet Singh Alam   <aalam@redhat.com>
+2004-08-09  Amanpreet Singh Alam  <aalam@redhat.com>
 
 	* pa.po: Updated Panjabi translation.
 
@@ -8225,7 +9622,7 @@
 
 2004-07-29  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation from
+	* fr.po: Updated French translation from
 	Sebastien Bacher <seb128@debian.org>.
 
 2004-07-29  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
@@ -8270,7 +9667,7 @@
 
 2004-07-23  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
-	* nn.po: Updated Norwegian Nynorsk translation.	
+	* nn.po: Updated Norwegian Nynorsk translation.
 
 2004-07-23  Changwoo Ryu  <cwryu@debian.org>
 
@@ -8279,7 +9676,7 @@
 2004-07-22  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Italian translation updated.
-	
+
 2004-07-21  Takeshi AIHANA <aihana@gnome.gr.jp>
 
 	* ja.po: Updated Japanese translation.
@@ -8309,7 +9706,7 @@
 
 	* bg.po: Updated Bulgarian translation by
 	Vladimir "Kaladan" Petkov <vpetkov@i-space.org>
-		
+
 2004-07-14  Miloslav Trmac  <mitr@volny.cz>
 
 	* cs.po: Updated Czech translation.
@@ -8328,7 +9725,7 @@
 
 2004-07-13  Leonid Kanter <leon@asplinux.ru>
 
-        * ru.po: updated Russian translation
+	* ru.po: updated Russian translation
 
 2004-07-13  Funda Wang  <fundawang@linux.net.cn>
 
@@ -8539,7 +9936,7 @@
 
 2004-06-08  Marco Ciampa  <ciampix@libero.it>
 
-        * it.po: Italian translation updated.
+	* it.po: Italian translation updated.
 
 2004-06-08  Artur Flinta  <aflinta@cvs.gnome.org>
 
@@ -8598,7 +9995,7 @@
 2004-05-25  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Italian translation updated.
-	
+
 2004-05-25  Artur Flinta  <aflinta@cvs.gnome.org>
 
 	* pl.po: Updated Polish translation by GNOME PL Team.
@@ -8619,7 +10016,7 @@
 2004-05-23  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Italian translation updated.
-	
+
 2004-05-23  Funda Wang  <fundawang@linux.net.cn>
 
 	* zh_CN.po: Updated Simplified Chinese translation.
@@ -8795,7 +10192,7 @@
 2004-04-30  Marco Ciampa <ciampix@libero.it>
 
 	* it.po: Italian translation updated.
-	
+
 2004-04-30  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated.
@@ -8858,7 +10255,7 @@
 
 2004-04-24  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-04-24  Takeshi AIHANA <aihana@gnome.gr.jp>
 
@@ -8967,18 +10364,18 @@
 	* cs.po: Updated Czech translation.
 
 2004-07-11  Evandro Fernandes Giovanini <evandrofg@ig.com.br>
- 
-        * pt_BR.po: Updated Brazilian Portuguese translation
-        from Afonso Celso Medina <medina@maua.br>.
+
+	* pt_BR.po: Updated Brazilian Portuguese translation
+	from Afonso Celso Medina <medina@maua.br>.
 
 2004-04-10  Adam Weinberger  <adamw@gnome.org>
 
 	* en_CA.po: Updated Canadian English translation.
 
 2004-07-10  Evandro Fernandes Giovanini <evandrofg@ig.com.br>
- 
-        * pt_BR.po: Updated Brazilian Portuguese translation
-        from Afonso Celso Medina <medina@maua.br>.
+
+	* pt_BR.po: Updated Brazilian Portuguese translation
+	from Afonso Celso Medina <medina@maua.br>.
 
 2004-04-10  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -9060,7 +10457,7 @@
 
 2004-03-27  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-03-27  Priit Laes  <plaes@cvs.gnome.org>
 
@@ -9328,7 +10725,7 @@
 
 2004-02-19  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-02-19  Changwoo Ryu  <cwryu@debian.org>
 
@@ -9360,7 +10757,7 @@
 
 2004-02-13  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-02-12  Jordi Mallach  <jordi@sindominio.net>
 
@@ -9507,7 +10904,7 @@
 2004-01-28 Marco Ciampa <ciampix@libero.it>
 
 	* it.po: updated italian translation.
-	
+
 2004-01-28  Miloslav Trmac  <mitr@volny.cz>
 
 	* cs.po: Fixed Czech translation.
@@ -9515,7 +10912,7 @@
 2004-01-27  Marco Ciampa <ciampix@libero.it>
 
 	* it.po: updated italian translation.
-	
+
 2004-01-27  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
 	* nn.po: Updated Norwegian Nynorsk translation.
@@ -9539,14 +10936,14 @@
 2004-01-26  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Updated italian translation.
-	
+
 2004-01-26  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
 
 2004-01-25  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation from
+	* fr.po: Updated French translation from
 	Sebastien Bacher <seb128@debian.org>.
 
 2004-01-25  Vincent van Adrighem  <adrighem@gnome.org>
@@ -9579,7 +10976,7 @@
 
 2004-01-25  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation from
+	* fr.po: Updated French translation from
 	Yannick Marchegay <yannick.marchegay@lokanova.com>.
 
 2004-01-25  Funda Wang  <fundawang@linux.net.cn>
@@ -9654,7 +11051,7 @@
 
 2004-01-19  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-01-18 Alastair McKinstry <mckinstry@computer.org>
 
@@ -9770,7 +11167,7 @@
 2004-01-07  Marco Ciampa <ciampix@libero.it>
 
 	* it.po: Updated italian translation.
-	
+
 2004-01-06  Kostas Papadimas <pkst@gnome.org>
 
 	* el.po: Updated Greek translation.
@@ -9844,7 +11241,7 @@
 2003-12-14  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Updated italian translation.
-		
+
 2003-12-13  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian translation.
@@ -9859,7 +11256,7 @@
 
 2003-12-07 Paul Duffy <dubhthach@compsoc.nuigalway.ie>
 
-        * ga.po: Updated Irish Translation, submitted by David O'Callaghan <david.ocallaghan@cs.tcd.ie>      
+	* ga.po: Updated Irish Translation, submitted by David O'Callaghan <david.ocallaghan@cs.tcd.ie>
 
 2003-12-02  Rodney Dawes  <dobey@ixmian.com>
 
@@ -9885,13 +11282,13 @@
 
 2003-11-19  Rodney Dawes  <dobey@ximian.com>
 
-	* it.po: Fixed msgstr missing ending 
+	* it.po: Fixed msgstr missing ending
 
 
 2003-11-19  Marco Ciampa <ciampix@libero.it>
 
 	*  it.po: Updated italian translation
-	
+
 2003-11-18  Hasbullah Bin Pit <sebol@ikhlas.com>
 
 	* ms.po: Updated initial Malay Translation by
@@ -9934,7 +11331,7 @@
 	* POTFILES.in: Add some missing files, and remove files
 	that have been removed from CVS
 	* POTFILES.skip: Add data/evolution.desktop.in
-	
+
 2003-10-23  Chris Toshok  <toshok@ximian.com>
 
 	* POTFILES.in: add smime files.
@@ -9962,7 +11359,7 @@
 2003-10-02  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
 	* nn.po: Updated Norwegian (nynorsk) translation.
-	
+
 2003-10-01  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
 	* nn.po: Updated Norwegian (nynorsk) translation.
@@ -9997,7 +11394,7 @@
 	a long way to go (25% left), but every little bit helps.
 
 2003-09-15 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation (replay date corrected...)
 
 2003-09-11  Hans Petter Jansson  <hpj@ximian.com>
@@ -10006,7 +11403,7 @@
 	programs that don't need i18n, sort.
 
 2003-09-10 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation.
 
 2003-09-07  Wang Jian  <lark@linux.net.cn>
@@ -10014,10 +11411,10 @@
 	* zh_CN.po: Merged from evolution-1-4-branch.
 
 2003-08-20 Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
-	
+
 	* zh_CN.po: Removed illegal '-'s from strptime msgstr, this fixes
-        #43558, Appointment Editor always gives time validation error for
-        apptmnts in non UTF-8/non ASCII locales.
+	#43558, Appointment Editor always gives time validation error for
+	apptmnts in non UTF-8/non ASCII locales.
 
 2003-08-20  Hasbullah Bin Pit <sebol@ikhlas.com>
 
@@ -10035,41 +11432,41 @@
 ")
 
 2003-08-05 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation (revision completed).
 
 2003-08-04 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation (under revision 91% completed).
 
 2003-08-03 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation (under revision 35% completed).
 
 2003-08-02  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation by
+	* fr.po: Updated French translation by
 	Brigitte Le Grand <brigitte.le.grand@sun.com>
 
 2003-08-02 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation (under revision 25% completed).
 
 2003-08-01  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
 
-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+	* es.po: Updated Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.
 
 2003-07-26  Danilo Å egan  <dsegan@gmx.net>
 
-	* sr.po,sr@Latn.po: Updated Serbian translation by Serbian team 
+	* sr.po,sr@Latn.po: Updated Serbian translation by Serbian team
 	(Prevod.org).
 
 	* POTFILES.in: Removed "widgets/misc/e-messagebox.c" because it
 	was removed from repository on July 23, by danw.
 
 2003-07-26 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation.
 
 2003-07-22  Christian Neumair  <chris@gnome-de.org>
@@ -10079,30 +11476,30 @@
 2003-07-21  Hasbullah Bin Pit <sebol@ikhlas.com>
 
 	* ms.po: Added initial Malay Translation by
-		MIMOS Open Source Development Group <syed@mimos.my>
+	MIMOS Open Source Development Group <syed@mimos.my>
 
 2003-07-19  Abel Cheung  <maddog@linux.org.hk>
 
 	* bg.po, ga.po, gl.po, lt.po: Convert to UTF-8 and merge with newest
-	  template.
+	template.
 
 2003-07-10  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-        
-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+
+	* es.po: Updated Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.
 
 2003-07-07 Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
 
-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+	* es.po: Updated Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.
 
 2003-06-26  Kostas Papadimas <pkst@gmx.net>
 
 	* el.po: Greek translation updated by Nikos Charonitakis <charosn@her.forthnet.gr>
 
 2003-06-25  Ivan Stojmirov  <stojmir@linux.net.mk>
-                                                                                
-        * mk.po: Updated Macedonian translation.
+
+	* mk.po: Updated Macedonian translation.
 
 2003-06-25  Kang Jeong-Hee  <Keizi@mail.co.kr>
 
@@ -10118,13 +11515,13 @@
 
 2003-06-23  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
 
-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+	* es.po: Updated Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.
 
 2003-06-23 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation.
-	
+
 2003-06-22  Kostas Papadimas <pkst@gmx.net>
 
 	* el.po: Greek translation updated by Nikos Charonitakis <charosn@her.forthnet.gr>
@@ -10148,7 +11545,7 @@
 
 2003-06-18  Andras Timar <timar@gnome.hu>
 
-        * hu.po: Proofreading: 100%
+	* hu.po: Proofreading: 100%
 
 2003-06-20  Christian Rose  <menthos@menthos.com>
 
@@ -10160,9 +11557,9 @@
 	(Prevod.org).
 
 2003-06-18  Andras Timar <timar@gnome.hu>
-                                                                                                                           
-        * hu.po: Translation: 100% reached, Proofreading: 37%
-                                                                                                                           
+
+	* hu.po: Translation: 100% reached, Proofreading: 37%
+
 2003-06-19 Wang Jian  <lark@linux.net.cn>
 
 	* zh_CN.po: Updated Simplified Chinese translation by
@@ -10187,25 +11584,25 @@
 
 2003-06-18  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
 
-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+	* es.po: Updated Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.
 
 2003-06-18  Andras Timar <timar@gnome.hu>
-                                                                                                                           
-        * hu.po: Updated Hungarian translation.
-                                                                                                                           
+
+	* hu.po: Updated Hungarian translation.
+
 2003-06-17  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
 
-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+	* es.po: Updated Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.
 
 2003-06-16  Fatih Demir <kabalak@gtranslator.org>
 
 	* tr.po: Committed updated Turkish translation by Gorkem Cetin.
 
 2003-06-16  Andras Timar <timar@gnome.hu>
-                                                                                                                           
-        * hu.po: Updated Hungarian translation.
+
+	* hu.po: Updated Hungarian translation.
 
 2003-06-15  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
 
@@ -10222,8 +11619,8 @@
 
 2003-06-09  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
 
-	* es.po: Updated Spanish translation from 
-                 Francisco Javier Fernandez <serrador@arrakis.es>.
+	* es.po: Updated Spanish translation from
+	Francisco Javier Fernandez <serrador@arrakis.es>.
 
 2003-06-04  Miloslav Trmac  <mitr@volny.cz>