Index: addressbook/gui/component/addressbook-component.c
===================================================================
--- addressbook/gui/component/addressbook-component.c	(revision 35582)
+++ addressbook/gui/component/addressbook-component.c	(working copy)
@@ -138,6 +138,9 @@ ensure_sources (AddressbookComponent *co
 		       and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/
 		    e_source_list_sync (source_list,NULL);
 		}
+
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_this_computer, _("On This Computer"));
 	}
 	else {
 		/* create the local source group */
@@ -147,7 +150,10 @@ ensure_sources (AddressbookComponent *co
 		on_this_computer = group;
 	}
 
-	if (!personal_source) {
+	if (personal_source) {
+		/* ensure the source name is in current locale, not read from configuration */
+		e_source_set_name (personal_source, _("Personal"));
+	} else {
 		/* Create the default Person addressbook */
 		ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
 		e_source_group_add_source (on_this_computer, source, -1);
@@ -157,7 +163,10 @@ ensure_sources (AddressbookComponent *co
 		personal_source = source;
 	}
 
-	if (!on_ldap_servers) {
+	if (on_ldap_servers) {
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_ldap_servers, _("On LDAP Servers"));
+	} else {
 		/* Create the LDAP source group */
 		group = e_source_group_new (_("On LDAP Servers"), LDAP_BASE_URI);
 		e_source_list_add_group (source_list, group, -1);
Index: addressbook/ChangeLog
===================================================================
--- addressbook/ChangeLog	(revision 35582)
+++ addressbook/ChangeLog	(working copy)
@@ -1,3 +1,11 @@
+2008-06-03  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #362754
+
+	* gui/component/addressbook-component.c: (ensure_sources):
+	Ensure to show default groups and sources with actual
+	localized name, not the one it was stored last time.
+
 2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #534360
Index: plugins/caldav/ChangeLog
===================================================================
--- plugins/caldav/ChangeLog	(revision 35582)
+++ plugins/caldav/ChangeLog	(working copy)
@@ -1,3 +1,12 @@
+2008-06-03  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #362754
+
+	* caldav-source.c: (ensure_caldav_source_group):
+	Search by base_uri, not by localized name and
+	ensure to show default groups and sources with actual
+	localized name, not the one it was stored last time.
+
 2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* caldav-source.c: (ensure_caldav_source_group):
Index: plugins/caldav/caldav-source.c
===================================================================
--- plugins/caldav/caldav-source.c	(revision 35582)
+++ plugins/caldav/caldav-source.c	(working copy)
@@ -53,15 +53,24 @@ static void
 ensure_caldav_source_group (void)
 {
 	ESourceList  *slist;
-	ESourceGroup *group;
-
+	ESourceGroup *group = NULL;
+	GSList *groups, *g;
 
 	if (!e_cal_get_sources (&slist, E_CAL_SOURCE_TYPE_EVENT, NULL)) {
 		g_warning ("Could not get calendar source list from GConf!");
 		return;
 	}
 
-	group = e_source_list_peek_group_by_name (slist, _("CalDAV"));
+	/* do not search by name, because changed localization can break the search, rather compare base_uri */
+	groups = e_source_list_peek_groups (slist);
+	for (g = groups; g && !group; g = g->next) {
+		group = E_SOURCE_GROUP (g->data);
+
+		if (group && strcmp (e_source_group_peek_base_uri (group), "caldav://") != 0) {
+			/* this is not our group, thus move to the next */
+			group = NULL;
+		}
+	}
 
 	if (group == NULL) {
 		gboolean res;
@@ -75,8 +84,12 @@ ensure_caldav_source_group (void)
 		}
 
 		g_object_unref (group);
-		g_object_unref (slist);
+	} else {
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (group, _("CalDAV"));
 	}
+
+	g_object_unref (slist);
 }
 
 int
Index: calendar/gui/tasks-component.c
===================================================================
--- calendar/gui/tasks-component.c	(revision 35582)
+++ calendar/gui/tasks-component.c	(working copy)
@@ -190,6 +190,9 @@ ensure_sources (TasksComponent *componen
 		       and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/
 		    e_source_list_sync (source_list,NULL);
 		}
+
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_this_computer, _("On This Computer"));
 	}
 	else {
 		/* create the local source group */
@@ -199,7 +202,10 @@ ensure_sources (TasksComponent *componen
 		on_this_computer = group;
 	}
 
-	if (!personal_source) {
+	if (personal_source) {
+		/* ensure the source name is in current locale, not read from configuration */
+		e_source_set_name (personal_source, _("Personal"));
+	} else {
 		GSList *tasks_selected;
 		/* Create the default Person addressbook */
 		ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
@@ -232,6 +238,9 @@ ensure_sources (TasksComponent *componen
 		e_source_list_add_group (source_list, group, -1);
 
 		on_the_web = group;
+	} else {
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_the_web, _("On The Web"));
 	}
 
 	component->priv->source_list = source_list;
Index: calendar/gui/calendar-component.c
===================================================================
--- calendar/gui/calendar-component.c	(revision 35582)
+++ calendar/gui/calendar-component.c	(working copy)
@@ -231,6 +231,9 @@ ensure_sources (CalendarComponent *compo
 		       and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/
 		    e_source_list_sync (source_list,NULL);
 		}
+
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_this_computer, _("On This Computer"));
 	}
 	else {
 		/* create the local source group */
@@ -240,7 +243,10 @@ ensure_sources (CalendarComponent *compo
 		on_this_computer = group;
 	}
 
-	if (!personal_source) {
+	if (personal_source) {
+		/* ensure the source name is in current locale, not read from configuration */
+		e_source_set_name (personal_source, _("Personal"));
+	} else {
 		char *primary_calendar = calendar_config_get_primary_calendar();
 		GSList *calendars_selected;
 
@@ -268,19 +274,25 @@ ensure_sources (CalendarComponent *compo
 		e_source_set_color_spec (personal_source, "#BECEDD");
 	}
 
-	if (!on_the_web) {
+	if (on_the_web) {
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_the_web, _("On The Web"));
+	} else {
 		/* Create the On the web source group */
 		group = e_source_group_new (_("On The Web"), WEB_BASE_URI);
 		e_source_list_add_group (source_list, group, -1);
 
 		on_the_web = group;
 	}
+
 	if (contacts) {
 		GSList *sources = e_source_group_peek_sources (contacts);
 		if (sources)
 			birthdays_source = E_SOURCE (sources->data); /* There is only one source under Contacts Group*/
-	}
-	else  {
+
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (contacts, _("Contacts"));
+	} else {
 		/* Create the contacts group */
 		group = e_source_group_new (_("Contacts"), CONTACTS_BASE_URI);
 		e_source_list_add_group (source_list, group, -1);
@@ -292,7 +304,10 @@ ensure_sources (CalendarComponent *compo
 		e_source_group_set_property (contacts, "create_source", "no");
 	g_free (create_source);
 
-	if (!birthdays_source) {
+	if (birthdays_source) {
+		/* ensure the source name is in current locale, not read from configuration */
+		e_source_set_name (birthdays_source, _("Birthdays & Anniversaries"));
+	} else {
 		birthdays_source = e_source_new (_("Birthdays & Anniversaries"), "/");
 		e_source_group_add_source (contacts, birthdays_source, -1);
 	}
@@ -303,7 +318,10 @@ ensure_sources (CalendarComponent *compo
 	if (e_source_peek_color_spec (birthdays_source) == NULL)
 		e_source_set_color_spec (birthdays_source, "#DDBECE");
 
-	if (!weather) {
+	if (weather) {
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (weather, _("Weather"));
+	} else {
 		/* Create the weather group */
 		group = e_source_group_new (_("Weather"), WEATHER_BASE_URI);
 		e_source_list_add_group (source_list, group, -1);
Index: calendar/gui/memos-component.c
===================================================================
--- calendar/gui/memos-component.c	(revision 35582)
+++ calendar/gui/memos-component.c	(working copy)
@@ -194,6 +194,9 @@ ensure_sources (MemosComponent *componen
 		       and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/
 		    e_source_list_sync (source_list,NULL);
 		}
+
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_this_computer, _("On This Computer"));
 	}
 	else {
 		/* create the local source group */
@@ -203,7 +206,10 @@ ensure_sources (MemosComponent *componen
 		on_this_computer = group;
 	}
 
-	if (!personal_source) {
+	if (personal_source) {
+		/* ensure the source name is in current locale, not read from configuration */
+		e_source_set_name (personal_source, _("Personal"));
+	} else {
 		GSList *memos_selected;
 		/* Create the default Person addressbook */
 		ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI);
@@ -230,8 +236,11 @@ ensure_sources (MemosComponent *componen
 		personal_source = source;
 	}
 
-	if (!on_the_web) {
-		/* Create the LDAP source group */
+	if (on_the_web) {
+		/* ensure the group name is in current locale, not read from configuration */
+		e_source_group_set_name (on_the_web, _("On The Web"));
+	} else {
+		/* Create the source group */
 		group = e_source_group_new (_("On The Web"), WEB_BASE_URI);
 		e_source_list_add_group (source_list, group, -1);
 
Index: calendar/ChangeLog
===================================================================
--- calendar/ChangeLog	(revision 35582)
+++ calendar/ChangeLog	(working copy)
@@ -1,3 +1,13 @@
+2008-06-03  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #362754
+
+	* gui/tasks-component.c: (ensure_sources):
+	* gui/memos-component.c: (ensure_sources):
+	* gui/calendar-component.c: (ensure_sources):
+	Ensure to show default groups and sources with actual
+	localized name, not the one it was stored last time.
+
 2008-05-29  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #535459
